Skip to content

Commit 29794ea

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #8430 from joekr/bump-versions-v1.5
🌱 prepare main branch for v1.5 development
2 parents 94f5468 + eea6590 commit 29794ea

File tree

17 files changed

+812
-61
lines changed

17 files changed

+812
-61
lines changed

‎Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ generate-modules: ## Run go mod tidy to ensure modules are up to date
472472
cd $(TEST_DIR); go mod tidy
473473

474474
.PHONY: generate-e2e-templates
475-
generate-e2e-templates: $(KUSTOMIZE) $(addprefix generate-e2e-templates-, v0.3 v0.4 v1.0 v1.2 v1.3 main) ## Generate cluster templates for all versions
475+
generate-e2e-templates: $(KUSTOMIZE) $(addprefix generate-e2e-templates-, v0.3 v0.4 v1.0 v1.2 v1.3 v1.4 main) ## Generate cluster templates for all versions
476476

477477
DOCKER_TEMPLATES := test/e2e/data/infrastructure-docker
478478

@@ -498,6 +498,11 @@ generate-e2e-templates-v1.3: $(KUSTOMIZE)
498498
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1.3/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1.3/cluster-template.yaml
499499
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1.3/cluster-template-topology --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1.3/cluster-template-topology.yaml
500500

501+
.PHONY: generate-e2e-templates-v1.4
502+
generate-e2e-templates-v1.4: $(KUSTOMIZE)
503+
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1.4/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1.4/cluster-template.yaml
504+
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1.4/cluster-template-topology --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1.4/cluster-template-topology.yaml
505+
501506
.PHONY: generate-e2e-templates-main
502507
generate-e2e-templates-main: $(KUSTOMIZE)
503508
$(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
@@ -53,30 +53,30 @@
5353
providers = {
5454
'cluster-api': {
5555
'componentsFile': 'core-components.yaml',
56-
'nextVersion': 'v1.4.99',
56+
'nextVersion': 'v1.5.99',
5757
'type': 'CoreProvider',
5858
},
5959
'bootstrap-kubeadm': {
6060
'componentsFile': 'bootstrap-components.yaml',
61-
'nextVersion': 'v1.4.99',
61+
'nextVersion': 'v1.5.99',
6262
'type': 'BootstrapProvider',
6363
'configFolder': 'bootstrap/kubeadm/config/default',
6464
},
6565
'control-plane-kubeadm': {
6666
'componentsFile': 'control-plane-components.yaml',
67-
'nextVersion': 'v1.4.99',
67+
'nextVersion': 'v1.5.99',
6868
'type': 'ControlPlaneProvider',
6969
'configFolder': 'controlplane/kubeadm/config/default',
7070
},
7171
'infrastructure-docker': {
7272
'componentsFile': 'infrastructure-components.yaml',
73-
'nextVersion': 'v1.4.99',
73+
'nextVersion': 'v1.5.99',
7474
'type': 'InfrastructureProvider',
7575
'configFolder': 'test/infrastructure/docker/config/default',
7676
},
7777
'runtime-extension-test': {
7878
'componentsFile': 'runtime-extension-components.yaml',
79-
'nextVersion': 'v1.4.99',
79+
'nextVersion': 'v1.5.99',
8080
'type': 'RuntimeExtensionProvider',
8181
'configFolder': 'test/extension/config/default',
8282
},

‎docs/release/release-tasks.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,9 @@ This comes down to changing occurrences of the old version to the new version, e
115115
3. Update `.github/workflows/scan.yml` - to setup Trivy scanning - and `.github/workflows/lint-docs-weekly.yml` - to setup link checking in the CAPI book - for the currently supported branches.
116116
4. Make sure all tests are green (also run `pull-cluster-api-e2e-full-main` and `pull-cluster-api-e2e-workload-upgrade-1-23-latest-main`).
117117

118-
Prior art: https://github.com/kubernetes-sigs/cluster-api/pull/6834/files
118+
Prior art:
119+
- 1.3 - https://github.com/kubernetes-sigs/cluster-api/pull/6834/files
120+
- 1.4 - https://github.com/kubernetes-sigs/cluster-api/pull/7692/files
119121

120122
#### Create a new GitHub milestone for the next release
121123

‎hack/tools/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.4.99"
74+
defaultProviderVersion = "v1.5.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: 5
11+
contract: v1beta1
912
- major: 1
1013
minor: 4
1114
contract: v1beta1

‎test/e2e/clusterctl_upgrade_test.go

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -123,30 +123,29 @@ var _ = Describe("When testing clusterctl upgrades (v1.0=>current)", func() {
123123
})
124124
})
125125

