Skip to content

Commit 0549509

Browse files
zhanggbjzhanggbj
authored
🌱 Prepare main for release 1.15 (#3638)
* Prepare main for release 1.15 * Prepare main for release 1.15
1 parent 67dffe5 commit 0549509

40 files changed

+4161
-105
lines changed

‎Makefile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ generate-doctoc:
380380
TRACE=$(TRACE) ./hack/generate-doctoc.sh
381381

382382
.PHONY: generate-e2e-templates
383-
generate-e2e-templates: $(KUSTOMIZE) $(addprefix generate-e2e-templates-, v1.11 v1.12 v1.13 main) ## Generate test templates for all branches
383+
generate-e2e-templates: $(KUSTOMIZE) $(addprefix generate-e2e-templates-, v1.12 v1.13 v1.14 main) ## Generate test templates for all branches
384384

385385
.PHONY: generate-e2e-templates-main
386386
generate-e2e-templates-main: $(KUSTOMIZE) ## Generate test templates for the main branch
@@ -426,6 +426,14 @@ generate-e2e-templates-main: $(KUSTOMIZE) ## Generate test templates for the mai
426426
"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_SUPERVISOR_TEMPLATE_DIR)/main/fast-rollout" > "$(E2E_SUPERVISOR_TEMPLATE_DIR)/main/cluster-template-fast-rollout-supervisor.yaml"
427427
"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_SUPERVISOR_TEMPLATE_DIR)/main/ownerrefs-finalizers" > "$(E2E_SUPERVISOR_TEMPLATE_DIR)/main/cluster-template-ownerrefs-finalizers-supervisor.yaml"
428428

429+
.PHONY: generate-e2e-templates-v1.14
430+
generate-e2e-templates-v1.14: $(KUSTOMIZE)
431+
"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_GOVMOMI_TEMPLATE_DIR)/v1.14/clusterclass" > "$(E2E_GOVMOMI_TEMPLATE_DIR)/v1.14/clusterclass-quick-start.yaml"
432+
"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_GOVMOMI_TEMPLATE_DIR)/v1.14/workload" > "$(E2E_GOVMOMI_TEMPLATE_DIR)/v1.14/cluster-template-workload.yaml"
433+
434+
"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_SUPERVISOR_TEMPLATE_DIR)/v1.14/clusterclass" > "$(E2E_SUPERVISOR_TEMPLATE_DIR)/v1.14/clusterclass-quick-start-supervisor.yaml"
435+
"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_SUPERVISOR_TEMPLATE_DIR)/v1.14/workload" > "$(E2E_SUPERVISOR_TEMPLATE_DIR)/v1.14/cluster-template-workload-supervisor.yaml"
436+
429437
.PHONY: generate-e2e-templates-v1.13
430438
generate-e2e-templates-v1.13: $(KUSTOMIZE)
431439
"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_GOVMOMI_TEMPLATE_DIR)/v1.13/clusterclass" > "$(E2E_GOVMOMI_TEMPLATE_DIR)/v1.13/clusterclass-quick-start.yaml"
@@ -442,14 +450,6 @@ generate-e2e-templates-v1.12: $(KUSTOMIZE)
442450
"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_SUPERVISOR_TEMPLATE_DIR)/v1.12/clusterclass" > "$(E2E_SUPERVISOR_TEMPLATE_DIR)/v1.12/clusterclass-quick-start-supervisor.yaml"
443451
"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_SUPERVISOR_TEMPLATE_DIR)/v1.12/workload" > "$(E2E_SUPERVISOR_TEMPLATE_DIR)/v1.12/cluster-template-workload-supervisor.yaml"
444452

445-
.PHONY: generate-e2e-templates-v1.11
446-
generate-e2e-templates-v1.11: $(KUSTOMIZE)
447-
"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_GOVMOMI_TEMPLATE_DIR)/v1.11/clusterclass" > "$(E2E_GOVMOMI_TEMPLATE_DIR)/v1.11/clusterclass-quick-start.yaml"
448-
"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_GOVMOMI_TEMPLATE_DIR)/v1.11/workload" > "$(E2E_GOVMOMI_TEMPLATE_DIR)/v1.11/cluster-template-workload.yaml"
449-
450-
"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_SUPERVISOR_TEMPLATE_DIR)/v1.11/clusterclass" > "$(E2E_SUPERVISOR_TEMPLATE_DIR)/v1.11/clusterclass-quick-start-supervisor.yaml"
451-
"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_SUPERVISOR_TEMPLATE_DIR)/v1.11/workload" > "$(E2E_SUPERVISOR_TEMPLATE_DIR)/v1.11/cluster-template-workload-supervisor.yaml"
452-
453453
.PHONY: generate-test-infra-prowjobs
454454
generate-test-infra-prowjobs: $(PROWJOB_GEN) ## Generates the prowjob configurations in test-infra
455455
@if [ -z "${TEST_INFRA_DIR}" ]; then echo "TEST_INFRA_DIR is not set"; exit 1; fi

‎clusterctl-settings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"name": "infrastructure-vsphere",
33
"config": {
44
"componentsFile": "infrastructure-components.yaml",
5-
"nextVersion": "v1.14.99"
5+
"nextVersion": "v1.15.99"
66
}
77
}

