Skip to content

Commit 8f44937

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #3453 from fabriziopandini/prepare-main-for-1.14
🌱 Prepare main for v1.14
2 parents 469f3a7 + 57c9099 commit 8f44937

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+664
-376
lines changed

‎.github/workflows/weekly-md-link-check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
branch: [ main, release-1.13, release-1.12, release-1.11, release-1.10 ]
17+
branch: [ main, release-1.13, release-1.12, release-1.11 ]
1818
runs-on: ubuntu-latest
1919
steps:
2020
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2

‎.github/workflows/weekly-security-scan.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
branch: [ main, release-1.13, release-1.12, release-1.11, release-1.10 ]
16+
branch: [ main, release-1.13, release-1.12, release-1.11 ]
1717
name: Trivy
1818
runs-on: ubuntu-latest
1919
steps:

‎.github/workflows/weekly-test-release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
branch: [ main, release-1.13, release-1.12, release-1.11, release-1.10 ]
20+
branch: [ main, release-1.13, release-1.12, release-1.11 ]
2121
runs-on: ubuntu-latest
2222
steps:
2323
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2

‎Makefile

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

377377
.PHONY: generate-e2e-templates
378-
generate-e2e-templates: $(KUSTOMIZE) $(addprefix generate-e2e-templates-, v1.10 v1.11 v1.12 main) ## Generate test templates for all branches
378+
generate-e2e-templates: $(KUSTOMIZE) $(addprefix generate-e2e-templates-, v1.11 v1.12 v1.13 main) ## Generate test templates for all branches
379379

380380
.PHONY: generate-e2e-templates-main
381381
generate-e2e-templates-main: $(KUSTOMIZE) ## Generate test templates for the main branch
@@ -421,6 +421,14 @@ generate-e2e-templates-main: $(KUSTOMIZE) ## Generate test templates for the mai
421421
"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_SUPERVISOR_TEMPLATE_DIR)/main/fast-rollout" > "$(E2E_SUPERVISOR_TEMPLATE_DIR)/main/cluster-template-fast-rollout-supervisor.yaml"
422422
"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_SUPERVISOR_TEMPLATE_DIR)/main/ownerrefs-finalizers" > "$(E2E_SUPERVISOR_TEMPLATE_DIR)/main/cluster-template-ownerrefs-finalizers-supervisor.yaml"
423423

424+
.PHONY: generate-e2e-templates-v1.13
425+
generate-e2e-templates-v1.13: $(KUSTOMIZE)
426+
"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_GOVMOMI_TEMPLATE_DIR)/v1.13/clusterclass" > "$(E2E_GOVMOMI_TEMPLATE_DIR)/v1.13/clusterclass-quick-start.yaml"
427+
"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_GOVMOMI_TEMPLATE_DIR)/v1.13/workload" > "$(E2E_GOVMOMI_TEMPLATE_DIR)/v1.13/cluster-template-workload.yaml"
428+
429+
"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_SUPERVISOR_TEMPLATE_DIR)/v1.13/clusterclass" > "$(E2E_SUPERVISOR_TEMPLATE_DIR)/v1.13/clusterclass-quick-start-supervisor.yaml"
430+
"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_SUPERVISOR_TEMPLATE_DIR)/v1.13/workload" > "$(E2E_SUPERVISOR_TEMPLATE_DIR)/v1.13/cluster-template-workload-supervisor.yaml"
431+
424432
.PHONY: generate-e2e-templates-v1.12
425433
generate-e2e-templates-v1.12: $(KUSTOMIZE)
426434
"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_GOVMOMI_TEMPLATE_DIR)/v1.12/clusterclass" > "$(E2E_GOVMOMI_TEMPLATE_DIR)/v1.12/clusterclass-quick-start.yaml"
@@ -437,14 +445,6 @@ generate-e2e-templates-v1.11: $(KUSTOMIZE)
437445
"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_SUPERVISOR_TEMPLATE_DIR)/v1.11/clusterclass" > "$(E2E_SUPERVISOR_TEMPLATE_DIR)/v1.11/clusterclass-quick-start-supervisor.yaml"
438446
"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_SUPERVISOR_TEMPLATE_DIR)/v1.11/workload" > "$(E2E_SUPERVISOR_TEMPLATE_DIR)/v1.11/cluster-template-workload-supervisor.yaml"
439447

