🌱 Prepare main for development of the new release

.gitignore

@@ -15,8 +15,10 @@
 _artifacts/
 
 # E2E test templates
-test/e2e/data/infrastructure-vsphere/**/cluster-template*.yaml
+#!test/e2e/data/infrastructure-vsphere/v*/base/cluster-template.yaml
 test/e2e/data/infrastructure-vsphere/main/**/clusterclass-quick-start.yaml
+test/e2e/data/infrastructure-vsphere/main/**/cluster-template*.yaml
+test/e2e/data/infrastructure-vsphere/*/cluster-template*.yaml
 test/e2e/data/infrastructure-vsphere/*/clusterclass-quick-start.yaml
 
 # env vars file used in getting-started.md and manifests generation

Makefile

@@ -293,7 +293,7 @@ generate-doctoc:
 	TRACE=$(TRACE) ./hack/generate-doctoc.sh
 
 .PHONY: generate-e2e-templates
-generate-e2e-templates: $(KUSTOMIZE) $(addprefix generate-e2e-templates-, v1.7 v1.8 main) ## Generate test templates for all branches
+generate-e2e-templates: $(KUSTOMIZE) $(addprefix generate-e2e-templates-, v1.8 v1.9 main) ## Generate test templates for all branches
 
 .PHONY: generate-e2e-templates-main
 generate-e2e-templates-main: $(KUSTOMIZE) ## Generate test templates for the main branch
@@ -321,16 +321,16 @@ generate-e2e-templates-main: $(KUSTOMIZE) ## Generate test templates for the mai
 	"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_TEMPLATE_DIR)/main/dhcp-overrides" > "$(E2E_TEMPLATE_DIR)/main/cluster-template-dhcp-overrides.yaml"
 	"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_TEMPLATE_DIR)/main/ownerreferences" > "$(E2E_TEMPLATE_DIR)/main/cluster-template-ownerreferences.yaml"
 
+.PHONY: generate-e2e-templates-v1.9
+generate-e2e-templates-v1.9: $(KUSTOMIZE)
+	"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_TEMPLATE_DIR)/v1.9/clusterclass" > "$(E2E_TEMPLATE_DIR)/v1.9/clusterclass-quick-start.yaml"
+	"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_TEMPLATE_DIR)/v1.9/workload" > "$(E2E_TEMPLATE_DIR)/v1.9/cluster-template-workload.yaml"
+
 .PHONY: generate-e2e-templates-v1.8
 generate-e2e-templates-v1.8: $(KUSTOMIZE)
 	"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_TEMPLATE_DIR)/v1.8/clusterclass" > "$(E2E_TEMPLATE_DIR)/v1.8/clusterclass-quick-start.yaml"
 	"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_TEMPLATE_DIR)/v1.8/workload" > "$(E2E_TEMPLATE_DIR)/v1.8/cluster-template-workload.yaml"
 
-.PHONY: generate-e2e-templates-v1.7
-generate-e2e-templates-v1.7: $(KUSTOMIZE)
-	"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_TEMPLATE_DIR)/v1.7/clusterclass" > "$(E2E_TEMPLATE_DIR)/v1.7/clusterclass-quick-start.yaml"
-	"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_TEMPLATE_DIR)/v1.7/workload" > "$(E2E_TEMPLATE_DIR)/v1.7/cluster-template-workload.yaml"
-
 .PHONY: generate-test-infra-prowjobs
 generate-test-infra-prowjobs: $(PROWJOB_GEN) ## Generates the prowjob configurations in test-infra
 	@if [ -z "${TEST_INFRA_DIR}" ]; then echo "TEST_INFRA_DIR is not set"; exit 1; fi

clusterctl-settings.json

@@ -2,6 +2,6 @@
   "name": "infrastructure-vsphere",
   "config": {
     "componentsFile": "infrastructure-components.yaml",
-    "nextVersion": "v1.9.99"
+    "nextVersion": "v1.10.99"
   }
 }

docs/release/release-tasks.md

@@ -44,12 +44,13 @@ This comes down to changing occurrences of the old version to the new version, e
       1. Create a new `v1.7` folder. It should be created based on the `main` folder and only contain the templates
         we use in the clusterctl upgrade tests (as of today `remote-management`).
       2. Remove old folders that are not used anymore in clusterctl upgrade tests.
