Skip to content

Commit 00df580

Browse files
authored
Merge pull request #3263 from chrischdi/pr-bump-capi-9-rc0
🌱 Bump sigs.k8s.io/cluster-api to v1.9.0-rc.0
2 parents 3078960 + f15cba7 commit 00df580

File tree

8 files changed

+19
-19
lines changed

8 files changed

+19
-19
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ IMPORT_BOSS_VER := v0.28.1
182182
IMPORT_BOSS := $(abspath $(TOOLS_BIN_DIR)/$(IMPORT_BOSS_BIN))
183183
IMPORT_BOSS_PKG := k8s.io/code-generator/cmd/import-boss
184184

185-
CAPI_HACK_TOOLS_VER := 2dbfdf2159eba2195f673e0febd004a4438e32aa # Note: this is the commit ID of CAPI v1.9.0-beta.1
185+
CAPI_HACK_TOOLS_VER := 721b6cf772821d789e9165511ffcb8945f808a79 # Note: this is the commit ID of CAPI v1.9.0-rc.0
186186

187187
BOSKOSCTL_BIN := boskosctl
188188
BOSKOSCTL := $(abspath $(TOOLS_BIN_DIR)/$(BOSKOSCTL_BIN))

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-vsphere
22

33
go 1.22.0
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.9.0-beta.1
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.9.0-rc.0
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -417,8 +417,8 @@ k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1
417417
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
418418
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY=
419419
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
420-
sigs.k8s.io/cluster-api v1.9.0-beta.1 h1:2WS3kETgy+fccSXw437tQ38i/E7xNvzUGwJhXCDl2RU=
421-
sigs.k8s.io/cluster-api v1.9.0-beta.1/go.mod h1:D/VXz6N/gY2fo8MS4xa1VBE50rW1/YaQ/69H9RSA8zs=
420+
sigs.k8s.io/cluster-api v1.9.0-rc.0 h1:R7uBlTtCFkz2c2Oy+PGDod0yRtNRXz7dhyOkLtQBFaI=
421+
sigs.k8s.io/cluster-api v1.9.0-rc.0/go.mod h1:Wvjujq1g8+hBQYWYra7vZLoG1VlCfSisrAtOgUUgwvI=
422422
sigs.k8s.io/controller-runtime v0.19.2 h1:3sPrF58XQEPzbE8T81TN6selQIMGbtYwuaJ6eDssDF8=
423423
sigs.k8s.io/controller-runtime v0.19.2/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
424424
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

packaging/go.mod

+1-1
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.22.7
44

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

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

packaging/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,8 @@ k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7F
232232
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
233233
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
234234
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
235-
sigs.k8s.io/cluster-api v1.9.0-beta.1 h1:2WS3kETgy+fccSXw437tQ38i/E7xNvzUGwJhXCDl2RU=
236-
sigs.k8s.io/cluster-api v1.9.0-beta.1/go.mod h1:D/VXz6N/gY2fo8MS4xa1VBE50rW1/YaQ/69H9RSA8zs=
235+
sigs.k8s.io/cluster-api v1.9.0-rc.0 h1:R7uBlTtCFkz2c2Oy+PGDod0yRtNRXz7dhyOkLtQBFaI=
236+
sigs.k8s.io/cluster-api v1.9.0-rc.0/go.mod h1:Wvjujq1g8+hBQYWYra7vZLoG1VlCfSisrAtOgUUgwvI=
237237
sigs.k8s.io/controller-runtime v0.19.2 h1:3sPrF58XQEPzbE8T81TN6selQIMGbtYwuaJ6eDssDF8=
238238
sigs.k8s.io/controller-runtime v0.19.2/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
239239
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

