Skip to content

Commit ee5fa0e

Browse files
sbueringersbueringer
committed
Bump to CAPI v1.9.0-beta.0
Signed-off-by: Stefan Büringer [email protected]
1 parent 9ee0810 commit ee5fa0e

File tree

8 files changed

+22
-22
lines changed

8 files changed

+22
-22
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
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 := 5d54746e010854a1316e72733e13577d4d5695ec # Note: this is the commit ID of CAPI 5d54746e010854a1316e72733e13577d4d5695ec from 2024-10-23
185+
CAPI_HACK_TOOLS_VER := 180d732ac4d6931466415ac66e8603f762eb4167 # Note: this is the commit ID of CAPI v1.9.0-beta.0
186186

187187
BOSKOSCTL_BIN := boskosctl
188188
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.22.0
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.8.0-rc.0.0.20241022191051-5d54746e0108
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.9.0-beta.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‎

Lines changed: 2 additions & 2 deletions
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.8.0-rc.0.0.20241022191051-5d54746e0108 h1:dq1LAkaJ3XIR8iPpLqgfpK+mSjnZZqqLsNZneGMmUd8=
421-
sigs.k8s.io/cluster-api v1.8.0-rc.0.0.20241022191051-5d54746e0108/go.mod h1:7GSFeeja8jIcDaMVNJgHdxm2YDNHiKeYAzvZDscodIQ=
420+
sigs.k8s.io/cluster-api v1.9.0-beta.0 h1:mcaPkmnpPcN9NdMAmwzhFqZt+HoJfKkneAWiZeCp0Wc=
421+
sigs.k8s.io/cluster-api v1.9.0-beta.0/go.mod h1:LkFhFajMVWxyfuM4BShEKOSCN2lXBs/hDLQjbKoZ4XA=
422422
sigs.k8s.io/controller-runtime v0.19.1 h1:Son+Q40+Be3QWb+niBXAg2vFiYWolDjjRfO8hn/cxOk=
423423
sigs.k8s.io/controller-runtime v0.19.1/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
424424
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

‎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.22.7
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.8.0-rc.0.0.20241022191051-5d54746e0108
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.9.0-beta.0
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
@@ -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.8.0-rc.0.0.20241022191051-5d54746e0108 h1:dq1LAkaJ3XIR8iPpLqgfpK+mSjnZZqqLsNZneGMmUd8=
236-
sigs.k8s.io/cluster-api v1.8.0-rc.0.0.20241022191051-5d54746e0108/go.mod h1:7GSFeeja8jIcDaMVNJgHdxm2YDNHiKeYAzvZDscodIQ=
235+
sigs.k8s.io/cluster-api v1.9.0-beta.0 h1:mcaPkmnpPcN9NdMAmwzhFqZt+HoJfKkneAWiZeCp0Wc=
236+
sigs.k8s.io/cluster-api v1.9.0-beta.0/go.mod h1:LkFhFajMVWxyfuM4BShEKOSCN2lXBs/hDLQjbKoZ4XA=
237237
sigs.k8s.io/controller-runtime v0.19.1 h1:Son+Q40+Be3QWb+niBXAg2vFiYWolDjjRfO8hn/cxOk=
238238
sigs.k8s.io/controller-runtime v0.19.1/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
239239
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

‎test/e2e/config/vsphere.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ providers:
2626
- name: cluster-api
2727
type: CoreProvider
2828
versions:
29-
- name: "v1.9.99"
30-
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20241023/core-components.yaml"
29+
- name: "v1.9.0"
30+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.0-beta.0/core-components.yaml"
3131
type: "url"
3232
contract: v1beta1
3333
files:
@@ -66,8 +66,8 @@ providers:
6666
- name: kubeadm
6767
type: BootstrapProvider
6868
versions:
69-
- name: "v1.9.99"
70-
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20241023/bootstrap-components.yaml"
69+
- name: "v1.9.0"
70+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.0-beta.0/bootstrap-components.yaml"
7171
type: "url"
7272
contract: v1beta1
7373
files:
@@ -106,8 +106,8 @@ providers:
106106
- name: kubeadm
107107
type: ControlPlaneProvider
108108
versions:
109-
- name: "v1.9.99"
110-
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20241023/control-plane-components.yaml"
109+
- name: "v1.9.0"
110+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.0-beta.0/control-plane-components.yaml"
111111
type: "url"
112112
contract: v1beta1
113113
files:

‎test/go.mod‎

Lines changed: 3 additions & 3 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.22.0
44

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

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

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

@@ -50,7 +50,7 @@ require (
5050
github.com/Microsoft/go-winio v0.5.0 // indirect
5151
github.com/NYTimes/gziphandler v1.1.1 // indirect
5252
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
53-
github.com/adrg/xdg v0.5.1 // indirect
53+
github.com/adrg/xdg v0.5.3 // indirect
5454
github.com/alessio/shellescape v1.4.2 // indirect
5555
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
5656
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect

‎test/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 h1:wPbRQzjjwF
2121
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8/go.mod h1:I0gYDMZ6Z5GRU7l58bNFSkPTFN6Yl12dsUlAZ8xy98g=
2222
github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
2323
github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
24-
github.com/adrg/xdg v0.5.1 h1:Im8iDbEFARltY09yOJlSGu4Asjk2vF85+3Dyru8uJ0U=
25-
github.com/adrg/xdg v0.5.1/go.mod h1:nlTsY+NNiCBGCK2tpm09vRqfVzrc2fLmXGpBLF0zlTQ=
24+
github.com/adrg/xdg v0.5.3 h1:xRnxJXne7+oWDatRhR1JLnvuccuIeCoBu2rtuLqQB78=
25+
github.com/adrg/xdg v0.5.3/go.mod h1:nlTsY+NNiCBGCK2tpm09vRqfVzrc2fLmXGpBLF0zlTQ=
2626
github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0=
2727
github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30=
2828
github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI=
@@ -507,10 +507,10 @@ k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1
507507
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
508508
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY=
509509
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
510-
sigs.k8s.io/cluster-api v1.8.0-rc.0.0.20241022191051-5d54746e0108 h1:dq1LAkaJ3XIR8iPpLqgfpK+mSjnZZqqLsNZneGMmUd8=
511-
sigs.k8s.io/cluster-api v1.8.0-rc.0.0.20241022191051-5d54746e0108/go.mod h1:7GSFeeja8jIcDaMVNJgHdxm2YDNHiKeYAzvZDscodIQ=
512-
sigs.k8s.io/cluster-api/test v1.8.0-rc.0.0.20241022191051-5d54746e0108 h1:ZXwhzzAwn/L45gnxwUEp5/fSA4sIYy6LgPHMqzFCR+Q=
513-
sigs.k8s.io/cluster-api/test v1.8.0-rc.0.0.20241022191051-5d54746e0108/go.mod h1:SNYIhqJ4f5Cw9fO5zT7imaRi2laIgf8xVpyRAMJM/ak=
510+
sigs.k8s.io/cluster-api v1.9.0-beta.0 h1:mcaPkmnpPcN9NdMAmwzhFqZt+HoJfKkneAWiZeCp0Wc=
511+
sigs.k8s.io/cluster-api v1.9.0-beta.0/go.mod h1:LkFhFajMVWxyfuM4BShEKOSCN2lXBs/hDLQjbKoZ4XA=
512+
sigs.k8s.io/cluster-api/test v1.9.0-beta.0 h1:CNmLVsJckFqYP2UbtItv88hs/CANyAyubSq0PLE9gG4=
513+
sigs.k8s.io/cluster-api/test v1.9.0-beta.0/go.mod h1:c84DQYINLIni0NVy7QDePCT7lpPsLi0O4T2FhUIBV78=
514514
sigs.k8s.io/controller-runtime v0.19.1 h1:Son+Q40+Be3QWb+niBXAg2vFiYWolDjjRfO8hn/cxOk=
515515
sigs.k8s.io/controller-runtime v0.19.1/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
516516
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

0 commit comments

Comments
 (0)