-   5. Modify the test specs in `test/e2e/capi_clusterctl_upgrade_test.go` (according to the versions we want to test described above).
+      3. Copy over the workload folder from a previous release.
+   5. Modify the test specs in `test/e2e/clusterctl_upgrade_test.go` (according to the versions we want to test described above).
       Please note that both `InitWithKubernetesVersion` and `WorkloadKubernetesVersion` should be the highest mgmt cluster version supported by the respective Cluster API version.
 2. Update `clusterctl-settings.json`: `v1.7.99` => `v1.8.99`.
 3. Make sure all tests are green (also run `pull-cluster-api-provider-vsphere-e2e-full-main` and `pull-cluster-api-provider-vsphere-conformance-main`).
 
-Prior art: TODO(sbueringer): link example PR
+Prior art: [🌱 Prepare main for development of the new release](https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/pull/2643)
 
 ## Remove previously deprecated code
 

metadata.yaml

@@ -36,3 +36,6 @@ releaseSeries:
   - major: 1
     minor: 9
     contract: v1beta1
+  - major: 1
+    minor: 10
+    contract: v1beta1

test/e2e/clusterctl_upgrade_test.go

@@ -21,7 +21,7 @@ import (
 	capi_e2e "sigs.k8s.io/cluster-api/test/e2e"
 )
 
-var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.8=>current, CAPI 1.5=>1.6) [ClusterClass]", func() {
+var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.9=>current, CAPI 1.6=>1.6) [ClusterClass]", func() {
 	capi_e2e.ClusterctlUpgradeSpec(ctx, func() capi_e2e.ClusterctlUpgradeSpecInput {
 		return capi_e2e.ClusterctlUpgradeSpecInput{
 			E2EConfig:                         e2eConfig,
@@ -30,22 +30,22 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.8=
 			ArtifactFolder:                    artifactFolder,
 			SkipCleanup:                       skipCleanup,
 			MgmtFlavor:                        "remote-management",
-			InitWithBinary:                    "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.4/clusterctl-{OS}-{ARCH}",
-			InitWithCoreProvider:              "cluster-api:v1.5.4",
-			InitWithBootstrapProviders:        []string{"kubeadm:v1.5.4"},
-			InitWithControlPlaneProviders:     []string{"kubeadm:v1.5.4"},
-			InitWithInfrastructureProviders:   []string{"vsphere:v1.8.4"},
+			InitWithBinary:                    "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.1/clusterctl-{OS}-{ARCH}",
+			InitWithCoreProvider:              "cluster-api:v1.6.1",
+			InitWithBootstrapProviders:        []string{"kubeadm:v1.6.1"},
+			InitWithControlPlaneProviders:     []string{"kubeadm:v1.6.1"},
+			InitWithInfrastructureProviders:   []string{"vsphere:v1.9.0"},
 			InitWithRuntimeExtensionProviders: []string{},
 			// InitWithKubernetesVersion should be the highest kubernetes version supported by the init Cluster API version.
 			// This is to guarantee that both, the old and new CAPI version, support the defined version.
-			InitWithKubernetesVersion: "v1.28.0",
-			WorkloadKubernetesVersion: "v1.28.0",
+			InitWithKubernetesVersion: "v1.29.0",
+			WorkloadKubernetesVersion: "v1.29.0",
 			WorkloadFlavor:            "workload",
 		}
 	})
 })
 
-var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.7=>current, CAPI 1.4=>1.6) [ClusterClass]", func() {
+var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.8=>current, CAPI 1.5=>1.6) [ClusterClass]", func() {
 	capi_e2e.ClusterctlUpgradeSpec(ctx, func() capi_e2e.ClusterctlUpgradeSpecInput {
 		return capi_e2e.ClusterctlUpgradeSpecInput{
 			E2EConfig:                         e2eConfig,
@@ -54,16 +54,16 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.7=
 			ArtifactFolder:                    artifactFolder,
 			SkipCleanup:                       skipCleanup,
 			MgmtFlavor:                        "remote-management",
-			InitWithBinary:                    "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.9/clusterctl-{OS}-{ARCH}",
-			InitWithCoreProvider:              "cluster-api:v1.4.9",
-			InitWithBootstrapProviders:        []string{"kubeadm:v1.4.9"},
-			InitWithControlPlaneProviders:     []string{"kubeadm:v1.4.9"},
-			InitWithInfrastructureProviders:   []string{"vsphere:v1.7.4"},
+			InitWithBinary:                    "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.4/clusterctl-{OS}-{ARCH}",
+			InitWithCoreProvider:              "cluster-api:v1.5.4",
+			InitWithBootstrapProviders:        []string{"kubeadm:v1.5.4"},
+			InitWithControlPlaneProviders:     []string{"kubeadm:v1.5.4"},
+			InitWithInfrastructureProviders:   []string{"vsphere:v1.8.4"},
 			InitWithRuntimeExtensionProviders: []string{},
 			// InitWithKubernetesVersion should be the highest kubernetes version supported by the init Cluster API version.
 			// This is to guarantee that both, the old and new CAPI version, support the defined version.
-			InitWithKubernetesVersion: "v1.27.3",
-			WorkloadKubernetesVersion: "v1.27.3",
+			InitWithKubernetesVersion: "v1.28.0",
+			WorkloadKubernetesVersion: "v1.28.0",
 			WorkloadFlavor:            "workload",
 		}
 	})