126-
var _ = Describe("When testing clusterctl upgrades (v1.2=>current)", func() {
126+
var _ = Describe("When testing clusterctl upgrades (v1.3=>current)", func() {
127127
ClusterctlUpgradeSpec(ctx, func() ClusterctlUpgradeSpecInput {
128128
return ClusterctlUpgradeSpecInput{
129129
E2EConfig: e2eConfig,
130130
ClusterctlConfigPath: clusterctlConfigPath,
131131
BootstrapClusterProxy: bootstrapClusterProxy,
132132
ArtifactFolder: artifactFolder,
133133
SkipCleanup: skipCleanup,
134-
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.11/clusterctl-{OS}-{ARCH}",
134+
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.6/clusterctl-{OS}-{ARCH}",
135135
// We have to pin the providers because with `InitWithProvidersContract` the test would
136-
// use the latest version for the contract (which is v1.3.X for v1beta1).
137-
InitWithCoreProvider: "cluster-api:v1.2.11",
138-
InitWithBootstrapProviders: []string{"kubeadm:v1.2.11"},
139-
InitWithControlPlaneProviders: []string{"kubeadm:v1.2.11"},
140-
InitWithInfrastructureProviders: []string{"docker:v1.2.11"},
141-
// We have to set this to an empty array as clusterctl v1.2 doesn't support
136+
// use the latest version for the contract (which is v1.4.X for v1beta1).
137+
InitWithCoreProvider: "cluster-api:v1.3.6",
138+
InitWithBootstrapProviders: []string{"kubeadm:v1.3.6"},
139+
InitWithControlPlaneProviders: []string{"kubeadm:v1.3.6"},
140+
InitWithInfrastructureProviders: []string{"docker:v1.3.6"},
141+
// We have to set this to an empty array as clusterctl v1.3 doesn't support
142142
// runtime extension providers. If we don't do this the test will automatically
143143
// try to deploy the latest version of our test-extension from docker.yaml.
144144
InitWithRuntimeExtensionProviders: []string{},
145+
InitWithProvidersContract: "v1beta1",
145146
InitWithKubernetesVersion: "v1.26.0",
146-
// TODO(sbueringer) The topology flavor enables PSA.
147-
// CAPD will only work with PSA after we have a release with https://github.com/kubernetes-sigs/cluster-api/pull/8313.
148-
//MgmtFlavor: "topology",
149-
WorkloadFlavor: "",
147+
MgmtFlavor: "topology",
148+
WorkloadFlavor: "",
150149
// This check ensures that ownerReference apiVersions are updated for all types after the upgrade.
151150
PostUpgrade: func(proxy framework.ClusterProxy, namespace, clusterName string) {
152151
framework.ValidateOwnerReferencesOnUpdate(proxy, namespace,
@@ -162,30 +161,29 @@ var _ = Describe("When testing clusterctl upgrades (v1.2=>current)", func() {
162161
})
163162
})
164163

165-
var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.2=>current) [ClusterClass]", func() {
164+
var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.3=>current) [ClusterClass]", func() {
166165
ClusterctlUpgradeSpec(ctx, func() ClusterctlUpgradeSpecInput {
167166
return ClusterctlUpgradeSpecInput{
168167
E2EConfig: e2eConfig,
169168
ClusterctlConfigPath: clusterctlConfigPath,
170169
BootstrapClusterProxy: bootstrapClusterProxy,
171170
ArtifactFolder: artifactFolder,
172171
SkipCleanup: skipCleanup,
173-
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.11/clusterctl-{OS}-{ARCH}",
172+
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.6/clusterctl-{OS}-{ARCH}",
174173
// We have to pin the providers because with `InitWithProvidersContract` the test would
175-
// use the latest version for the contract (which is v1.3.X for v1beta1).
176-
InitWithCoreProvider: "cluster-api:v1.2.11",
177-
InitWithBootstrapProviders: []string{"kubeadm:v1.2.11"},
178-
InitWithControlPlaneProviders: []string{"kubeadm:v1.2.11"},
179-
InitWithInfrastructureProviders: []string{"docker:v1.2.11"},
180-
// We have to set this to an empty array as clusterctl v1.2 doesn't support
174+
// use the latest version for the contract (which is v1.4.X for v1beta1).
175+
InitWithCoreProvider: "cluster-api:v1.3.6",
176+
InitWithBootstrapProviders: []string{"kubeadm:v1.3.6"},
177+
InitWithControlPlaneProviders: []string{"kubeadm:v1.3.6"},
178+
InitWithInfrastructureProviders: []string{"docker:v1.3.6"},
179+
// We have to set this to an empty array as clusterctl v1.3 doesn't support
181180
// runtime extension providers. If we don't do this the test will automatically
182181
// try to deploy the latest version of our test-extension from docker.yaml.
183182
InitWithRuntimeExtensionProviders: []string{},
183+
InitWithProvidersContract: "v1beta1",
184184
InitWithKubernetesVersion: "v1.26.0",
185-
// TODO(sbueringer) The topology flavor enables PSA.
186-
// CAPD will only work with PSA after we have a release with https://github.com/kubernetes-sigs/cluster-api/pull/8313.
187-
//MgmtFlavor: "topology",
188-
WorkloadFlavor: "topology",
185+
MgmtFlavor: "topology",
186+
WorkloadFlavor: "topology",
189187
// This check ensures that ownerReference apiVersions are updated for all types after the upgrade.
190188
PostUpgrade: func(proxy framework.ClusterProxy, namespace, clusterName string) {
191189
framework.ValidateOwnerReferencesOnUpdate(proxy, namespace,
@@ -201,15 +199,15 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.2=>cur
201199
})
202200
})
203201

204-
var _ = Describe("When testing clusterctl upgrades (v1.3=>current)", func() {
202+
var _ = Describe("When testing clusterctl upgrades (v1.4=>current)", func() {
205203
ClusterctlUpgradeSpec(ctx, func() ClusterctlUpgradeSpecInput {
206204
return ClusterctlUpgradeSpecInput{
207205
E2EConfig: e2eConfig,
208206
ClusterctlConfigPath: clusterctlConfigPath,
209207
BootstrapClusterProxy: bootstrapClusterProxy,
210208
ArtifactFolder: artifactFolder,
211209
SkipCleanup: skipCleanup,
212-
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/clusterctl-{OS}-{ARCH}",
210+
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0/clusterctl-{OS}-{ARCH}",
213211
InitWithProvidersContract: "v1beta1",
214212
InitWithKubernetesVersion: "v1.26.0",
215213
MgmtFlavor: "topology",
@@ -229,15 +227,15 @@ var _ = Describe("When testing clusterctl upgrades (v1.3=>current)", func() {
229227
})
230228
})
231229

232-
var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.3=>current) [ClusterClass]", func() {
230+
var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.4=>current) [ClusterClass]", func() {
233231
ClusterctlUpgradeSpec(ctx, func() ClusterctlUpgradeSpecInput {
234232
return ClusterctlUpgradeSpecInput{
235233
E2EConfig: e2eConfig,
236234
ClusterctlConfigPath: clusterctlConfigPath,
237235
BootstrapClusterProxy: bootstrapClusterProxy,
238236
ArtifactFolder: artifactFolder,
239237
SkipCleanup: skipCleanup,
240-
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/clusterctl-{OS}-{ARCH}",
238+
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0/clusterctl-{OS}-{ARCH}",
241239
InitWithProvidersContract: "v1beta1",
242240
InitWithKubernetesVersion: "v1.26.0",
243241
MgmtFlavor: "topology",

0 commit comments

Comments
 (0)