440-
.PHONY: generate-e2e-templates-v1.10
441-
generate-e2e-templates-v1.10: $(KUSTOMIZE)
442-
"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_GOVMOMI_TEMPLATE_DIR)/v1.10/clusterclass" > "$(E2E_GOVMOMI_TEMPLATE_DIR)/v1.10/clusterclass-quick-start.yaml"
443-
"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_GOVMOMI_TEMPLATE_DIR)/v1.10/workload" > "$(E2E_GOVMOMI_TEMPLATE_DIR)/v1.10/cluster-template-workload.yaml"
444-
445-
"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_SUPERVISOR_TEMPLATE_DIR)/v1.10/clusterclass" > "$(E2E_SUPERVISOR_TEMPLATE_DIR)/v1.10/clusterclass-quick-start-supervisor.yaml"
446-
"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_SUPERVISOR_TEMPLATE_DIR)/v1.10/workload" > "$(E2E_SUPERVISOR_TEMPLATE_DIR)/v1.10/cluster-template-workload-supervisor.yaml"
447-
448448
.PHONY: generate-test-infra-prowjobs
449449
generate-test-infra-prowjobs: $(PROWJOB_GEN) ## Generates the prowjob configurations in test-infra
450450
@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.13.99"
5+
"nextVersion": "v1.14.99"
66
}
77
}

‎metadata.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,6 @@ releaseSeries:
4848
- major: 1
4949
minor: 13
5050
contract: v1beta1
51+
- major: 1
52+
minor: 14
53+
contract: v1beta1

‎test/e2e/clusterctl_upgrade_test.go

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ var (
4444
)
4545

