Skip to content

Commit c9e39ba

Browse files
chrischdichrischdi
committed
Prepare main branch for v1.12 development
1 parent 4429cb3 commit c9e39ba

File tree

17 files changed

+332
-241
lines changed

17 files changed

+332
-241
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ hack/tools/bin
1212

1313
# E2E test templates
1414
test/e2e/data/infrastructure-docker/**/cluster-template*.yaml
15-
!test/e2e/data/infrastructure-docker/**/clusterclass-quick-start.yaml
1615
!test/e2e/data/infrastructure-docker/**/clusterclass-quick-start-runtimesdk.yaml
1716
!test/e2e/data/infrastructure-docker/**/clusterclass-quick-start-runtimesdk-v1beta1.yaml
1817
!test/e2e/data/infrastructure-docker/**/cluster-template-in-memory.yaml
1918
!test/e2e/data/infrastructure-docker/**/clusterclass-in-memory.yaml
2019
test/e2e/data/infrastructure-docker/**/clusterclass-*.yaml
2120
test/e2e/data/infrastructure-inmemory/**/cluster-template*.yaml
21+
!test/e2e/data/infrastructure-docker/**/clusterclass-quick-start.yaml
2222

2323
# Output of Makefile targets using sed on MacOS systems
2424
*.yaml-e

‎Makefile‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ generate-doctoc:
562562
TRACE=$(TRACE) ./hack/generate-doctoc.sh
563563

564564
.PHONY: generate-e2e-templates
565-
generate-e2e-templates: $(KUSTOMIZE) $(addprefix generate-e2e-templates-, v0.3 v0.4 v1.5 v1.6 v1.8 v1.9 v1.10 main) ## Generate cluster templates for all versions
565+
generate-e2e-templates: $(KUSTOMIZE) $(addprefix generate-e2e-templates-, v0.3 v0.4 v1.5 v1.6 v1.9 v1.10 v1.11 main) ## Generate cluster templates for all versions
566566

567567
DOCKER_TEMPLATES := test/e2e/data/infrastructure-docker
568568

@@ -599,6 +599,11 @@ generate-e2e-templates-v1.10: $(KUSTOMIZE)
599599
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1.10/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1.10/cluster-template.yaml
600600
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1.10/cluster-template-topology --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1.10/cluster-template-topology.yaml
601601

602+
.PHONY: generate-e2e-templates-v1.11
603+
generate-e2e-templates-v1.11: $(KUSTOMIZE)
604+
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1.11/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1.11/cluster-template.yaml
605+
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1.11/cluster-template-topology --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1.11/cluster-template-topology.yaml
606+
602607
.PHONY: generate-e2e-templates-main
603608
generate-e2e-templates-main: $(KUSTOMIZE)
604609
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/main/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/main/cluster-template.yaml

