Prepare main for development of the new release

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,7 +44,8 @@ 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`).

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.9=>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

@@ -130,7 +130,7 @@ providers:
   - 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,6 +156,16 @@ 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.9.0
+        # Use manifest from source files
+        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.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.8.4/infrastructure-components.yaml"

test/e2e/config/vsphere-dev.yaml

@@ -133,7 +133,7 @@ providers:
   - 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,6 +159,16 @@ 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.9.0
+        # Use manifest from source files
+        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.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.8.4/infrastructure-components.yaml"

test/e2e/data/infrastructure-vsphere/v1.9/base/kustomization.yaml

@@ -0,0 +1,15 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - cluster-template.yaml
+  - ../commons/cluster-resource-set.yaml
+patchesStrategicMerge:
+  - ../commons/cluster-resource-set-label.yaml
+  - ../commons/cluster-network-CIDR.yaml
+  - ../commons/cluster-resource-set-csi-insecure.yaml
+patches:
+  # We are dropping storage policy so we also have test coverage
+  # for normal provisioning via data stores.
+  - target:
+      kind: VSphereMachineTemplate
+    path: ../commons/remove-storage-policy.yaml