‎metadata.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,6 @@ releaseSeries:
5151
- major: 1
5252
minor: 14
5353
contract: v1beta1
54+
- major: 1
55+
minor: 15
56+
contract: v1beta1

‎test/e2e/clusterctl_upgrade_test.go‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ var (
4545
)
4646

4747
// Note: This test should be changed during "prepare main branch", it should test CAPV n-1 => current (and then corresponding CAPI versions if already available).
48-
var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.13=>current, CAPI 1.10=>1.11) on K8S latest ci mgmt cluster [vcsim] [supervisor] [ClusterClass]", func() {
49-
const specName = "clusterctl-upgrade-1.12-current-latest-ci" // prefix (clusterctl-upgrade) copied from CAPI
48+
var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.14=>current, CAPI 1.11=>1.12) on K8S latest ci mgmt cluster [vcsim] [supervisor] [ClusterClass]", func() {
49+
const specName = "clusterctl-upgrade-1.14-current-latest-ci" // prefix (clusterctl-upgrade) copied from CAPI
5050
Setup(specName, func(testSpecificSettingsGetter func() testSettings) {
5151
capi_e2e.ClusterctlUpgradeSpec(ctx, func() capi_e2e.ClusterctlUpgradeSpecInput {
52-
capiVersion := "1.10"
52+
capiVersion := "1.11"
5353
capiStableRelease, err := getStableReleaseOfMinor(ctx, capiReleaseMarkerPrefix, capiVersion)
5454
Expect(err).ToNot(HaveOccurred(), "Failed to get stable version for minor release : %s", capiVersion)
55-
capvVersion := "1.13"
55+
capvVersion := "1.14"
5656
capvStableRelease, err := getStableReleaseOfMinor(ctx, capvReleaseMarkerPrefix, capvVersion)
5757
Expect(err).ToNot(HaveOccurred(), "Failed to get stable version for minor release : %s", capvVersion)
5858
initKubernetesVersion, err := kubernetesversions.ResolveVersion(ctx, e2eConfig.MustGetVariable("KUBERNETES_VERSION_MANAGEMENT_LATEST_CI"))
@@ -85,7 +85,7 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.13
8585
// This is to guarantee that both, the old and new CAPI version, support the defined version.
8686
// Ensure all Kubernetes versions used here are covered in patch-vsphere-template.yaml
8787
InitWithKubernetesVersion: initKubernetesVersion,
88-
WorkloadKubernetesVersion: "v1.33.0",
88+
WorkloadKubernetesVersion: "v1.34.0",
8989
WorkloadFlavor: testSpecificSettingsGetter().FlavorForMode("workload"),
9090
// We are using a separate management cluster. For running in VCSim we also have to pass WithAdditionalVCSimServer
9191
// below otherwise there will be no VCSim instance created in the management cluster.
@@ -101,14 +101,14 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.13
101101
})
102102

103103
// Note: This test should be changed during "prepare main branch", it should test CAPV n-1 => current (and then corresponding CAPI versions if already available).
104-
var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.13=>current, CAPI 1.10=>1.11) [vcsim] [supervisor] [ClusterClass]", func() {
105-
const specName = "clusterctl-upgrade-1.12-current" // prefix (clusterctl-upgrade) copied from CAPI
104+
var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.14=>current, CAPI 1.11=>1.12) [vcsim] [supervisor] [ClusterClass]", func() {
105+
const specName = "clusterctl-upgrade-1.14-current" // prefix (clusterctl-upgrade) copied from CAPI
106106
Setup(specName, func(testSpecificSettingsGetter func() testSettings) {
107107
capi_e2e.ClusterctlUpgradeSpec(ctx, func() capi_e2e.ClusterctlUpgradeSpecInput {
108-
capiVersion := "1.10"
108+
capiVersion := "1.11"
109109
capiStableRelease, err := getStableReleaseOfMinor(ctx, capiReleaseMarkerPrefix, capiVersion)
110110
Expect(err).ToNot(HaveOccurred(), "Failed to get stable version for minor release : %s", capiVersion)
111-
capvVersion := "1.13"
111+
capvVersion := "1.14"
112112
capvStableRelease, err := getStableReleaseOfMinor(ctx, capvReleaseMarkerPrefix, capvVersion)
113113
Expect(err).ToNot(HaveOccurred(), "Failed to get stable version for minor release : %s", capvVersion)
114114
return capi_e2e.ClusterctlUpgradeSpecInput{
@@ -138,8 +138,8 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.13
138138
// InitWithKubernetesVersion should be the highest kubernetes version supported by the init Cluster API version.
139139
// This is to guarantee that both, the old and new CAPI version, support the defined version.
140140
// Ensure all Kubernetes versions used here are covered in patch-vsphere-template.yaml
141-
InitWithKubernetesVersion: "v1.33.0",
142-
WorkloadKubernetesVersion: "v1.33.0",
141+
InitWithKubernetesVersion: "v1.34.0",
142+
WorkloadKubernetesVersion: "v1.34.0",
143143
WorkloadFlavor: testSpecificSettingsGetter().FlavorForMode("workload"),
144144
// We are using a separate management cluster. For running in VCSim we also have to pass WithAdditionalVCSimServer
145145
// below otherwise there will be no VCSim instance created in the management cluster.
@@ -155,14 +155,14 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.13
155155
})
156156

157157
// Note: This test should be changed during "prepare main branch", it should test CAPV n-2 => current (and then corresponding CAPI versions if already available).
158-
var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.12=>current, CAPI 1.9=>1.11) [vcsim] [supervisor] [ClusterClass]", func() {
159-
const specName = "clusterctl-upgrade-1.11-current" // prefix (clusterctl-upgrade) copied from CAPI
158+
var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.13=>current, CAPI 1.10=>1.12) [vcsim] [supervisor] [ClusterClass]", func() {
159+
const specName = "clusterctl-upgrade-1.13-current" // prefix (clusterctl-upgrade) copied from CAPI
160160
Setup(specName, func(testSpecificSettingsGetter func() testSettings) {
161161
capi_e2e.ClusterctlUpgradeSpec(ctx, func() capi_e2e.ClusterctlUpgradeSpecInput {
162-
capiVersion := "1.9"
162+
capiVersion := "1.10"
163163
capiStableRelease, err := getStableReleaseOfMinor(ctx, capiReleaseMarkerPrefix, capiVersion)
164164
Expect(err).ToNot(HaveOccurred(), "Failed to get stable version for minor release : %s", capiVersion)
165-
capvVersion := "1.12"
165+
capvVersion := "1.13"
166166
capvStableRelease, err := getStableReleaseOfMinor(ctx, capvReleaseMarkerPrefix, capvVersion)
167167
Expect(err).ToNot(HaveOccurred(), "Failed to get stable version for minor release : %s", capvVersion)
168168
return capi_e2e.ClusterctlUpgradeSpecInput{
@@ -192,8 +192,8 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.12
192192
// InitWithKubernetesVersion should be the highest kubernetes version supported by the init Cluster API version.
193193
// This is to guarantee that both, the old and new CAPI version, support the defined version.
194194
// Ensure all Kubernetes versions used here are covered in patch-vsphere-template.yaml
195-
InitWithKubernetesVersion: "v1.32.0",
196-
WorkloadKubernetesVersion: "v1.32.0",
195+
InitWithKubernetesVersion: "v1.33.0",
196+
WorkloadKubernetesVersion: "v1.33.0",
197197
WorkloadFlavor: testSpecificSettingsGetter().FlavorForMode("workload"),
198198
// We are using a separate management cluster. For running in VCSim we also have to pass WithAdditionalVCSimServer
199199
// below otherwise there will be no VCSim instance created in the management cluster.
@@ -209,14 +209,14 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.12
209209
})
210210

211211
// Note: This test should be changed during "prepare main branch", it should test CAPV n-3 => current (and then corresponding CAPI versions if already available).
212-
var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.11=>current, CAPI 1.8=>1.11) [vcsim] [supervisor] [ClusterClass]", func() {
213-
const specName = "clusterctl-upgrade-1.10-current" // prefix (clusterctl-upgrade) copied from CAPI
212+
var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.12=>current, CAPI 1.9=>1.12) [vcsim] [supervisor] [ClusterClass]", func() {
213+
const specName = "clusterctl-upgrade-1.12-current" // prefix (clusterctl-upgrade) copied from CAPI
214214
Setup(specName, func(testSpecificSettingsGetter func() testSettings) {
215215
capi_e2e.ClusterctlUpgradeSpec(ctx, func() capi_e2e.ClusterctlUpgradeSpecInput {
216-
capiVersion := "1.8"
216+
capiVersion := "1.9"
217217
capiStableRelease, err := getStableReleaseOfMinor(ctx, capiReleaseMarkerPrefix, capiVersion)
218218
Expect(err).ToNot(HaveOccurred(), "Failed to get stable version for minor release : %s", capiVersion)
219-
capvVersion := "1.11"
219+
capvVersion := "1.12"
220220
capvStableRelease, err := getStableReleaseOfMinor(ctx, capvReleaseMarkerPrefix, capvVersion)
221221
Expect(err).ToNot(HaveOccurred(), "Failed to get stable version for minor release : %s", capvVersion)
222222
return capi_e2e.ClusterctlUpgradeSpecInput{
@@ -246,8 +246,8 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.11
246246
// InitWithKubernetesVersion should be the highest kubernetes version supported by the init Cluster API version.
247247
// This is to guarantee that both, the old and new CAPI version, support the defined version.
248248
// Ensure all Kubernetes versions used here are covered in patch-vsphere-template.yaml
249-
InitWithKubernetesVersion: "v1.31.0",
250-
WorkloadKubernetesVersion: "v1.31.0",
249+
InitWithKubernetesVersion: "v1.32.0",
250+
WorkloadKubernetesVersion: "v1.32.0",
251251
WorkloadFlavor: testSpecificSettingsGetter().FlavorForMode("workload"),
252252
// We are using a separate management cluster. For running in VCSim we also have to pass WithAdditionalVCSimServer
253253
// below otherwise there will be no VCSim instance created in the management cluster.

0 commit comments

Comments
 (0)