Skip to content

Commit 23cbd9e

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #2664 from Nordix/lentzi90/capi-v1.11.0
🌱 Bump CAPI to v1.11.0
2 parents 4217878 + b1b79af commit 23cbd9e

File tree

8 files changed

+39
-77
lines changed

8 files changed

+39
-77
lines changed

‎Makefile‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ $(E2E_NO_ARTIFACT_TEMPLATES_DIR)/cluster-template.yaml: $(E2E_KUSTOMIZE_DIR)/wit
197197
$(E2E_NO_ARTIFACT_TEMPLATES_DIR)/cluster-template-%.yaml: $(E2E_KUSTOMIZE_DIR)/% $(KUSTOMIZE) FORCE
198198
$(KUSTOMIZE) build "$<" > "$@"
199199

200-
e2e-prerequisites: $(GINKGO) e2e-templates e2e-image test-e2e-image-prerequisites ## Build all artifacts required by e2e tests
200+
e2e-prerequisites: $(GINKGO) e2e-templates e2e-image ## Build all artifacts required by e2e tests
201201

202202
# Can be run manually, e.g. via:
203203
# export OPENSTACK_CLOUD_YAML_FILE="$(pwd)/clouds.yaml"
@@ -221,12 +221,6 @@ build-e2e-tests: $(GINKGO)
221221
e2e-image: CONTROLLER_IMG_TAG = "gcr.io/k8s-staging-capi-openstack/capi-openstack-controller:e2e"
222222
e2e-image: docker-build
223223