test/e2e/config/vsphere.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ providers:
2727
type: CoreProvider
2828
versions:
2929
- name: "v1.9.0"
30-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.0-beta.1/core-components.yaml"
30+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.0-rc.0/core-components.yaml"
3131
type: "url"
3232
contract: v1beta1
3333
files:
@@ -67,7 +67,7 @@ providers:
6767
type: BootstrapProvider
6868
versions:
6969
- name: "v1.9.0"
70-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.0-beta.1/bootstrap-components.yaml"
70+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.0-rc.0/bootstrap-components.yaml"
7171
type: "url"
7272
contract: v1beta1
7373
files:
@@ -107,7 +107,7 @@ providers:
107107
type: ControlPlaneProvider
108108
versions:
109109
- name: "v1.9.0"
110-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.0-beta.1/control-plane-components.yaml"
110+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.0-rc.0/control-plane-components.yaml"
111111
type: "url"
112112
contract: v1beta1
113113
files:

test/go.mod

+3-3
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.22.0
44

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

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

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

@@ -172,6 +172,6 @@ require (
172172
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
173173
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
174174
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
175-
sigs.k8s.io/kind v0.24.0 // indirect
175+
sigs.k8s.io/kind v0.25.0 // indirect
176176
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
177177
)

test/go.sum

+6-6
Original file line numberDiff line numberDiff line change
@@ -508,16 +508,16 @@ k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1
508508
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
509509
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY=
510510
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
511-
sigs.k8s.io/cluster-api v1.9.0-beta.1 h1:2WS3kETgy+fccSXw437tQ38i/E7xNvzUGwJhXCDl2RU=
512-
sigs.k8s.io/cluster-api v1.9.0-beta.1/go.mod h1:D/VXz6N/gY2fo8MS4xa1VBE50rW1/YaQ/69H9RSA8zs=
513-
sigs.k8s.io/cluster-api/test v1.9.0-beta.1 h1:T7/3uS1uxxbJGR7OdAhrRAsMMFfyR0kTghDWUkE/4YE=
514-
sigs.k8s.io/cluster-api/test v1.9.0-beta.1/go.mod h1:/VMTCqaBV3XrrtVo12MwjjDquX3p1PYjQCNolEUyazQ=
511+
sigs.k8s.io/cluster-api v1.9.0-rc.0 h1:R7uBlTtCFkz2c2Oy+PGDod0yRtNRXz7dhyOkLtQBFaI=
512+
sigs.k8s.io/cluster-api v1.9.0-rc.0/go.mod h1:Wvjujq1g8+hBQYWYra7vZLoG1VlCfSisrAtOgUUgwvI=
513+
sigs.k8s.io/cluster-api/test v1.9.0-rc.0 h1:lYDvc9cmCKon2zjwE5qetRO7j2YfJ9MMZeb4Hv89Tlc=
514+
sigs.k8s.io/cluster-api/test v1.9.0-rc.0/go.mod h1:SQKcvXlJ1fxk+gWRYp9J/sq6jKmd7onoDLqDFQbxt9M=
515515
sigs.k8s.io/controller-runtime v0.19.2 h1:3sPrF58XQEPzbE8T81TN6selQIMGbtYwuaJ6eDssDF8=
516516
sigs.k8s.io/controller-runtime v0.19.2/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
517517
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
518518
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
519-
sigs.k8s.io/kind v0.24.0 h1:g4y4eu0qa+SCeKESLpESgMmVFBebL0BDa6f777OIWrg=
520-
sigs.k8s.io/kind v0.24.0/go.mod h1:t7ueEpzPYJvHA8aeLtI52rtFftNgUYUaCwvxjk7phfw=
519+
sigs.k8s.io/kind v0.25.0 h1:ugUvgesHKKA0yKmD6QtYTiEev+kPUpGxdTPbMGf8VTU=
520+
sigs.k8s.io/kind v0.25.0/go.mod h1:t7ueEpzPYJvHA8aeLtI52rtFftNgUYUaCwvxjk7phfw=
521521
sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
522522
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
523523
sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=

0 commit comments

Comments
 (0)