‎cmd/clusterctl/hack/create-local-repository.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,30 +54,30 @@
5454
providers = {
5555
'cluster-api': {
5656
'componentsFile': 'core-components.yaml',
57-
'nextVersion': 'v1.11.99',
57+
'nextVersion': 'v1.12.99',
5858
'type': 'CoreProvider',
5959
},
6060
'bootstrap-kubeadm': {
6161
'componentsFile': 'bootstrap-components.yaml',
62-
'nextVersion': 'v1.11.99',
62+
'nextVersion': 'v1.12.99',
6363
'type': 'BootstrapProvider',
6464
'configFolder': 'bootstrap/kubeadm/config/default',
6565
},
6666
'control-plane-kubeadm': {
6767
'componentsFile': 'control-plane-components.yaml',
68-
'nextVersion': 'v1.11.99',
68+
'nextVersion': 'v1.12.99',
6969
'type': 'ControlPlaneProvider',
7070
'configFolder': 'controlplane/kubeadm/config/default',
7171
},
7272
'infrastructure-docker': {
7373
'componentsFile': 'infrastructure-components-development.yaml',
74-
'nextVersion': 'v1.11.99',
74+
'nextVersion': 'v1.12.99',
7575
'type': 'InfrastructureProvider',
7676
'configFolder': 'test/infrastructure/docker/config/default',
7777
},
7878
'runtime-extension-test': {
7979
'componentsFile': 'runtime-extension-components-development.yaml',
80-
'nextVersion': 'v1.11.99',
80+
'nextVersion': 'v1.12.99',
8181
'type': 'RuntimeExtensionProvider',
8282
'configFolder': 'test/extension/config/default',
8383
},

‎hack/tools/internal/tilt-prepare/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ const (
7171

7272
var (
7373
// Defines the default version to be used for the provider CR if no version is specified in the tilt-provider.yaml|json file.
74-
defaultProviderVersion = "v1.11.99"
74+
defaultProviderVersion = "v1.12.99"
7575

7676
// This data struct mirrors a subset of info from the providers struct in the tilt file
7777
// which is containing "hard-coded" tilt-provider.yaml files for the providers managed in the Cluster API repository.

‎metadata.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
77
kind: Metadata
88
releaseSeries:
9+
- major: 1
10+
minor: 12
11+
contract: v1beta2
912
- major: 1
1013
minor: 11
1114
contract: v1beta2

‎test/e2e/clusterctl_upgrade_test.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,9 @@ var _ = Describe("When testing clusterctl upgrades (v0.4=>v1.6=>current)", Flake
202202
})
203203

204204
// Note: This test should be changed during "prepare main branch", it should test n-3 => current.
205-
var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.8=>current) [ClusterClass]", Label("ClusterClass"), func() {
205+
var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.9=>current) [ClusterClass]", Label("ClusterClass"), func() {
206206
// Get n-3 latest stable release
207-
version := "1.8"
207+
version := "1.9"
208208
stableRelease, err := GetStableReleaseOfMinor(ctx, version)
209209
Expect(err).ToNot(HaveOccurred(), "Failed to get stable version for minor release : %s", version)
210210
ClusterctlUpgradeSpec(ctx, func() ClusterctlUpgradeSpecInput {
@@ -224,8 +224,8 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.8=>cur
224224
InitWithProvidersContract: "v1beta1",
225225
// Note: Both InitWithKubernetesVersion and WorkloadKubernetesVersion should be the highest mgmt cluster version supported by the source Cluster API version.
226226
// When picking this version, please check also the list of versions known by the source Cluster API version (rif. test/infrastructure/kind/mapper.go).
227-
InitWithKubernetesVersion: "v1.31.0",
228-
WorkloadKubernetesVersion: "v1.31.0",
227+
InitWithKubernetesVersion: "v1.32.0",
228+
WorkloadKubernetesVersion: "v1.32.0",
229229
MgmtFlavor: "topology",
230230
WorkloadFlavor: "topology",
231231
UseKindForManagementCluster: true,
@@ -234,9 +234,9 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.8=>cur
234234
})
235235

236236
// Note: This test should be changed during "prepare main branch", it should test n-2 => current.
237-
var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.9=>current) [ClusterClass]", Label("ClusterClass"), func() {
237+
var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.10=>current) [ClusterClass]", Label("ClusterClass"), func() {
238238
// Get n-2 latest stable release
239-
version := "1.9"
239+
version := "1.10"
240240
stableRelease, err := GetStableReleaseOfMinor(ctx, version)
241241
Expect(err).ToNot(HaveOccurred(), "Failed to get stable version for minor release : %s", version)
242242
ClusterctlUpgradeSpec(ctx, func() ClusterctlUpgradeSpecInput {
@@ -265,8 +265,8 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.9=>cur
265265
},
266266
// Note: Both InitWithKubernetesVersion and WorkloadKubernetesVersion should be the highest mgmt cluster version supported by the source Cluster API version.
267267
// When picking this version, please check also the list of versions known by the source Cluster API version (rif. test/infrastructure/kind/mapper.go).
268-
InitWithKubernetesVersion: "v1.32.0",
269-
WorkloadKubernetesVersion: "v1.32.0",
268+
InitWithKubernetesVersion: "v1.33.0",
269+
WorkloadKubernetesVersion: "v1.33.0",
270270
MgmtFlavor: "topology",
271271
WorkloadFlavor: "topology",
272272
UseKindForManagementCluster: true,
@@ -275,9 +275,9 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.9=>cur
275275
})
276276

277277
// Note: This test should be changed during "prepare main branch", it should test n-1 => current.
278-
var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.10=>current) [ClusterClass]", Label("ClusterClass"), func() {
278+
var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.11=>current) [ClusterClass]", Label("ClusterClass"), func() {
279279
// Get n-1 latest stable release
280-
version := "1.10"
280+
version := "1.11"
281281
stableRelease, err := GetStableReleaseOfMinor(ctx, version)
282282
Expect(err).ToNot(HaveOccurred(), "Failed to get stable version for minor release : %s", version)
283283
ClusterctlUpgradeSpec(ctx, func() ClusterctlUpgradeSpecInput {
@@ -300,8 +300,8 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.10=>cu
300300
},
301301
// Note: Both InitWithKubernetesVersion and WorkloadKubernetesVersion should be the highest mgmt cluster version supported by the source Cluster API version.
302302
// When picking this version, please check also the list of versions known by the source Cluster API version (rif. test/infrastructure/kind/mapper.go).
303-
InitWithKubernetesVersion: "v1.33.0",
304-
WorkloadKubernetesVersion: "v1.33.0",
303+
InitWithKubernetesVersion: "v1.34.0",
304+
WorkloadKubernetesVersion: "v1.34.0",
305305
MgmtFlavor: "topology",
306306
WorkloadFlavor: "topology",
307307
UseKindForManagementCluster: false, // Using false for one test case to ensure this code path of the test keeps working.
@@ -310,9 +310,9 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.10=>cu
310310
})
311311

