Skip to content

Commit bd546aa

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #3424 from chrischdi/pr-bump-capi-k8s
🌱 Bump CAPI to v1.10.0-rc.1, K8S and CPI to v1.33.0-rc.0
2 parents 4613a97 + 21128e3 commit bd546aa

File tree

8 files changed

+21
-21
lines changed

8 files changed

+21
-21
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ IMPORT_BOSS_VER := v0.28.1
190190
IMPORT_BOSS := $(abspath $(TOOLS_BIN_DIR)/$(IMPORT_BOSS_BIN))
191191
IMPORT_BOSS_PKG := k8s.io/code-generator/cmd/import-boss
192192

193-
CAPI_HACK_TOOLS_VER := e7a751ff1efec495ce85f0fa90e83851a9da996a # Note: this the commit ID of CAPI v1.10.0-rc.0
193+
CAPI_HACK_TOOLS_VER := 5f91df6e370cfbd634529e14f1bdbd5367303de3 # Note: this the commit ID of CAPI v1.10.0-rc.1
194194

195195
BOSKOSCTL_BIN := boskosctl
196196
BOSKOSCTL := $(abspath $(TOOLS_BIN_DIR)/$(BOSKOSCTL_BIN))

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-vsphere
22

33
go 1.23.0
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.0-rc.0
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.0-rc.1
66

77
replace github.com/vmware-tanzu/vm-operator/pkg/constants/testlabels => github.com/vmware-tanzu/vm-operator/pkg/constants/testlabels v0.0.0-20240404200847-de75746a9505
88

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -421,8 +421,8 @@ k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6J
421421
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
422422
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 h1:CPT0ExVicCzcpeN4baWEV2ko2Z/AsiZgEdwgcfwLgMo=
423423
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
424-
sigs.k8s.io/cluster-api v1.10.0-rc.0 h1:D+89GG2aqx9Jdor+8p5d5AdosA4iMcBbtZaETdHLmH4=
425-
sigs.k8s.io/cluster-api v1.10.0-rc.0/go.mod h1:aiPMrNPoaJc/GuJ4TCpWX8bVe11+iCJ4HI0f3c9QiJg=
424+
sigs.k8s.io/cluster-api v1.10.0-rc.1 h1:ht1WX/gmFvl17zq8o3qnRM6qqMsZAUHN6m6CFZvh6rI=
425+
sigs.k8s.io/cluster-api v1.10.0-rc.1/go.mod h1:aiPMrNPoaJc/GuJ4TCpWX8bVe11+iCJ4HI0f3c9QiJg=
426426
sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU=
427427
sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
428428
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=

‎packaging/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-vsphere/packaging
22

33
go 1.23.0
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.0-rc.0
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.0-rc.1
66

77
replace sigs.k8s.io/cluster-api-provider-vsphere => ../
88

‎packaging/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,8 @@ k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJ
233233
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4=
234234
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
235235
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
236-
sigs.k8s.io/cluster-api v1.10.0-rc.0 h1:D+89GG2aqx9Jdor+8p5d5AdosA4iMcBbtZaETdHLmH4=
237-
sigs.k8s.io/cluster-api v1.10.0-rc.0/go.mod h1:aiPMrNPoaJc/GuJ4TCpWX8bVe11+iCJ4HI0f3c9QiJg=
236+
sigs.k8s.io/cluster-api v1.10.0-rc.1 h1:ht1WX/gmFvl17zq8o3qnRM6qqMsZAUHN6m6CFZvh6rI=
237+
sigs.k8s.io/cluster-api v1.10.0-rc.1/go.mod h1:aiPMrNPoaJc/GuJ4TCpWX8bVe11+iCJ4HI0f3c9QiJg=
238238
sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU=
239239
sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
240240
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=

‎test/e2e/config/vsphere.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ providers:
2727
type: CoreProvider
2828
versions:
2929
- name: "v1.10.99"
30-
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.10.0-rc.0/core-components.yaml"
30+
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.10.0-rc.1/core-components.yaml"
3131
type: "url"
3232
contract: v1beta1
3333
files:
@@ -76,7 +76,7 @@ providers:
7676
type: BootstrapProvider
7777
versions:
7878
- name: "v1.10.99"
79-
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.10.0-rc.0/bootstrap-components.yaml"
79+
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.10.0-rc.1/bootstrap-components.yaml"
8080
type: "url"
8181
contract: v1beta1
8282
files:
@@ -125,7 +125,7 @@ providers:
125125
type: ControlPlaneProvider
126126
versions:
127127
- name: "v1.10.99"
128-
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.10.0-rc.0/control-plane-components.yaml"
128+
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.10.0-rc.1/control-plane-components.yaml"
129129
type: "url"
130130
contract: v1beta1
131131
files:
@@ -303,14 +303,14 @@ providers:
303303

