Skip to content

Commit 1e3cb59

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #3119 from chrischdi/pr-bump-capi-8-beta1
🌱 Bump sigs.k8s.io/cluster-api to v1.8.0-beta.1
2 parents 3121dff + b653eae commit 1e3cb59

File tree

6 files changed

+74
-74
lines changed

6 files changed

+74
-74
lines changed

‎Makefile‎

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

188-
CAPI_HACK_TOOLS_VER := 377bd194f91b46cf992e9a3a808f553738538ca4 # Note: this is the commit ID of CAPI v1.8.0-beta.0
188+
CAPI_HACK_TOOLS_VER := 176d7705c42f7254521dc3afd6cac0a65fcc4584 # Note: this is the commit ID of CAPI v1.8.0-beta.1
189189

190190
BOSKOSCTL_BIN := boskosctl
191191
BOSKOSCTL := $(abspath $(TOOLS_BIN_DIR)/$(BOSKOSCTL_BIN))

‎go.mod‎

Lines changed: 8 additions & 8 deletions
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-beta.0
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.8.0-beta.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

@@ -32,12 +32,12 @@ require (
3232
golang.org/x/tools v0.23.0
3333
gopkg.in/gcfg.v1 v1.2.3
3434
gopkg.in/yaml.v2 v2.4.0
35-
k8s.io/api v0.30.2
36-
k8s.io/apiextensions-apiserver v0.30.2
37-
k8s.io/apimachinery v0.30.2
38-
k8s.io/client-go v0.30.2
39-
k8s.io/cluster-bootstrap v0.30.2
40-
k8s.io/component-base v0.30.2
35+
k8s.io/api v0.30.3
36+
k8s.io/apiextensions-apiserver v0.30.3
37+
k8s.io/apimachinery v0.30.3
38+
k8s.io/client-go v0.30.3
39+
k8s.io/cluster-bootstrap v0.30.3
40+
k8s.io/component-base v0.30.3
4141
k8s.io/klog/v2 v2.120.1
4242
k8s.io/utils v0.0.0-20231127182322-b307cd553661
4343
sigs.k8s.io/cluster-api v0.0.0-00010101000000-000000000000
@@ -130,7 +130,7 @@ require (
130130
gopkg.in/fsnotify.v1 v1.4.7
131131
gopkg.in/inf.v0 v0.9.1 // indirect
132132
gopkg.in/yaml.v3 v3.0.1 // indirect
133-
k8s.io/apiserver v0.30.2 // indirect
133+
k8s.io/apiserver v0.30.3 // indirect
134134
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
135135
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
136136
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

‎go.sum‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -571,14 +571,14 @@ go.etcd.io/bbolt v1.3.8 h1:xs88BrvEv273UsB79e0hcVrlUWmS0a8upikMFhSyAtA=
571571
go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
572572
go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489 h1:1JFLBqwIgdyHN1ZtgjTBwO+blA6gVOmZurpiMEsETKo=
573573
go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg=
574-
go.etcd.io/etcd/api/v3 v3.5.14 h1:vHObSCxyB9zlF60w7qzAdTcGaglbJOpSj1Xj9+WGxq0=
575-
go.etcd.io/etcd/api/v3 v3.5.14/go.mod h1:BmtWcRlQvwa1h3G2jvKYwIQy4PkHlDej5t7uLMUdJUU=
576-
go.etcd.io/etcd/client/pkg/v3 v3.5.14 h1:SaNH6Y+rVEdxfpA2Jr5wkEvN6Zykme5+YnbCkxvuWxQ=
577-
go.etcd.io/etcd/client/pkg/v3 v3.5.14/go.mod h1:8uMgAokyG1czCtIdsq+AGyYQMvpIKnSvPjFMunkgeZI=
574+
go.etcd.io/etcd/api/v3 v3.5.15 h1:3KpLJir1ZEBrYuV2v+Twaa/e2MdDCEZ/70H+lzEiwsk=
575+
go.etcd.io/etcd/api/v3 v3.5.15/go.mod h1:N9EhGzXq58WuMllgH9ZvnEr7SI9pS0k0+DHZezGp7jM=
576+
go.etcd.io/etcd/client/pkg/v3 v3.5.15 h1:fo0HpWz/KlHGMCC+YejpiCmyWDEuIpnTDzpJLB5fWlA=
577+
go.etcd.io/etcd/client/pkg/v3 v3.5.15/go.mod h1:mXDI4NAOwEiszrHCb0aqfAYNCrZP4e9hRca3d1YK8EU=
578578
go.etcd.io/etcd/client/v2 v2.305.10 h1:MrmRktzv/XF8CvtQt+P6wLUlURaNpSDJHFZhe//2QE4=
579579
go.etcd.io/etcd/client/v2 v2.305.10/go.mod h1:m3CKZi69HzilhVqtPDcjhSGp+kA1OmbNn0qamH80xjA=
580-
go.etcd.io/etcd/client/v3 v3.5.14 h1:CWfRs4FDaDoSz81giL7zPpZH2Z35tbOrAJkkjMqOupg=
581-
go.etcd.io/etcd/client/v3 v3.5.14/go.mod h1:k3XfdV/VIHy/97rqWjoUzrj9tk7GgJGH9J8L4dNXmAk=
580+
go.etcd.io/etcd/client/v3 v3.5.15 h1:23M0eY4Fd/inNv1ZfU3AxrbbOdW79r9V9Rl62Nm6ip4=
581+
go.etcd.io/etcd/client/v3 v3.5.15/go.mod h1:CLSJxrYjvLtHsrPKsy7LmZEE+DK2ktfd2bN4RhBMwlU=
582582
go.etcd.io/etcd/pkg/v3 v3.5.10 h1:WPR8K0e9kWl1gAhB5A7gEa5ZBTNkT9NdNWrR8Qpo1CM=
583583
go.etcd.io/etcd/pkg/v3 v3.5.10/go.mod h1:TKTuCKKcF1zxmfKWDkfz5qqYaE3JncKKZPFf8c1nFUs=
584584
go.etcd.io/etcd/raft/v3 v3.5.10 h1:cgNAYe7xrsrn/5kXMSaH8kM/Ky8mAdMqGOxyYwpP0LA=
@@ -964,27 +964,27 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
964964
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
965965
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
966966
k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s=
967-
k8s.io/api v0.30.2 h1:+ZhRj+28QT4UOH+BKznu4CBgPWgkXO7XAvMcMl0qKvI=
968-
k8s.io/api v0.30.2/go.mod h1:ULg5g9JvOev2dG0u2hig4Z7tQ2hHIuS+m8MNZ+X6EmI=
967+
k8s.io/api v0.30.3 h1:ImHwK9DCsPA9uoU3rVh4QHAHHK5dTSv1nxJUapx8hoQ=
968+
k8s.io/api v0.30.3/go.mod h1:GPc8jlzoe5JG3pb0KJCSLX5oAFIW3/qNJITlDj8BH04=
969969
k8s.io/apiextensions-apiserver v0.21.1/go.mod h1:KESQFCGjqVcVsZ9g0xX5bacMjyX5emuWcS2arzdEouA=
970-
k8s.io/apiextensions-apiserver v0.30.2 h1:l7Eue2t6QiLHErfn2vwK4KgF4NeDgjQkCXtEbOocKIE=
971-
k8s.io/apiextensions-apiserver v0.30.2/go.mod h1:lsJFLYyK40iguuinsb3nt+Sj6CmodSI4ACDLep1rgjw=
970+
k8s.io/apiextensions-apiserver v0.30.3 h1:oChu5li2vsZHx2IvnGP3ah8Nj3KyqG3kRSaKmijhB9U=
971+
k8s.io/apiextensions-apiserver v0.30.3/go.mod h1:uhXxYDkMAvl6CJw4lrDN4CPbONkF3+XL9cacCT44kV4=
972972
k8s.io/apimachinery v0.17.4/go.mod h1:gxLnyZcGNdZTCLnq3fgzyg2A5BVCHTNDFrw8AmuJ+0g=
973973
k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY=
974-
k8s.io/apimachinery v0.30.2 h1:fEMcnBj6qkzzPGSVsAZtQThU62SmQ4ZymlXRC5yFSCg=
975-
k8s.io/apimachinery v0.30.2/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
974+
k8s.io/apimachinery v0.30.3 h1:q1laaWCmrszyQuSQCfNB8cFgCuDAoPszKY4ucAjDwHc=
975+
k8s.io/apimachinery v0.30.3/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
976976
k8s.io/apiserver v0.21.1/go.mod h1:nLLYZvMWn35glJ4/FZRhzLG/3MPxAaZTgV4FJZdr+tY=
977-
k8s.io/apiserver v0.30.2 h1:ACouHiYl1yFI2VFI3YGM+lvxgy6ir4yK2oLOsLI1/tw=
978-
k8s.io/apiserver v0.30.2/go.mod h1:BOTdFBIch9Sv0ypSEcUR6ew/NUFGocRFNl72Ra7wTm8=
977+
k8s.io/apiserver v0.30.3 h1:QZJndA9k2MjFqpnyYv/PH+9PE0SHhx3hBho4X0vE65g=
978+
k8s.io/apiserver v0.30.3/go.mod h1:6Oa88y1CZqnzetd2JdepO0UXzQX4ZnOekx2/PtEjrOg=
979979
k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs=
980-
k8s.io/client-go v0.30.2 h1:sBIVJdojUNPDU/jObC+18tXWcTJVcwyqS9diGdWHk50=
981-
k8s.io/client-go v0.30.2/go.mod h1:JglKSWULm9xlJLx4KCkfLLQ7XwtlbflV6uFFSHTMgVs=
982-
k8s.io/cluster-bootstrap v0.30.2 h1:9PQ5phjWTxmPFKPEzTG6QJzPaUIfuW2RqcHDME5gqPg=
983-
k8s.io/cluster-bootstrap v0.30.2/go.mod h1:dvzAgNVmwRfZ0BzHI/WTvzqlzmNH7w21mdnahEq61KY=
980+
k8s.io/client-go v0.30.3 h1:bHrJu3xQZNXIi8/MoxYtZBBWQQXwy16zqJwloXXfD3k=
981+
k8s.io/client-go v0.30.3/go.mod h1:8d4pf8vYu665/kUbsxWAQ/JDBNWqfFeZnvFiVdmx89U=
982+
k8s.io/cluster-bootstrap v0.30.3 h1:MgxyxMkpaC6mu0BKWJ8985XCOnKU+eH3Iy+biwtDXRk=
983+
k8s.io/cluster-bootstrap v0.30.3/go.mod h1:h8BoLDfdD7XEEIXy7Bx9FcMzxHwz29jsYYi34bM5DKU=
984984
k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q=
985985
k8s.io/component-base v0.21.1/go.mod h1:NgzFZ2qu4m1juby4TnrmpR8adRk6ka62YdH5DkIIyKA=
986-
k8s.io/component-base v0.30.2 h1:pqGBczYoW1sno8q9ObExUqrYSKhtE5rW3y6gX88GZII=
987-
k8s.io/component-base v0.30.2/go.mod h1:yQLkQDrkK8J6NtP+MGJOws+/PPeEXNpwFixsUI7h/OE=
986+
k8s.io/component-base v0.30.3 h1:Ci0UqKWf4oiwy8hr1+E3dsnliKnkMLZMVbWzeorlk7s=
987+
k8s.io/component-base v0.30.3/go.mod h1:C1SshT3rGPCuNtBs14RmVD2xW0EhRSeLvBh7AGk1quA=
988988
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
989989
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
990990
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
@@ -1009,8 +1009,8 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
10091009
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
10101010
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0 h1:Tc9rS7JJoZ9sl3OpL4842oIk6lH7gWBb0JOmJ0ute7M=
10111011
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0/go.mod h1:1ewhL9l1gkPcU/IU/6rFYfikf+7Y5imWv7ARVbBOzNs=
1012-
sigs.k8s.io/cluster-api v1.8.0-beta.0 h1:jIBdTz4xpYJDd4kmPktZeWzDp1PL6kZSMGdShE3xccg=
1013-
sigs.k8s.io/cluster-api v1.8.0-beta.0/go.mod h1:UsiGMX8dJWhr6nd3ZTsqWYNLv5bQ/unUYfjqFPpOAvg=
1012+
sigs.k8s.io/cluster-api v1.8.0-beta.1 h1:VDEw9hLARr/yxmHbfMtuwpsG0ZEZeay7djl1wllY/B8=
1013+
sigs.k8s.io/cluster-api v1.8.0-beta.1/go.mod h1:TNkfly2mrCG8O6DjGFru0USq1NhWbo2njpSXxKrRgL0=
10141014
sigs.k8s.io/controller-runtime v0.9.0/go.mod h1:TgkfvrhhEw3PlI0BRL/5xM+89y3/yc0ZDfdbTl84si8=
10151015
sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw=
10161016
sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg=

‎test/e2e/config/vsphere.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ providers:
2727
type: CoreProvider
2828
versions:
2929
- name: "v1.8.0" # supported release in the v1beta1 series
30-
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20240722/core-components.yaml"
30+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.0-beta.1/core-components.yaml"
3131
type: "url"
3232
contract: v1beta1
3333
files:
@@ -67,7 +67,7 @@ providers:
6767
type: BootstrapProvider
6868
versions:
6969
- name: "v1.8.0" # supported release in the v1beta1 series
70-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.0-beta.0/bootstrap-components.yaml"
70+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.0-beta.1/bootstrap-components.yaml"
7171
type: "url"
7272
contract: v1beta1
7373
files:
@@ -107,7 +107,7 @@ providers:
107107
type: ControlPlaneProvider
108108
versions:
109109
- name: "v1.8.0" # supported release in the v1beta1 series
110-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.0-beta.0/control-plane-components.yaml"
110+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.0-beta.1/control-plane-components.yaml"
111111
type: "url"
112112
contract: v1beta1
113113
files:

‎test/go.mod‎

Lines changed: 14 additions & 14 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-beta.0
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.8.0-beta.1
66

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

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

@@ -27,14 +27,14 @@ require (
2727
github.com/spf13/pflag v1.0.5
2828
golang.org/x/crypto v0.25.0
2929
gopkg.in/yaml.v2 v2.4.0
30-
k8s.io/api v0.30.2
31-
k8s.io/apiextensions-apiserver v0.30.2
32-
k8s.io/apimachinery v0.30.2
33-
k8s.io/client-go v0.30.2
34-
k8s.io/component-base v0.30.2
30+
k8s.io/api v0.30.3
31+
k8s.io/apiextensions-apiserver v0.30.3
32+
k8s.io/apimachinery v0.30.3
33+
k8s.io/client-go v0.30.3
34+
k8s.io/component-base v0.30.3
3535
k8s.io/klog/v2 v2.120.1
3636
k8s.io/utils v0.0.0-20231127182322-b307cd553661
37-
sigs.k8s.io/cluster-api v1.8.0-beta.0
37+
sigs.k8s.io/cluster-api v0.0.0-00010101000000-000000000000
3838
sigs.k8s.io/cluster-api-provider-vsphere v0.0.0-00010101000000-000000000000
3939
sigs.k8s.io/cluster-api/test v0.0.0-00010101000000-000000000000
4040
sigs.k8s.io/controller-runtime v0.18.4
@@ -63,7 +63,7 @@ require (
6363
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
6464
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
6565
github.com/distribution/reference v0.6.0 // indirect
66-
github.com/docker/docker v27.0.3+incompatible // indirect
66+
github.com/docker/docker v27.1.0+incompatible // indirect
6767
github.com/docker/go-connections v0.5.0 // indirect
6868
github.com/docker/go-units v0.4.0 // indirect
6969
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
@@ -136,9 +136,9 @@ require (
136136
github.com/subosito/gotenv v1.6.0 // indirect
137137
github.com/valyala/fastjson v1.6.4 // indirect
138138
github.com/vmware-tanzu/vm-operator/external/ncp v0.0.0-20240404200847-de75746a9505 // indirect
139-
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
140-
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
141-
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
139+
go.etcd.io/etcd/api/v3 v3.5.15 // indirect
140+
go.etcd.io/etcd/client/pkg/v3 v3.5.15 // indirect
141+
go.etcd.io/etcd/client/v3 v3.5.15 // indirect
142142
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
143143
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
144144
go.opentelemetry.io/otel v1.24.0 // indirect
@@ -167,8 +167,8 @@ require (
167167
gopkg.in/inf.v0 v0.9.1 // indirect
168168
gopkg.in/ini.v1 v1.67.0 // indirect
169169
gopkg.in/yaml.v3 v3.0.1 // indirect
170-
k8s.io/apiserver v0.30.2 // indirect
171-
k8s.io/cluster-bootstrap v0.30.2 // indirect
170+
k8s.io/apiserver v0.30.3 // indirect
171+
k8s.io/cluster-bootstrap v0.30.3 // indirect
172172
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
173173
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0 // indirect
174174
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

0 commit comments

Comments
 (0)