4646
// 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).
47-
var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.12=>current, CAPI 1.9=>1.10) on K8S latest ci mgmt cluster [vcsim] [supervisor] [ClusterClass]", func() {
47+
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() {
4848
const specName = "clusterctl-upgrade-1.12-current-latest-ci" // prefix (clusterctl-upgrade) copied from CAPI
4949
Setup(specName, func(testSpecificSettingsGetter func() testSettings) {
5050
capi_e2e.ClusterctlUpgradeSpec(ctx, func() capi_e2e.ClusterctlUpgradeSpecInput {
51-
capiVersion := "1.9"
51+
capiVersion := "1.10"
5252
capiStableRelease, err := getStableReleaseOfMinor(ctx, capiReleaseMarkerPrefix, capiVersion)
5353
Expect(err).ToNot(HaveOccurred(), "Failed to get stable version for minor release : %s", capiVersion)
54-
capvVersion := "1.12"
54+
capvVersion := "1.13"
5555
capvStableRelease, err := getStableReleaseOfMinor(ctx, capvReleaseMarkerPrefix, capvVersion)
5656
Expect(err).ToNot(HaveOccurred(), "Failed to get stable version for minor release : %s", capvVersion)
5757
initKubernetesVersion, err := kubernetesversions.ResolveVersion(ctx, e2eConfig.MustGetVariable("KUBERNETES_VERSION_MANAGEMENT_LATEST_CI"))
@@ -84,7 +84,7 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.12
8484
// This is to guarantee that both, the old and new CAPI version, support the defined version.
8585
// Ensure all Kubernetes versions used here are covered in patch-vsphere-template.yaml
8686
InitWithKubernetesVersion: initKubernetesVersion,
87-
WorkloadKubernetesVersion: "v1.32.0",
87+
WorkloadKubernetesVersion: "v1.33.0",
8888
WorkloadFlavor: testSpecificSettingsGetter().FlavorForMode("workload"),
8989
// We are using a separate management cluster. For running in VCSim we also have to pass WithAdditionalVCSimServer
9090
// below otherwise there will be no VCSim instance created in the management cluster.
@@ -100,14 +100,14 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.12
100100
})
101101

102102
// 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).
103-
var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.12=>current, CAPI 1.9=>1.10) [vcsim] [supervisor] [ClusterClass]", func() {
103+
var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.13=>current, CAPI 1.10=>1.11) [vcsim] [supervisor] [ClusterClass]", func() {
104104
const specName = "clusterctl-upgrade-1.12-current" // prefix (clusterctl-upgrade) copied from CAPI
105105
Setup(specName, func(testSpecificSettingsGetter func() testSettings) {
106106
capi_e2e.ClusterctlUpgradeSpec(ctx, func() capi_e2e.ClusterctlUpgradeSpecInput {
107-
capiVersion := "1.9"
107+
capiVersion := "1.10"
108108
capiStableRelease, err := getStableReleaseOfMinor(ctx, capiReleaseMarkerPrefix, capiVersion)
109109
Expect(err).ToNot(HaveOccurred(), "Failed to get stable version for minor release : %s", capiVersion)
110-
capvVersion := "1.12"
110+
capvVersion := "1.13"
111111
capvStableRelease, err := getStableReleaseOfMinor(ctx, capvReleaseMarkerPrefix, capvVersion)
112112
Expect(err).ToNot(HaveOccurred(), "Failed to get stable version for minor release : %s", capvVersion)
113113
return capi_e2e.ClusterctlUpgradeSpecInput{
@@ -137,8 +137,8 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.12
137137
// InitWithKubernetesVersion should be the highest kubernetes version supported by the init Cluster API version.
138138
// This is to guarantee that both, the old and new CAPI version, support the defined version.
139139
// Ensure all Kubernetes versions used here are covered in patch-vsphere-template.yaml
140-
InitWithKubernetesVersion: "v1.32.0",
141-
WorkloadKubernetesVersion: "v1.32.0",
140+
InitWithKubernetesVersion: "v1.33.0",
141+
WorkloadKubernetesVersion: "v1.33.0",
142142
WorkloadFlavor: testSpecificSettingsGetter().FlavorForMode("workload"),
143143
// We are using a separate management cluster. For running in VCSim we also have to pass WithAdditionalVCSimServer
144144
// below otherwise there will be no VCSim instance created in the management cluster.
@@ -154,14 +154,14 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.12
154154
})
155155

156156
// 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).
157-
var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.11=>current, CAPI 1.8=>1.10) [vcsim] [supervisor] [ClusterClass]", func() {
157+
var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.12=>current, CAPI 1.9=>1.11) [vcsim] [supervisor] [ClusterClass]", func() {
158158
const specName = "clusterctl-upgrade-1.11-current" // prefix (clusterctl-upgrade) copied from CAPI
159159
Setup(specName, func(testSpecificSettingsGetter func() testSettings) {
160160
capi_e2e.ClusterctlUpgradeSpec(ctx, func() capi_e2e.ClusterctlUpgradeSpecInput {
161-
capiVersion := "1.8"
161+
capiVersion := "1.9"
162162
capiStableRelease, err := getStableReleaseOfMinor(ctx, capiReleaseMarkerPrefix, capiVersion)
163163
Expect(err).ToNot(HaveOccurred(), "Failed to get stable version for minor release : %s", capiVersion)
164-
capvVersion := "1.11"
164+
capvVersion := "1.12"
165165
capvStableRelease, err := getStableReleaseOfMinor(ctx, capvReleaseMarkerPrefix, capvVersion)
166166
Expect(err).ToNot(HaveOccurred(), "Failed to get stable version for minor release : %s", capvVersion)
167167
return capi_e2e.ClusterctlUpgradeSpecInput{
@@ -191,8 +191,8 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.11
191191
// InitWithKubernetesVersion should be the highest kubernetes version supported by the init Cluster API version.
192192
// This is to guarantee that both, the old and new CAPI version, support the defined version.
193193
// Ensure all Kubernetes versions used here are covered in patch-vsphere-template.yaml
194-
InitWithKubernetesVersion: "v1.31.0",
195-
WorkloadKubernetesVersion: "v1.31.0",
194+
InitWithKubernetesVersion: "v1.32.0",
195+
WorkloadKubernetesVersion: "v1.32.0",
196196
WorkloadFlavor: testSpecificSettingsGetter().FlavorForMode("workload"),
197197
// We are using a separate management cluster. For running in VCSim we also have to pass WithAdditionalVCSimServer
198198
// below otherwise there will be no VCSim instance created in the management cluster.
@@ -208,14 +208,14 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.11
208208
})
209209

210210
// 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).
211-
var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.10=>current, CAPI 1.7=>1.10) [vcsim] [supervisor] [ClusterClass]", func() {
211+
var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.11=>current, CAPI 1.8=>1.11) [vcsim] [supervisor] [ClusterClass]", func() {
212212
const specName = "clusterctl-upgrade-1.10-current" // prefix (clusterctl-upgrade) copied from CAPI
213213
Setup(specName, func(testSpecificSettingsGetter func() testSettings) {
214214
capi_e2e.ClusterctlUpgradeSpec(ctx, func() capi_e2e.ClusterctlUpgradeSpecInput {
215-
capiVersion := "1.7"
215+
capiVersion := "1.8"
216216
capiStableRelease, err := getStableReleaseOfMinor(ctx, capiReleaseMarkerPrefix, capiVersion)
217217
Expect(err).ToNot(HaveOccurred(), "Failed to get stable version for minor release : %s", capiVersion)
218-
capvVersion := "1.10"
218+
capvVersion := "1.11"
219219
capvStableRelease, err := getStableReleaseOfMinor(ctx, capvReleaseMarkerPrefix, capvVersion)
220220
Expect(err).ToNot(HaveOccurred(), "Failed to get stable version for minor release : %s", capvVersion)
221221
return capi_e2e.ClusterctlUpgradeSpecInput{
@@ -245,8 +245,8 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.10
245245
// InitWithKubernetesVersion should be the highest kubernetes version supported by the init Cluster API version.
246246
// This is to guarantee that both, the old and new CAPI version, support the defined version.
247247
// Ensure all Kubernetes versions used here are covered in patch-vsphere-template.yaml
248-
InitWithKubernetesVersion: "v1.30.0",
249-
WorkloadKubernetesVersion: "v1.30.0",
248+
InitWithKubernetesVersion: "v1.31.0",
249+
WorkloadKubernetesVersion: "v1.31.0",
250250
WorkloadFlavor: testSpecificSettingsGetter().FlavorForMode("workload"),
251251
// We are using a separate management cluster. For running in VCSim we also have to pass WithAdditionalVCSimServer
252252
// below otherwise there will be no VCSim instance created in the management cluster.

0 commit comments

Comments
 (0)