test/e2e/config/vsphere-ci.yaml

@@ -34,7 +34,7 @@ providers:
         type: "url"
         contract: v1beta1
         files:
-          - sourcePath: "../data/shared/main/v1beta1/metadata.yaml"
+          - sourcePath: "../data/shared/v1.9/v1beta1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
@@ -48,16 +48,6 @@ providers:
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
-      - name: v1.4.9
-        # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.9/core-components.yaml"
-        type: "url"
-        contract: v1beta1
-        files:
-          - sourcePath: "../data/shared/v1.7/v1beta1/metadata.yaml"
-        replacements:
-          - old: "imagePullPolicy: Always"
-            new: "imagePullPolicy: IfNotPresent"
 
   - name: kubeadm
     type: BootstrapProvider
@@ -68,7 +58,7 @@ providers:
         type: "url"
         contract: v1beta1
         files:
-          - sourcePath: "../data/shared/main/v1beta1/metadata.yaml"
+          - sourcePath: "../data/shared/v1.9/v1beta1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
@@ -82,16 +72,6 @@ providers:
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
-      - name: v1.4.9
-        # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.9/bootstrap-components.yaml"
-        type: "url"
-        contract: v1beta1
-        files:
-          - sourcePath: "../data/shared/v1.7/v1beta1/metadata.yaml"
-        replacements:
-          - old: "imagePullPolicy: Always"
-            new: "imagePullPolicy: IfNotPresent"
 
   - name: kubeadm
     type: ControlPlaneProvider
@@ -102,7 +82,7 @@ providers:
         type: "url"
         contract: v1beta1
         files:
-          - sourcePath: "../data/shared/main/v1beta1/metadata.yaml"
+          - sourcePath: "../data/shared/v1.9/v1beta1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
@@ -116,21 +96,11 @@ providers:
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
-      - name: v1.4.9
-        # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.9/control-plane-components.yaml"
-        type: "url"
-        contract: v1beta1
-        files:
-          - sourcePath: "../data/shared/v1.7/v1beta1/metadata.yaml"
-        replacements:
-          - old: "imagePullPolicy: Always"
-            new: "imagePullPolicy: IfNotPresent"
 
   - name: vsphere
     type: InfrastructureProvider
     versions:
-      - name: v1.9.99
+      - name: v1.10.99
         # Use manifest from source files
         value: ../../../../cluster-api-provider-vsphere/config/default
         contract: v1beta1
@@ -156,26 +126,26 @@ providers:
           - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/main/cluster-template.yaml"
           - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/main/clusterclass-quick-start.yaml"
           - sourcePath: "../data/shared/main/v1beta1_provider/metadata.yaml"
-      - name: v1.8.4
+      - name: v1.9.0
         # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/releases/download/v1.8.4/infrastructure-components.yaml"
+        value: "https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/releases/download/v1.9.0/infrastructure-components.yaml"
         type: "url"
         contract: v1beta1
         files:
           # Add a cluster template
-          - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/v1.8/cluster-template-workload.yaml"
-          - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/v1.8/clusterclass-quick-start.yaml"
-          - sourcePath: "../data/shared/v1.8/v1beta1_provider/metadata.yaml"
-      - name: v1.7.4
+          - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/v1.9/cluster-template-workload.yaml"
+          - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/v1.9/clusterclass-quick-start.yaml"
+          - sourcePath: "../data/shared/v1.9/v1beta1_provider/metadata.yaml"
+      - name: v1.8.4
         # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/releases/download/v1.7.4/infrastructure-components.yaml"
+        value: "https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/releases/download/v1.8.4/infrastructure-components.yaml"
         type: "url"
         contract: v1beta1
         files:
           # Add a cluster template
