Skip to content

Commit 3f159b9

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #3558 from fabriziopandini/bump-capi-v1.11.0-beta.2
✨ Bump to CAPI v1.11.0-beta.2
2 parents 80a49d7 + ee5e105 commit 3f159b9

File tree

19 files changed

+105
-122
lines changed

19 files changed

+105
-122
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 := fb0e2da320e26237acb28cc4e835759b67badc91 # Note: this the commit ID of CAPI v1.11.0-beta.1.
193+
CAPI_HACK_TOOLS_VER := ead3737e81eff878355a31e8aea6416ecdc0598c # Note: this the commit ID of CAPI v1.11.0-beta.2.
194194

195195
BOSKOSCTL_BIN := boskosctl
196196
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.24.0
44

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

@@ -66,12 +66,12 @@ require (
6666
github.com/x448/float16 v0.8.4 // indirect
6767
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
6868
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
69-
go.opentelemetry.io/otel v1.33.0 // indirect
69+
go.opentelemetry.io/otel v1.34.0 // indirect
7070
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
7171
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
72-
go.opentelemetry.io/otel/metric v1.33.0 // indirect
73-
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
74-
go.opentelemetry.io/otel/trace v1.33.0 // indirect
72+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
73+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
74+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
7575
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
7676
go.uber.org/automaxprocs v1.6.0 // indirect
7777
go.uber.org/multierr v1.11.0 // indirect
@@ -83,9 +83,9 @@ require (
8383
golang.org/x/sys v0.34.0 // indirect
8484
golang.org/x/term v0.33.0 // indirect
8585
golang.org/x/text v0.27.0 // indirect
86-
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
87-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect
88-
google.golang.org/grpc v1.68.2 // indirect
86+
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
87+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
88+
google.golang.org/grpc v1.71.1 // indirect
8989
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
9090
gopkg.in/warnings.v0 v0.1.2 // indirect
9191
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect

‎go.sum

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -235,18 +235,20 @@ go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJyS
235235
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
236236
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 h1:yd02MEjBdJkG3uabWP9apV+OuWRIXGDuJEUJbOHmCFU=
237237
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0/go.mod h1:umTcuxiv1n/s/S6/c2AT/g2CQ7u5C59sHDNmfSwgz7Q=
238-
go.opentelemetry.io/otel v1.33.0 h1:/FerN9bax5LoK51X/sI0SVYrjSE0/yUL7DpxW4K3FWw=
239-
go.opentelemetry.io/otel v1.33.0/go.mod h1:SUUkR6csvUQl+yjReHu5uM3EtVV7MBm5FHKRlNx4I8I=
238+
go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
239+
go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
240240
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 h1:Vh5HayB/0HHfOQA7Ctx69E/Y/DcQSMPpKANYVMQ7fBA=
241241
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0/go.mod h1:cpgtDBaqD/6ok/UG0jT15/uKjAY8mRA53diogHBg3UI=
242242
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 h1:5pojmb1U1AogINhN3SurB+zm/nIcusopeBNp42f45QM=
243243
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0/go.mod h1:57gTHJSE5S1tqg+EKsLPlTWhpHMsWlVmer+LA926XiA=
244-
go.opentelemetry.io/otel/metric v1.33.0 h1:r+JOocAyeRVXD8lZpjdQjzMadVZp2M4WmQ+5WtEnklQ=
245-
go.opentelemetry.io/otel/metric v1.33.0/go.mod h1:L9+Fyctbp6HFTddIxClbQkjtubW6O9QS3Ann/M82u6M=
246-
go.opentelemetry.io/otel/sdk v1.33.0 h1:iax7M131HuAm9QkZotNHEfstof92xM+N8sr3uHXc2IM=
247-
go.opentelemetry.io/otel/sdk v1.33.0/go.mod h1:A1Q5oi7/9XaMlIWzPSxLRWOI8nG3FnzHJNbiENQuihM=
248-
go.opentelemetry.io/otel/trace v1.33.0 h1:cCJuF7LRjUFso9LPnEAHJDB2pqzp+hbO8eu1qqW2d/s=
249-
go.opentelemetry.io/otel/trace v1.33.0/go.mod h1:uIcdVUZMpTAmz0tI1z04GoVSezK37CbGV4fr1f2nBck=
244+
go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=
245+
go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE=
246+
go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=
247+
go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU=
248+
go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk=
249+
go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w=
250+
go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=
251+
go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
250252
go.opentelemetry.io/proto/otlp v1.4.0 h1:TA9WRvW6zMwP+Ssb6fLoUIuirti1gGbP28GcKG1jgeg=
251253
go.opentelemetry.io/proto/otlp v1.4.0/go.mod h1:PPBWZIP98o2ElSqI35IHfu7hIhSwvc5N38Jw8pXuGFY=
252254
go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
@@ -323,12 +325,12 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
323325
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
324326
gomodules.xyz/jsonpatch/v2 v2.5.0 h1:JELs8RLM12qJGXU4u/TO3V25KW8GreMKl9pdkk14RM0=
325327
gomodules.xyz/jsonpatch/v2 v2.5.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
326-
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 h1:CkkIfIt50+lT6NHAVoRYEyAvQGFM7xEwXUUywFvEb3Q=
327-
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576/go.mod h1:1R3kvZ1dtP3+4p4d3G8uJ8rFk/fWlScl38vanWACI08=
328-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 h1:TqExAhdPaB60Ux47Cn0oLV07rGnxZzIsaRhQaqS666A=
329-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8/go.mod h1:lcTa1sDdWEIHMWlITnIczmw5w60CF9ffkb8Z+DVmmjA=
330-
google.golang.org/grpc v1.68.2 h1:EWN8x60kqfCcBXzbfPpEezgdYRZA9JCxtySmCtTUs2E=
331-
google.golang.org/grpc v1.68.2/go.mod h1:AOXp0/Lj+nW5pJEgw8KQ6L1Ka+NTyJOABlSgfCrCN5A=
328+
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 h1:GVIKPyP/kLIyVOgOnTwFOrvQaQUzOzGMCxgFUOEmm24=
329+
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422/go.mod h1:b6h1vNKhxaSoEI+5jc3PJUCustfli/mRab7295pY7rw=
330+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI=
331+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50=
332+
google.golang.org/grpc v1.71.1 h1:ffsFWr7ygTUscGPI0KKK6TLrGz0476KUvvsbqWK0rPI=
333+
google.golang.org/grpc v1.71.1/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
332334
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
333335
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
334336
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -381,8 +383,8 @@ k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6J
381383
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
382384
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
383385
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
384-
sigs.k8s.io/cluster-api v1.11.0-beta.1 h1:VCWlF5VHzVPPDEbzVRhB4hdBq6B9t5U8xgv5f1ltz+s=
385-
sigs.k8s.io/cluster-api v1.11.0-beta.1/go.mod h1:M02o/JTUKq52NKyLsjz2HHGa6BtUbXzyu+pzOk9SfeI=
386+
sigs.k8s.io/cluster-api v1.11.0-beta.2 h1:uR9kci1V92xJK3Qaw49liK7zLOvZ5JEqrbeyWReVUyM=
387+
sigs.k8s.io/cluster-api v1.11.0-beta.2/go.mod h1:SSXGtB+mpuAjAydZH3psEKKQQfKV68llQb3Ph2MYPw4=
386388
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
387389
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
388390
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=

‎packaging/flavorgen/flavors/patches.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,6 @@ func createEmptyArraysPatch() clusterv1.ClusterClassPatch {
5151
Raw: []byte("[]"),
5252
},
5353
},
54-
{
55-
Op: "add",
56-
Path: "/spec/template/spec/kubeadmConfigSpec/postKubeadmCommands",
57-
Value: &apiextensionsv1.JSON{
58-
Raw: []byte("[]"),
59-
},
60-
},
6154
},
6255
},
6356
{
@@ -78,13 +71,6 @@ func createEmptyArraysPatch() clusterv1.ClusterClassPatch {
7871
Raw: []byte("[]"),
7972
},
8073
},
81-
{
82-
Op: "add",
83-
Path: "/spec/template/spec/postKubeadmCommands",
84-
Value: &apiextensionsv1.JSON{
85-
Raw: []byte("[]"),
86-
},
87-
},
8874
},
8975
},
9076
},

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

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.0-beta.1
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.0-beta.2
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
@@ -241,8 +241,8 @@ k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a h1:ZV3Zr+/7s7aVbjNGICQt+p
241241
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
242242
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
243243
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
244-
sigs.k8s.io/cluster-api v1.11.0-beta.1 h1:VCWlF5VHzVPPDEbzVRhB4hdBq6B9t5U8xgv5f1ltz+s=
245-
sigs.k8s.io/cluster-api v1.11.0-beta.1/go.mod h1:M02o/JTUKq52NKyLsjz2HHGa6BtUbXzyu+pzOk9SfeI=
244+
sigs.k8s.io/cluster-api v1.11.0-beta.2 h1:uR9kci1V92xJK3Qaw49liK7zLOvZ5JEqrbeyWReVUyM=
245+
sigs.k8s.io/cluster-api v1.11.0-beta.2/go.mod h1:SSXGtB+mpuAjAydZH3psEKKQQfKV68llQb3Ph2MYPw4=
246246
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
247247
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
248248
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=

