Skip to content

Commit 25fa000

Browse files
Nivedita-coderNivedita-coder
authored
Prepare main branch for v1.8 development (#10524)
1 parent 4d16862 commit 25fa000

File tree

24 files changed

+1089
-54
lines changed

24 files changed

+1089
-54
lines changed

‎Makefile

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

558558
.PHONY: generate-e2e-templates
559-
generate-e2e-templates: $(KUSTOMIZE) $(addprefix generate-e2e-templates-, v0.3 v0.4 v1.0 v1.5 v1.6 main) ## Generate cluster templates for all versions
559+
generate-e2e-templates: $(KUSTOMIZE) $(addprefix generate-e2e-templates-, v0.3 v0.4 v1.0 v1.5 v1.6 v1.7 main) ## Generate cluster templates for all versions
560560

561561
DOCKER_TEMPLATES := test/e2e/data/infrastructure-docker
562562
INMEMORY_TEMPLATES := test/e2e/data/infrastructure-inmemory
@@ -583,6 +583,11 @@ generate-e2e-templates-v1.6: $(KUSTOMIZE)
583583
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1.6/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1.6/cluster-template.yaml
584584
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1.6/cluster-template-topology --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1.6/cluster-template-topology.yaml
585585

586+
.PHONY: generate-e2e-templates-v1.7
587+
generate-e2e-templates-v1.7: $(KUSTOMIZE)
588+
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1.7/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1.7/cluster-template.yaml
589+
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1.7/cluster-template-topology --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1.7/cluster-template-topology.yaml
590+
586591
.PHONY: generate-e2e-templates-main
587592
generate-e2e-templates-main: $(KUSTOMIZE)
588593
$(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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,36 +54,36 @@
5454
providers = {
5555
'cluster-api': {
5656
'componentsFile': 'core-components.yaml',
57-
'nextVersion': 'v1.7.99',
57+
'nextVersion': 'v1.8.99',
5858
'type': 'CoreProvider',
5959
},
6060
'bootstrap-kubeadm': {
6161
'componentsFile': 'bootstrap-components.yaml',
62-
'nextVersion': 'v1.7.99',
62+
'nextVersion': 'v1.8.99',
6363
'type': 'BootstrapProvider',
6464
'configFolder': 'bootstrap/kubeadm/config/default',
6565
},
6666
'control-plane-kubeadm': {
6767
'componentsFile': 'control-plane-components.yaml',
68-
'nextVersion': 'v1.7.99',
68+
'nextVersion': 'v1.8.99',
6969
'type': 'ControlPlaneProvider',
7070
'configFolder': 'controlplane/kubeadm/config/default',
7171
},
7272
'infrastructure-docker': {
7373
'componentsFile': 'infrastructure-components-development.yaml',
74-
'nextVersion': 'v1.7.99',
74+
'nextVersion': 'v1.8.99',
7575
'type': 'InfrastructureProvider',
7676
'configFolder': 'test/infrastructure/docker/config/default',
7777
},
7878
'infrastructure-in-memory': {
7979
'componentsFile': 'infrastructure-components-in-memory-development.yaml',
80-
'nextVersion': 'v1.7.99',
80+
'nextVersion': 'v1.8.99',
8181
'type': 'InfrastructureProvider',
8282
'configFolder': 'test/infrastructure/inmemory/config/default',
8383
},
8484
'runtime-extension-test': {
8585
'componentsFile': 'runtime-extension-components-development.yaml',
86-
'nextVersion': 'v1.7.99',
86+
'nextVersion': 'v1.8.99',
8787
'type': 'RuntimeExtensionProvider',
8888
'configFolder': 'test/extension/config/default',
8989
},

‎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.7.99"
74+
defaultProviderVersion = "v1.8.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: 8
11+
contract: v1beta1
912
- major: 1
1013
minor: 7
1114
contract: v1beta1

‎test/e2e/clusterctl_upgrade_test.go

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ var _ = Describe("When testing clusterctl upgrades (v0.3=>v1.5=>current)", func(
4343
// NOTE: The combination of v0.3=>v1.5=>current allows us to verify this without being forced to upgrade
4444
// the management cluster in the middle of the test as all 3 versions are ~ compatible with the same mgmt and workload Kubernetes versions.
4545
// Additionally, clusterctl v1.5 still allows the upgrade of management clusters from v1alpha3 (v1.6 doesn't).
46+
// https://github.com/kubernetes-sigs/cluster-api/blob/release-1.5/cmd/clusterctl/client/upgrade.go#L151-L159
47+
// https://github.com/kubernetes-sigs/cluster-api/blob/release-1.6/cmd/clusterctl/client/upgrade.go#L149-L155
4648

4749
// Get v0.3 latest stable release
4850
version03 := "0.3"
@@ -117,6 +119,8 @@ var _ = Describe("When testing clusterctl upgrades (v0.4=>v1.6=>current)", func(
117119
// NOTE: The combination of v0.4=>v1.6=>current allows us to verify this without being forced to upgrade
118120
// the management cluster in the middle of the test as all 3 versions are ~ compatible with the same mgmt and workload Kubernetes versions.
119121
// Additionally, clusterctl v1.6 still allows the upgrade of management clusters from v1alpha4 (v1.7 doesn't).
122+
// https://github.com/kubernetes-sigs/cluster-api/blob/release-1.6/cmd/clusterctl/client/upgrade.go#L149-L155
123+
// https://github.com/kubernetes-sigs/cluster-api/blob/release-1.7/cmd/clusterctl/client/upgrade.go#L145-L148
120124

121125
// Get v0.4 latest stable release
122126
version04 := "0.4"
@@ -210,9 +214,9 @@ var _ = Describe("When testing clusterctl upgrades (v1.0=>current)", func() {
210214
})
211215
})
212216

213-
var _ = Describe("When testing clusterctl upgrades (v1.5=>current)", func() {
214-
// Get v1.5 latest stable release
215-
version := "1.5"
217+
var _ = Describe("When testing clusterctl upgrades (v1.6=>current)", func() {
218+
// Get v1.6 latest stable release
219+
version := "1.6"
216220
stableRelease, err := GetStableReleaseOfMinor(ctx, version)
217221
Expect(err).ToNot(HaveOccurred(), "Failed to get stable version for minor release : %s", version)
218222
ClusterctlUpgradeSpec(ctx, func() ClusterctlUpgradeSpecInput {
@@ -225,25 +229,25 @@ var _ = Describe("When testing clusterctl upgrades (v1.5=>current)", func() {
225229
InfrastructureProvider: ptr.To("docker"),
226230
InitWithBinary: fmt.Sprintf(clusterctlDownloadURL, stableRelease),
227231
// We have to pin the providers because with `InitWithProvidersContract` the test would
228-
// use the latest version for the contract (which is v1.6.X for v1beta1).
232+
// use the latest version for the contract (which is the next minor for v1beta1).
229233
InitWithCoreProvider: fmt.Sprintf(providerCAPIPrefix, stableRelease),
230234
InitWithBootstrapProviders: []string{fmt.Sprintf(providerKubeadmPrefix, stableRelease)},
231235
InitWithControlPlaneProviders: []string{fmt.Sprintf(providerKubeadmPrefix, stableRelease)},
232236
InitWithInfrastructureProviders: []string{fmt.Sprintf(providerDockerPrefix, stableRelease)},
233237
InitWithProvidersContract: "v1beta1",
234-
// Note: Both InitWithKubernetesVersion and WorkloadKubernetesVersion should be the highest mgmt cluster version supported by the source Cluster API version.
235-
InitWithKubernetesVersion: "v1.28.0",
236-
WorkloadKubernetesVersion: "v1.28.0",
238+
// Note: Both InitWithKubernetesVersion and WorkloadKubernetesVersion should be the highest mgmt cluster version supported by the source Cluster API version.
239+
InitWithKubernetesVersion: "v1.29.0",
240+
WorkloadKubernetesVersion: "v1.29.0",
237241
MgmtFlavor: "topology",
238242
WorkloadFlavor: "",
239243
UseKindForManagementCluster: true,
240244
}
241245
})
242246
})
243247

244-
var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.5=>current) [ClusterClass]", func() {
245-
// Get v1.5 latest stable release
246-
version := "1.5"
248+
var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.6=>current) [ClusterClass]", func() {
249+
// Get v1.6 latest stable release
250+
version := "1.6"
247251
stableRelease, err := GetStableReleaseOfMinor(ctx, version)
248252
Expect(err).ToNot(HaveOccurred(), "Failed to get stable version for minor release : %s", version)
249253
ClusterctlUpgradeSpec(ctx, func() ClusterctlUpgradeSpecInput {
@@ -256,25 +260,25 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.5=>cur
256260
InfrastructureProvider: ptr.To("docker"),
257261
InitWithBinary: fmt.Sprintf(clusterctlDownloadURL, stableRelease),
258262
// We have to pin the providers because with `InitWithProvidersContract` the test would
259-
// use the latest version for the contract (which is v1.6.X for v1beta1).
263+
// use the latest version for the contract (which is the next minor for v1beta1).
260264
InitWithCoreProvider: fmt.Sprintf(providerCAPIPrefix, stableRelease),
261265
InitWithBootstrapProviders: []string{fmt.Sprintf(providerKubeadmPrefix, stableRelease)},
262266
InitWithControlPlaneProviders: []string{fmt.Sprintf(providerKubeadmPrefix, stableRelease)},
263267
InitWithInfrastructureProviders: []string{fmt.Sprintf(providerDockerPrefix, stableRelease)},
264268
InitWithProvidersContract: "v1beta1",
265269
// Note: Both InitWithKubernetesVersion and WorkloadKubernetesVersion should be the highest mgmt cluster version supported by the source Cluster API version.
266-
InitWithKubernetesVersion: "v1.28.0",
267-
WorkloadKubernetesVersion: "v1.28.0",
270+
InitWithKubernetesVersion: "v1.29.0",
271+
WorkloadKubernetesVersion: "v1.29.0",
268272
MgmtFlavor: "topology",
269273
WorkloadFlavor: "topology",
270274
UseKindForManagementCluster: true,
271275
}
272276
})
273277
})
274278

275-
var _ = Describe("When testing clusterctl upgrades (v1.6=>current)", func() {
276-
// Get v1.6 latest stable release
277-
version := "1.6"
279+
var _ = Describe("When testing clusterctl upgrades (v1.7=>current)", func() {
280+
// Get v1.7 latest stable release
281+
version := "1.7"
278282
stableRelease, err := GetStableReleaseOfMinor(ctx, version)
279283
Expect(err).ToNot(HaveOccurred(), "Failed to get stable version for minor release : %s", version)
280284
ClusterctlUpgradeSpec(ctx, func() ClusterctlUpgradeSpecInput {
@@ -288,18 +292,18 @@ var _ = Describe("When testing clusterctl upgrades (v1.6=>current)", func() {
288292
InitWithBinary: fmt.Sprintf(clusterctlDownloadURL, stableRelease),
289293
InitWithProvidersContract: "v1beta1",
290294
// Note: Both InitWithKubernetesVersion and WorkloadKubernetesVersion should be the highest mgmt cluster version supported by the source Cluster API version.
291-
InitWithKubernetesVersion: "v1.29.2",
292-
WorkloadKubernetesVersion: "v1.29.2",
295+
InitWithKubernetesVersion: "v1.30.0",
296+
WorkloadKubernetesVersion: "v1.30.0",
293297
MgmtFlavor: "topology",
294298
WorkloadFlavor: "",
295299
UseKindForManagementCluster: true,
296300
}
297301
})
298302
})
299303

300-
var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.6=>current) [ClusterClass]", func() {
301-
// Get v1.6 latest stable release
302-
version := "1.6"
304+
var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.7=>current) [ClusterClass]", func() {
305+
// Get v1.7 latest stable release
306+
version := "1.7"
303307
stableRelease, err := GetStableReleaseOfMinor(ctx, version)
304308
Expect(err).ToNot(HaveOccurred(), "Failed to get stable version for minor release : %s", version)
305309
ClusterctlUpgradeSpec(ctx, func() ClusterctlUpgradeSpecInput {
@@ -313,8 +317,8 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.6=>cur
313317
InitWithBinary: fmt.Sprintf(clusterctlDownloadURL, stableRelease),
314318
InitWithProvidersContract: "v1beta1",
315319
// Note: Both InitWithKubernetesVersion and WorkloadKubernetesVersion should be the highest mgmt cluster version supported by the source Cluster API version.
316-
InitWithKubernetesVersion: "v1.29.2",
317-
WorkloadKubernetesVersion: "v1.29.2",
320+
InitWithKubernetesVersion: "v1.30.0",
321+
WorkloadKubernetesVersion: "v1.30.0",
318322
MgmtFlavor: "topology",
319323
WorkloadFlavor: "topology",
320324
UseKindForManagementCluster: true,

0 commit comments

Comments
 (0)