224-
# Pull all the images references in test/e2e/data/e2e_conf.yaml
225-
test-e2e-image-prerequisites:
226-
docker pull registry.k8s.io/cluster-api/cluster-api-controller:v1.10.1
227-
docker pull registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.10.1
228-
docker pull registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.10.1
229-
230224
CONFORMANCE_E2E_ARGS ?= -kubetest.config-file=$(KUBETEST_CONF_PATH)
231225
CONFORMANCE_E2E_ARGS += $(E2E_ARGS)
232226
.PHONY: test-conformance

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ require (
2929
k8s.io/klog/v2 v2.130.1
3030
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a
3131
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
32-
sigs.k8s.io/cluster-api v1.11.0-rc.0
33-
sigs.k8s.io/cluster-api/test v1.11.0-rc.0
32+
sigs.k8s.io/cluster-api v1.11.0
33+
sigs.k8s.io/cluster-api/test v1.11.0
3434
sigs.k8s.io/controller-runtime v0.21.0
3535
sigs.k8s.io/structured-merge-diff/v4 v4.7.0
3636
sigs.k8s.io/yaml v1.6.0

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
4646
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
4747
github.com/coredns/caddy v1.1.1 h1:2eYKZT7i6yxIfGP3qLJoJ7HAsDJqYB+X68g4NYjSrE0=
4848
github.com/coredns/caddy v1.1.1/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
49-
github.com/coredns/corefile-migration v1.0.26 h1:xiiEkVB1Dwolb24pkeDUDBfygV9/XsOSq79yFCrhptY=
50-
github.com/coredns/corefile-migration v1.0.26/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY=
49+
github.com/coredns/corefile-migration v1.0.27 h1:WIIw5sU0LfGgoGnhdrYdVcto/aWmJoGA/C62iwkU0JM=
50+
github.com/coredns/corefile-migration v1.0.27/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY=
5151
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
5252
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
5353
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -414,10 +414,10 @@ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8
414414
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
415415
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
416416
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
417-
sigs.k8s.io/cluster-api v1.11.0-rc.0 h1:sZihW/OjiucSnOKrFfo093wC/Qp0MBhmXiIcU9FtTBY=
418-
sigs.k8s.io/cluster-api v1.11.0-rc.0/go.mod h1:HVLZTAcnkzsM8bYvGgh4eC2Wfx/WzFerPvtCGfmggiw=
419-
sigs.k8s.io/cluster-api/test v1.11.0-rc.0 h1:PulJADupD3qF2F4Rwdt+OcH0YSrRgTTGYYgU/Pwu5gM=
420-
sigs.k8s.io/cluster-api/test v1.11.0-rc.0/go.mod h1:2f489Lp5TKPGVhNL6V3huq8fp6eb23APlY2cLbhuDBU=
417+
sigs.k8s.io/cluster-api v1.11.0 h1:4ZqKxjhdP3F/vvHMd675rGsDrT/siggnFPt5eKQ8nkI=
418+
sigs.k8s.io/cluster-api v1.11.0/go.mod h1:gGmNlHrtJe3z0YV3J6JRy5Rwh9SfzokjQaS+Fv3DBPE=
419+
sigs.k8s.io/cluster-api/test v1.11.0 h1:dvwMAb5rm4Z7Kj3l9FkeYTWfSthpN0oX3gvUrd8ej24=
420+
sigs.k8s.io/cluster-api/test v1.11.0/go.mod h1:2f489Lp5TKPGVhNL6V3huq8fp6eb23APlY2cLbhuDBU=
421421
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
422422
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
423423
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=

‎hack/tools/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ require (
155155
k8s.io/release v0.16.9 // indirect
156156
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
157157
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
158-
sigs.k8s.io/cluster-api v1.11.0-rc.0 // indirect
158+
sigs.k8s.io/cluster-api v1.11.0 // indirect
159159
sigs.k8s.io/controller-runtime v0.21.0 // indirect
160160
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
161161
sigs.k8s.io/kubebuilder/docs/book/utils v0.0.0-20211028165026-57688c578b5d // indirect

‎hack/tools/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151X
4949
github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=
5050
github.com/coredns/caddy v1.1.1 h1:2eYKZT7i6yxIfGP3qLJoJ7HAsDJqYB+X68g4NYjSrE0=
5151
github.com/coredns/caddy v1.1.1/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
52-
github.com/coredns/corefile-migration v1.0.26 h1:xiiEkVB1Dwolb24pkeDUDBfygV9/XsOSq79yFCrhptY=
53-
github.com/coredns/corefile-migration v1.0.26/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY=
52+
github.com/coredns/corefile-migration v1.0.27 h1:WIIw5sU0LfGgoGnhdrYdVcto/aWmJoGA/C62iwkU0JM=
53+
github.com/coredns/corefile-migration v1.0.27/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY=
5454
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
5555
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
5656
github.com/cyphar/filepath-securejoin v0.2.5 h1:6iR5tXJ/e6tJZzzdMc1km3Sa7RRIVBKAK32O2s7AYfo=
@@ -480,12 +480,12 @@ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8
480480
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
481481
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
482482
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
483-
sigs.k8s.io/cluster-api v1.11.0-rc.0 h1:sZihW/OjiucSnOKrFfo093wC/Qp0MBhmXiIcU9FtTBY=
484-
sigs.k8s.io/cluster-api v1.11.0-rc.0/go.mod h1:HVLZTAcnkzsM8bYvGgh4eC2Wfx/WzFerPvtCGfmggiw=
483+
sigs.k8s.io/cluster-api v1.11.0 h1:4ZqKxjhdP3F/vvHMd675rGsDrT/siggnFPt5eKQ8nkI=
484+
sigs.k8s.io/cluster-api v1.11.0/go.mod h1:gGmNlHrtJe3z0YV3J6JRy5Rwh9SfzokjQaS+Fv3DBPE=
485485
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250805173327-a7b9f27af519 h1:WkOO6Fg3tmbuFXqTMFfs80mapaQyBbdIC5p86LIVlBI=
486486
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250805173327-a7b9f27af519/go.mod h1:/Zjkh19AmjuI4piKJ1fAZW7k0cDZsSoAAcGHKGZJTZU=
487-
sigs.k8s.io/cluster-api/test v1.11.0-rc.0 h1:PulJADupD3qF2F4Rwdt+OcH0YSrRgTTGYYgU/Pwu5gM=
488-
sigs.k8s.io/cluster-api/test v1.11.0-rc.0/go.mod h1:2f489Lp5TKPGVhNL6V3huq8fp6eb23APlY2cLbhuDBU=
487+
sigs.k8s.io/cluster-api/test v1.11.0 h1:dvwMAb5rm4Z7Kj3l9FkeYTWfSthpN0oX3gvUrd8ej24=
488+
sigs.k8s.io/cluster-api/test v1.11.0/go.mod h1:2f489Lp5TKPGVhNL6V3huq8fp6eb23APlY2cLbhuDBU=
489489
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
490490
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
491491
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20250620151452-b9a9ca01fd37 h1:NSnbH7C6/fYc5L3FxMQiSlFBqYi+32LnFsXwArzOlIM=

‎scripts/ci-e2e.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ prerequisites_log="${ARTIFACTS}/logs/e2e-prerequisites.log"
100100
retry 10 10 scp $(get_ssh_common_args) "${container_archive}" "cloud@${CONTROLLER_IP}:capo-e2e-image.tar"
101101
retry 10 10 $(get_ssh_cmd) ${CONTROLLER_IP} -- sudo chown root:root capo-e2e-image.tar
102102
retry 10 10 $(get_ssh_cmd) ${CONTROLLER_IP} -- sudo chmod u=rw,g=r,o=r capo-e2e-image.tar
103+
retry 10 10 $(get_ssh_cmd) ${CONTROLLER_IP} -- sudo mkdir -p /var/www/html
103104
retry 10 10 $(get_ssh_cmd) ${CONTROLLER_IP} -- sudo mv capo-e2e-image.tar /var/www/html/capo-e2e-image.tar
104105
) >"$prerequisites_log" 2>&1 &
105106
build_pid=$!

‎test/e2e/data/e2e_conf.yaml‎

Lines changed: 9 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,16 @@ providers:
1717
- name: cluster-api
1818
type: CoreProvider
1919
versions:
20-
- name: "v1.11.99"
21-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0-rc.0/core-components.yaml"
20+
- name: "{go://sigs.k8s.io/cluster-api@v1.11}"
21+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.11}/core-components.yaml"
2222
type: "url"
2323
contract: v1beta2
2424
replacements:
2525
- old: --metrics-addr=127.0.0.1:8080
2626
new: --metrics-addr=:8080
2727
files:
2828
- sourcePath: "../data/shared/capi/metadata.yaml"
29+
# For clusterctl upgrade test
2930
- name: "{go://sigs.k8s.io/cluster-api@v1.10}"
3031
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.10}/core-components.yaml"
3132
type: url
@@ -37,30 +38,19 @@ providers:
3738
new: "imagePullPolicy: IfNotPresent"
3839
- old: "--leader-elect"
3940
new: "--leader-elect=false\n - --sync-period=1m"
40-
# For clusterctl upgrade test
41-
- name: "{go://sigs.k8s.io/cluster-api@v1.9}"
42-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.9}/core-components.yaml"
43-
type: url
44-
contract: v1beta1
45-
files:
46-
- sourcePath: "../data/shared/capi/metadata.yaml"
47-
replacements:
48-
- old: "imagePullPolicy: Always"
49-
new: "imagePullPolicy: IfNotPresent"
50-
- old: "--leader-elect"
51-
new: "--leader-elect=false\n - --sync-period=1m"
5241
- name: kubeadm
5342
type: BootstrapProvider
5443
versions:
55-
- name: "v1.11.99"
56-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0-rc.0/bootstrap-components.yaml"
44+
- name: "{go://sigs.k8s.io/cluster-api@v1.11}"
45+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.11}/bootstrap-components.yaml"
5746
type: "url"
5847
contract: v1beta2
5948
replacements:
6049
- old: --metrics-addr=127.0.0.1:8080
6150
new: --metrics-addr=:8080
6251
files:
6352
- sourcePath: "../data/shared/capi/metadata.yaml"
53+
# For clusterctl upgrade test
6454
- name: "{go://sigs.k8s.io/cluster-api@v1.10}"
6555
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.10}/bootstrap-components.yaml"
6656
type: url
@@ -72,30 +62,19 @@ providers:
7262
new: "imagePullPolicy: IfNotPresent"
7363
- old: "--leader-elect"
7464
new: "--leader-elect=false\n - --sync-period=1m"
75-
# For clusterctl upgrade test
76-
- name: "{go://sigs.k8s.io/cluster-api@v1.9}"
77-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.9}/bootstrap-components.yaml"
78-
type: url
79-
contract: v1beta1
80-
files:
81-
- sourcePath: "../data/shared/capi/metadata.yaml"
82-
replacements:
83-
- old: "imagePullPolicy: Always"
84-
new: "imagePullPolicy: IfNotPresent"
85-
- old: "--leader-elect"
86-
new: "--leader-elect=false\n - --sync-period=1m"
8765
- name: kubeadm
8866
type: ControlPlaneProvider
8967
versions:
90-
- name: "v1.11.99"
91-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0-rc.0/control-plane-components.yaml"
68+
- name: "{go://sigs.k8s.io/cluster-api@v1.11}"
69+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.11}/control-plane-components.yaml"
9270
type: "url"
9371
contract: v1beta2
9472
replacements:
9573
- old: --metrics-addr=127.0.0.1:8080
9674
new: --metrics-addr=:8080
9775
files:
9876
- sourcePath: "../data/shared/capi/metadata.yaml"
77+
# For clusterctl upgrade test
9978
- name: "{go://sigs.k8s.io/cluster-api@v1.10}"
10079
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.10}/control-plane-components.yaml"
10180
type: url
@@ -107,18 +86,6 @@ providers:
10786
new: "imagePullPolicy: IfNotPresent"
10887
- old: "--leader-elect"
10988
new: "--leader-elect=false\n - --sync-period=1m"
110-
# For clusterctl upgrade test
111-
- name: "{go://sigs.k8s.io/cluster-api@v1.9}"
112-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.9}/control-plane-components.yaml"
113-
type: url
114-
contract: v1beta1
115-
files:
116-
- sourcePath: "../data/shared/capi/metadata.yaml"
117-
replacements:
118-
- old: "imagePullPolicy: Always"
119-
new: "imagePullPolicy: IfNotPresent"
120-
- old: "--leader-elect"
121-
new: "--leader-elect=false\n - --sync-period=1m"
12289
- name: openstack
12390
type: InfrastructureProvider
12491
versions:

‎test/e2e/suites/e2e/clusterctl_upgrade_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
var (
3434
capoRelease011 string
3535
capoRelease012 string
36-
capiRelease19 string
36+
capiRelease110 string
3737
)
3838

3939
var _ = Describe("When testing clusterctl upgrades for CAPO (v0.11=>current) and ORC (v1.0.2=>current) [clusterctl-upgrade]", func() {
@@ -44,9 +44,9 @@ var _ = Describe("When testing clusterctl upgrades for CAPO (v0.11=>current) and
4444
Expect(err).ToNot(HaveOccurred(), "failed to get stable release of CAPO")
4545
capoRelease011 = "v" + capoRelease011
4646
// Note: This gives the version without the 'v' prefix, so we need to add it below.
47-
capiRelease19, err = capi_e2e.GetStableReleaseOfMinor(ctx, "1.9")
47+
capiRelease110, err = capi_e2e.GetStableReleaseOfMinor(ctx, "1.10")
4848
Expect(err).ToNot(HaveOccurred(), "failed to get stable release of CAPI")
49-
capiRelease19 = "v" + capiRelease19
49+
capiRelease110 = "v" + capiRelease110
5050
})
5151

5252
capi_e2e.ClusterctlUpgradeSpec(context.TODO(), func() capi_e2e.ClusterctlUpgradeSpecInput {
@@ -56,12 +56,12 @@ var _ = Describe("When testing clusterctl upgrades for CAPO (v0.11=>current) and
5656
BootstrapClusterProxy: e2eCtx.Environment.BootstrapClusterProxy,
5757
ArtifactFolder: e2eCtx.Settings.ArtifactFolder,
5858
SkipCleanup: false,
59-
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/" + capiRelease19 + "/clusterctl-{OS}-{ARCH}",
59+
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/" + capiRelease110 + "/clusterctl-{OS}-{ARCH}",
6060
InitWithProvidersContract: "v1beta1",
6161
InitWithInfrastructureProviders: []string{"openstack:" + capoRelease011},
62-
InitWithCoreProvider: "cluster-api:" + capiRelease19,
63-
InitWithBootstrapProviders: []string{"kubeadm:" + capiRelease19},
64-
InitWithControlPlaneProviders: []string{"kubeadm:" + capiRelease19},
62+
InitWithCoreProvider: "cluster-api:" + capiRelease110,
63+
InitWithBootstrapProviders: []string{"kubeadm:" + capiRelease110},
64+
InitWithControlPlaneProviders: []string{"kubeadm:" + capiRelease110},
6565
MgmtFlavor: shared.FlavorDefault,
6666
WorkloadFlavor: shared.FlavorDefault,
6767
InitWithKubernetesVersion: e2eCtx.E2EConfig.MustGetVariable(shared.KubernetesVersion),
@@ -78,9 +78,9 @@ var _ = Describe("When testing clusterctl upgrades for CAPO (v0.12=>current) and
7878
Expect(err).ToNot(HaveOccurred(), "failed to get stable release of CAPO")
7979
capoRelease012 = "v" + capoRelease012
8080
// Note: This gives the version without the 'v' prefix, so we need to add it below.
81-
capiRelease19, err = capi_e2e.GetStableReleaseOfMinor(ctx, "1.9")
81+
capiRelease110, err = capi_e2e.GetStableReleaseOfMinor(ctx, "1.10")
8282
Expect(err).ToNot(HaveOccurred(), "failed to get stable release of CAPI")
83-
capiRelease19 = "v" + capiRelease19
83+
capiRelease110 = "v" + capiRelease110
8484
})
8585

8686
capi_e2e.ClusterctlUpgradeSpec(context.TODO(), func() capi_e2e.ClusterctlUpgradeSpecInput {
@@ -90,12 +90,12 @@ var _ = Describe("When testing clusterctl upgrades for CAPO (v0.12=>current) and
9090
BootstrapClusterProxy: e2eCtx.Environment.BootstrapClusterProxy,
9191
ArtifactFolder: e2eCtx.Settings.ArtifactFolder,
9292
SkipCleanup: false,
93-
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/" + capiRelease19 + "/clusterctl-{OS}-{ARCH}",
93+
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/" + capiRelease110 + "/clusterctl-{OS}-{ARCH}",
9494
InitWithProvidersContract: "v1beta1",
9595
InitWithInfrastructureProviders: []string{"openstack:" + capoRelease012},
96-
InitWithCoreProvider: "cluster-api:" + capiRelease19,
97-
InitWithBootstrapProviders: []string{"kubeadm:" + capiRelease19},
98-
InitWithControlPlaneProviders: []string{"kubeadm:" + capiRelease19},
96+
InitWithCoreProvider: "cluster-api:" + capiRelease110,
97+
InitWithBootstrapProviders: []string{"kubeadm:" + capiRelease110},
98+
InitWithControlPlaneProviders: []string{"kubeadm:" + capiRelease110},
9999
MgmtFlavor: shared.FlavorDefault,
100100
WorkloadFlavor: shared.FlavorDefault,
101101
InitWithKubernetesVersion: e2eCtx.E2EConfig.MustGetVariable(shared.KubernetesVersion),

0 commit comments

Comments
 (0)