‎templates/clusterclass-template-supervisor.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ spec:
3333
- op: add
3434
path: /spec/template/spec/kubeadmConfigSpec/files
3535
value: []
36-
- op: add
37-
path: /spec/template/spec/kubeadmConfigSpec/postKubeadmCommands
38-
value: []
3936
selector:
4037
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
4138
kind: KubeadmControlPlaneTemplate
@@ -45,9 +42,6 @@ spec:
4542
- op: add
4643
path: /spec/template/spec/files
4744
value: []
48-
- op: add
49-
path: /spec/template/spec/postKubeadmCommands
50-
value: []
5145
selector:
5246
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
5347
kind: KubeadmConfigTemplate

‎templates/clusterclass-template.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ spec:
3333
- op: add
3434
path: /spec/template/spec/kubeadmConfigSpec/files
3535
value: []
36-
- op: add
37-
path: /spec/template/spec/kubeadmConfigSpec/postKubeadmCommands
38-
value: []
3936
selector:
4037
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
4138
kind: KubeadmControlPlaneTemplate
@@ -45,9 +42,6 @@ spec:
4542
- op: add
4643
path: /spec/template/spec/files
4744
value: []
48-
- op: add
49-
path: /spec/template/spec/postKubeadmCommands
50-
value: []
5145
selector:
5246
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
5347
kind: KubeadmConfigTemplate