304304
variables:
305305
# Ensure all Kubernetes versions used here are covered in patch-vsphere-template.yaml
306-
KUBERNETES_VERSION_MANAGEMENT: "v1.33.0-beta.0"
306+
KUBERNETES_VERSION_MANAGEMENT: "v1.33.0-rc.0"
307307
# Note: currently not ci/latest-1.33 because of rate-limiting issues.
308-
KUBERNETES_VERSION_MANAGEMENT_LATEST_CI: "v1.33.0-beta.0"
309-
KUBERNETES_VERSION: "v1.33.0-beta.0"
308+
KUBERNETES_VERSION_MANAGEMENT_LATEST_CI: "v1.33.0-rc.0"
309+
KUBERNETES_VERSION: "v1.33.0-rc.0"
310310
KUBERNETES_VERSION_UPGRADE_FROM: "v1.32.0"
311-
KUBERNETES_VERSION_UPGRADE_TO: "v1.33.0-beta.0"
311+
KUBERNETES_VERSION_UPGRADE_TO: "v1.33.0-rc.0"
312312
KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.33"
313-
CPI_IMAGE_K8S_VERSION: "v1.33.0-beta.0"
313+
CPI_IMAGE_K8S_VERSION: "v1.33.0-rc.0"
314314
CNI: "./data/cni/calico/calico.yaml"
315315
AUTOSCALER_WORKLOAD: "./data/autoscaler/autoscaler-to-management-workload.yaml"
316316
CONTROL_PLANE_MACHINE_COUNT: 1

‎test/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ module sigs.k8s.io/cluster-api-provider-vsphere/test
22

33
go 1.23.0
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.0-rc.0
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.0-rc.1
66

7-
replace sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.10.0-rc.0
7+
replace sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.10.0-rc.1
88

99
replace sigs.k8s.io/cluster-api-provider-vsphere => ../
1010

‎test/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -515,10 +515,10 @@ k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6J
515515
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
516516
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 h1:CPT0ExVicCzcpeN4baWEV2ko2Z/AsiZgEdwgcfwLgMo=
517517
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
518-
sigs.k8s.io/cluster-api v1.10.0-rc.0 h1:D+89GG2aqx9Jdor+8p5d5AdosA4iMcBbtZaETdHLmH4=
519-
sigs.k8s.io/cluster-api v1.10.0-rc.0/go.mod h1:aiPMrNPoaJc/GuJ4TCpWX8bVe11+iCJ4HI0f3c9QiJg=
520-
sigs.k8s.io/cluster-api/test v1.10.0-rc.0 h1:OgpsT8KZMom0zsypVQ6nPQhlHXnhyMwUE5Bl7kgAkow=
521-
sigs.k8s.io/cluster-api/test v1.10.0-rc.0/go.mod h1:CYFajf4HhV5zhoiPl+m5Omk0a3WtnyXHtFVPqWIcUy4=
518+
sigs.k8s.io/cluster-api v1.10.0-rc.1 h1:ht1WX/gmFvl17zq8o3qnRM6qqMsZAUHN6m6CFZvh6rI=
519+
sigs.k8s.io/cluster-api v1.10.0-rc.1/go.mod h1:aiPMrNPoaJc/GuJ4TCpWX8bVe11+iCJ4HI0f3c9QiJg=
520+
sigs.k8s.io/cluster-api/test v1.10.0-rc.1 h1:JtW17xLh8PKrxw6tGQPl5pBxBF6taV83eKcw/vwht/Q=
521+
sigs.k8s.io/cluster-api/test v1.10.0-rc.1/go.mod h1:CYFajf4HhV5zhoiPl+m5Omk0a3WtnyXHtFVPqWIcUy4=
522522
sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU=
523523
sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
524524
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=

0 commit comments

Comments
 (0)