-          - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/v1.7/cluster-template-workload.yaml"
-          - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/v1.7/clusterclass-quick-start.yaml"
-          - sourcePath: "../data/shared/v1.7/v1beta1_provider/metadata.yaml"
+          - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/v1.8/cluster-template-workload.yaml"
+          - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/v1.8/clusterclass-quick-start.yaml"
+          - sourcePath: "../data/shared/v1.8/v1beta1_provider/metadata.yaml"
 
 variables:
   KUBERNETES_VERSION: "v1.29.0"

test/e2e/config/vsphere-dev.yaml

@@ -37,7 +37,7 @@ providers:
         type: "url"
         contract: v1beta1
         files:
-          - sourcePath: "../data/shared/main/v1beta1/metadata.yaml"
+          - sourcePath: "../data/shared/v1.9/v1beta1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
@@ -51,16 +51,6 @@ providers:
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
-      - name: v1.4.9
-        # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.9/core-components.yaml"
-        type: "url"
-        contract: v1beta1
-        files:
-          - sourcePath: "../data/shared/v1.7/v1beta1/metadata.yaml"
-        replacements:
-          - old: "imagePullPolicy: Always"
-            new: "imagePullPolicy: IfNotPresent"
 
   - name: kubeadm
     type: BootstrapProvider
@@ -71,7 +61,7 @@ providers:
         type: "url"
         contract: v1beta1
         files:
-          - sourcePath: "../data/shared/main/v1beta1/metadata.yaml"
+          - sourcePath: "../data/shared/v1.9/v1beta1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
@@ -85,16 +75,6 @@ providers:
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
-      - name: v1.4.9
-        # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.9/bootstrap-components.yaml"
-        type: "url"
-        contract: v1beta1
-        files:
-          - sourcePath: "../data/shared/v1.7/v1beta1/metadata.yaml"
-        replacements:
-          - old: "imagePullPolicy: Always"
-            new: "imagePullPolicy: IfNotPresent"
 
   - name: kubeadm
     type: ControlPlaneProvider
@@ -105,7 +85,7 @@ providers:
         type: "url"
         contract: v1beta1
         files:
-          - sourcePath: "../data/shared/main/v1beta1/metadata.yaml"
+          - sourcePath: "../data/shared/v1.9/v1beta1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
@@ -119,21 +99,11 @@ providers:
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
-      - name: v1.4.9
-        # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.9/control-plane-components.yaml"
-        type: "url"
-        contract: v1beta1
-        files:
-          - sourcePath: "../data/shared/v1.7/v1beta1/metadata.yaml"
-        replacements:
-          - old: "imagePullPolicy: Always"
-            new: "imagePullPolicy: IfNotPresent"
 
   - name: vsphere
     type: InfrastructureProvider
     versions:
-      - name: v1.9.99
+      - name: v1.10.99
         # Use manifest from source files
         value: ../../../../cluster-api-provider-vsphere/config/default
         contract: v1beta1
@@ -159,26 +129,26 @@ providers:
           - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/main/cluster-template.yaml"
           - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/main/clusterclass-quick-start.yaml"
           - sourcePath: "../data/shared/main/v1beta1_provider/metadata.yaml"
-      - name: v1.8.4
+      - name: v1.9.0
         # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/releases/download/v1.8.4/infrastructure-components.yaml"
+        value: "https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/releases/download/v1.9.0/infrastructure-components.yaml"
         type: "url"
         contract: v1beta1
         files:
           # Add a cluster template
-          - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/v1.8/cluster-template-workload.yaml"
-          - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/v1.8/clusterclass-quick-start.yaml"
-          - sourcePath: "../data/shared/v1.8/v1beta1_provider/metadata.yaml"
-      - name: v1.7.4
+          - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/v1.9/cluster-template-workload.yaml"
+          - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/v1.9/clusterclass-quick-start.yaml"
+          - sourcePath: "../data/shared/v1.9/v1beta1_provider/metadata.yaml"
+      - name: v1.8.4
         # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/releases/download/v1.7.4/infrastructure-components.yaml"
+        value: "https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/releases/download/v1.8.4/infrastructure-components.yaml"
         type: "url"
         contract: v1beta1
         files:
           # Add a cluster template
-          - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/v1.7/cluster-template-workload.yaml"
-          - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/v1.7/clusterclass-quick-start.yaml"
-          - sourcePath: "../data/shared/v1.7/v1beta1_provider/metadata.yaml"
+          - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/v1.8/cluster-template-workload.yaml"
+          - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/v1.8/clusterclass-quick-start.yaml"
+          - sourcePath: "../data/shared/v1.8/v1beta1_provider/metadata.yaml"
 
 variables:
   KUBERNETES_VERSION: "v1.29.0"