‎test/e2e/config/vsphere.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ providers:
2727
type: CoreProvider
2828
versions:
2929
- name: "v1.11.99"
30-
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.11.0-beta.1/core-components.yaml"
30+
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.11.0-beta.2/core-components.yaml"
3131
type: "url"
3232
contract: v1beta2
3333
files:
@@ -67,7 +67,7 @@ providers:
6767
type: BootstrapProvider
6868
versions:
6969
- name: "v1.11.99"
70-
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.11.0-beta.1/bootstrap-components.yaml"
70+
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.11.0-beta.2/bootstrap-components.yaml"
7171
type: "url"
7272
contract: v1beta2
7373
files:
@@ -107,7 +107,7 @@ providers:
107107
type: ControlPlaneProvider
108108
versions:
109109
- name: "v1.11.99"
110-
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.11.0-beta.1/control-plane-components.yaml"
110+
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.11.0-beta.2/control-plane-components.yaml"
111111
type: "url"
112112
contract: v1beta2
113113
files:
@@ -314,7 +314,7 @@ variables:
314314
VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.33.0"
315315
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-4152.2.2-kube-v1.33.0"
316316
KUBETEST_CONFIGURATION: "./data/kubetest/conformance.yaml"
317-
NODE_DRAIN_TIMEOUT: "60s"
317+
NODE_DRAIN_TIMEOUT_SECONDS: "60"
318318
EXP_CLUSTER_RESOURCE_SET: "true"
319319
EXP_KUBEADM_BOOTSTRAP_FORMAT_IGNITION: "true"
320320
CLUSTER_TOPOLOGY: "true"

‎test/e2e/data/infrastructure-vsphere-govmomi/main/clusterclass/patch-namingstrategy.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
- op: add
2-
path: /spec/controlPlane/namingStrategy
2+
path: /spec/controlPlane/naming
33
value:
44
template: '{{ .cluster.name }}-cp-{{ .random }}'
55
- op: add
6-
path: /spec/workers/machineDeployments/0/namingStrategy
6+
path: /spec/workers/machineDeployments/0/naming
77
value:
88
template: '{{ .cluster.name }}-md-{{ .machineDeployment.topologyName }}-{{ .random }}'

0 commit comments

Comments
 (0)