312312
// Note: This test should be changed during "prepare main branch", it should test n-1 => current.
313-
var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.10=>current) on K8S latest ci mgmt cluster [ClusterClass]", Label("ClusterClass"), func() {
313+
var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.11=>current) on K8S latest ci mgmt cluster [ClusterClass]", Label("ClusterClass"), func() {
314314
// Get n-1 latest stable release
315-
version := "1.10"
315+
version := "1.11"
316316
stableRelease, err := GetStableReleaseOfMinor(ctx, version)
317317
Expect(err).ToNot(HaveOccurred(), "Failed to get stable version for minor release : %s", version)
318318
ClusterctlUpgradeSpec(ctx, func() ClusterctlUpgradeSpecInput {
@@ -339,7 +339,7 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.10=>cu
339339
// Note: WorkloadKubernetesVersion should be the highest mgmt cluster version supported by the source Cluster API version.
340340
// When picking this version, please check also the list of versions known by the source Cluster API version (rif. test/infrastructure/kind/mapper.go).
341341
InitWithKubernetesVersion: initKubernetesVersion,
342-
WorkloadKubernetesVersion: "v1.33.0",
342+
WorkloadKubernetesVersion: "v1.34.0",
343343
MgmtFlavor: "topology",
344344
WorkloadFlavor: "topology",
345345
UseKindForManagementCluster: true,

‎test/e2e/config/docker.yaml‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,6 @@ providers:
6969
new: --metrics-addr=:8080
7070
files:
7171
- sourcePath: "../data/shared/v1.6/metadata.yaml"
72-
- name: "{go://sigs.k8s.io/[email protected]}"
73-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/core-components.yaml"
74-
type: "url"
75-
contract: v1beta1
76-
replacements:
77-
- old: --metrics-addr=127.0.0.1:8080
78-
new: --metrics-addr=:8080
79-
files:
80-
- sourcePath: "../data/shared/v1.8/metadata.yaml"
8172
- name: "{go://sigs.k8s.io/[email protected]}"
8273
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/core-components.yaml"
8374
type: "url"
@@ -96,7 +87,16 @@ providers:
9687
new: --metrics-addr=:8080
9788
files:
9889
- sourcePath: "../data/shared/v1.10/metadata.yaml"
99-
- name: v1.11.99 # next; use manifest from source files
90+
- name: "{go://sigs.k8s.io/[email protected]}"
91+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/core-components.yaml"
92+
type: "url"
93+
contract: v1beta1
94+
replacements:
95+
- old: --metrics-addr=127.0.0.1:8080
96+
new: --metrics-addr=:8080
97+
files:
98+
- sourcePath: "../data/shared/v1.11/metadata.yaml"
99+
- name: v1.12.99 # next; use manifest from source files
100100
value: ../../../config/default
101101
files:
102102
- sourcePath: "../data/shared/main/metadata.yaml"
@@ -140,15 +140,6 @@ providers:
140140
new: --metrics-addr=:8080
141141
files:
142142
- sourcePath: "../data/shared/v1.6/metadata.yaml"
143-
- name: "{go://sigs.k8s.io/[email protected]}"
144-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/bootstrap-components.yaml"
145-
type: "url"
146-
contract: v1beta1
147-
replacements:
148-
- old: --metrics-addr=127.0.0.1:8080
149-
new: --metrics-addr=:8080
150-
files:
151-
- sourcePath: "../data/shared/v1.8/metadata.yaml"
152143
- name: "{go://sigs.k8s.io/[email protected]}"
153144
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/bootstrap-components.yaml"
154145
type: "url"
@@ -167,7 +158,16 @@ providers:
167158
new: --metrics-addr=:8080
168159
files:
169160
- sourcePath: "../data/shared/v1.10/metadata.yaml"
170-
- name: v1.11.99 # next; use manifest from source files
161+
- name: "{go://sigs.k8s.io/[email protected]}"
162+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/bootstrap-components.yaml"
163+
type: "url"
164+
contract: v1beta1
165+
replacements:
166+
- old: --metrics-addr=127.0.0.1:8080
167+
new: --metrics-addr=:8080
168+
files:
169+
- sourcePath: "../data/shared/v1.11/metadata.yaml"
170+
- name: v1.12.99 # next; use manifest from source files
171171
value: ../../../bootstrap/kubeadm/config/default
172172
files:
173173
- sourcePath: "../data/shared/main/metadata.yaml"
@@ -211,15 +211,6 @@ providers:
211211
new: --metrics-addr=:8080
212212
files:
213213
- sourcePath: "../data/shared/v1.6/metadata.yaml"
214-
- name: "{go://sigs.k8s.io/[email protected]}"
215-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/control-plane-components.yaml"
216-
type: "url"
217-
contract: v1beta1
218-
replacements:
219-
- old: --metrics-addr=127.0.0.1:8080
220-
new: --metrics-addr=:8080
221-
files:
222-
- sourcePath: "../data/shared/v1.8/metadata.yaml"
223214
- name: "{go://sigs.k8s.io/[email protected]}"
224215
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/control-plane-components.yaml"
225216
type: "url"
@@ -238,7 +229,16 @@ providers:
238229
new: --metrics-addr=:8080
239230
files:
240231
- sourcePath: "../data/shared/v1.10/metadata.yaml"
241-
- name: v1.11.99 # next; use manifest from source files
232+
- name: "{go://sigs.k8s.io/[email protected]}"
233+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/control-plane-components.yaml"
234+
type: "url"
235+
contract: v1beta1
236+
replacements:
237+
- old: --metrics-addr=127.0.0.1:8080
238+
new: --metrics-addr=:8080
239+
files:
240+
- sourcePath: "../data/shared/v1.11/metadata.yaml"
241+
- name: v1.12.99 # next; use manifest from source files
242242
value: ../../../controlplane/kubeadm/config/default
243243
files:
244244
- sourcePath: "../data/shared/main/metadata.yaml"
@@ -290,18 +290,6 @@ providers:
290290
- sourcePath: "../data/infrastructure-docker/v1.6/cluster-template.yaml"
291291
- sourcePath: "../data/infrastructure-docker/v1.6/cluster-template-topology.yaml"
292292
- sourcePath: "../data/infrastructure-docker/v1.6/clusterclass-quick-start.yaml"
293-
- name: "{go://sigs.k8s.io/[email protected]}"
294-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/infrastructure-components-development.yaml"
295-
type: "url"
296-
contract: v1beta1
297-
replacements:
298-
- old: --metrics-addr=127.0.0.1:8080
299-
new: --metrics-addr=:8080
300-
files:
301-
- sourcePath: "../data/shared/v1.8/metadata.yaml"
302-
- sourcePath: "../data/infrastructure-docker/v1.8/cluster-template.yaml"
303-
- sourcePath: "../data/infrastructure-docker/v1.8/cluster-template-topology.yaml"
304-
- sourcePath: "../data/infrastructure-docker/v1.8/clusterclass-quick-start.yaml"
305293
- name: "{go://sigs.k8s.io/[email protected]}"
306294
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/infrastructure-components-development.yaml"
307295
type: "url"
@@ -326,7 +314,19 @@ providers:
326314
- sourcePath: "../data/infrastructure-docker/v1.10/cluster-template.yaml"
327315
- sourcePath: "../data/infrastructure-docker/v1.10/cluster-template-topology.yaml"
328316
- sourcePath: "../data/infrastructure-docker/v1.10/clusterclass-quick-start.yaml"
329-
- name: v1.11.99 # next; use manifest from source files
317+
- name: "{go://sigs.k8s.io/[email protected]}"
318+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/infrastructure-components-development.yaml"
319+
type: "url"
320+
contract: v1beta1
321+
replacements:
322+
- old: --metrics-addr=127.0.0.1:8080
323+
new: --metrics-addr=:8080
324+
files:
325+
- sourcePath: "../data/shared/v1.11/metadata.yaml"
326+
- sourcePath: "../data/infrastructure-docker/v1.11/cluster-template.yaml"
327+
- sourcePath: "../data/infrastructure-docker/v1.11/cluster-template-topology.yaml"
328+
- sourcePath: "../data/infrastructure-docker/v1.11/clusterclass-quick-start.yaml"
329+
- name: v1.12.99 # next; use manifest from source files
330330
value: ../../../test/infrastructure/docker/config/default
331331
files:
332332
# Add cluster templates
@@ -359,7 +359,7 @@ providers:
359359
- name: test-extension
360360
type: RuntimeExtensionProvider
361361
versions:
362-
- name: v1.11.99 # next; use manifest from source files
362+
- name: v1.12.99 # next; use manifest from source files
363363
value: ../../../test/extension/config/default
364364
files:
365365
- sourcePath: "../data/shared/main/metadata.yaml"

0 commit comments

Comments
 (0)