Skip to content

Commit 2a8950d

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #3478 from chrischdi/pr-bump-capi-alpha-1-11
🌱 Bump CAPI to v1.11.0-alpha.0
2 parents 8c8a48d + 6eb7c4f commit 2a8950d

16 files changed

+87
-50
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 := 071d769879ff13ae358c82a6d267da97e13f05f6 # Note: this the commit ID of CAPI on main at 19th May 2025
193+
CAPI_HACK_TOOLS_VER := 5eee55a4d0ddf653535c1a9235001735861ba4c2 # Note: this the commit ID for CAPI v1.11.0-alpha.0
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.24.0
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.0-beta.0.0.20250527052821-4642e1497262
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.0-alpha.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
@@ -376,8 +376,8 @@ k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6J
376376
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
377377
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
378378
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
379-
sigs.k8s.io/cluster-api v1.10.0-beta.0.0.20250527052821-4642e1497262 h1:GcAHcaAycWzdtTRwW/rcQwcABVoCxyh+lJ6l2paqMoU=
380-
sigs.k8s.io/cluster-api v1.10.0-beta.0.0.20250527052821-4642e1497262/go.mod h1:UmipfrOBTqjRNX7X4zuJCInq28/Fh6xq9RklOJ/DMR4=
379+
sigs.k8s.io/cluster-api v1.11.0-alpha.0 h1:QyU9uGq2fAee+LC+/q3Q5QxCLnAUzMFYzIiIAM/sCfU=
380+
sigs.k8s.io/cluster-api v1.11.0-alpha.0/go.mod h1:UmipfrOBTqjRNX7X4zuJCInq28/Fh6xq9RklOJ/DMR4=
381381
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
382382
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
383383
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=

‎packaging/flavorgen/flavors/generators.go‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -453,8 +453,11 @@ func defaultKubeadmInitSpec(files []bootstrapv1.File) bootstrapv1.KubeadmConfigS
453453
},
454454
ClusterConfiguration: &bootstrapv1.ClusterConfiguration{
455455
ControllerManager: bootstrapv1.ControlPlaneComponent{
456-
ExtraArgs: map[string]string{
457-
"cloud-provider": "external",
456+
ExtraArgs: []bootstrapv1.Arg{
457+
{
458+
Name: "cloud-provider",
459+
Value: "external",
460+
},
458461
},
459462
},
460463
},
@@ -483,8 +486,11 @@ func ignitionKubeadmInitSpec(files []bootstrapv1.File) bootstrapv1.KubeadmConfig
483486
},
484487
ClusterConfiguration: &bootstrapv1.ClusterConfiguration{
485488
ControllerManager: bootstrapv1.ControlPlaneComponent{
486-
ExtraArgs: map[string]string{
487-
"cloud-provider": "external",
489+
ExtraArgs: []bootstrapv1.Arg{
490+
{
491+
Name: "cloud-provider",
492+
Value: "external",
493+
},
488494
},
489495
},
490496
},
@@ -558,8 +564,11 @@ func defaultNodeRegistrationOptions() bootstrapv1.NodeRegistrationOptions {
558564
return bootstrapv1.NodeRegistrationOptions{
559565
Name: "{{ local_hostname }}",
560566
CRISocket: "/var/run/containerd/containerd.sock",
561-
KubeletExtraArgs: map[string]string{
562-
"cloud-provider": "external",
567+
KubeletExtraArgs: []bootstrapv1.Arg{
568+
{
569+
Name: "cloud-provider",
570+
Value: "external",
571+
},
563572
},
564573
}
565574
}

‎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.10.0-beta.0.0.20250527052821-4642e1497262
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.0-alpha.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
@@ -235,8 +235,8 @@ k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUy
235235
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
236236
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
237237
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
238-
sigs.k8s.io/cluster-api v1.10.0-beta.0.0.20250527052821-4642e1497262 h1:GcAHcaAycWzdtTRwW/rcQwcABVoCxyh+lJ6l2paqMoU=
239-
sigs.k8s.io/cluster-api v1.10.0-beta.0.0.20250527052821-4642e1497262/go.mod h1:UmipfrOBTqjRNX7X4zuJCInq28/Fh6xq9RklOJ/DMR4=
238+
sigs.k8s.io/cluster-api v1.11.0-alpha.0 h1:QyU9uGq2fAee+LC+/q3Q5QxCLnAUzMFYzIiIAM/sCfU=
239+
sigs.k8s.io/cluster-api v1.11.0-alpha.0/go.mod h1:UmipfrOBTqjRNX7X4zuJCInq28/Fh6xq9RklOJ/DMR4=
240240
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
241241
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
242242
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=

‎templates/cluster-template-external-loadbalancer.yaml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,18 +96,21 @@ spec:
9696
clusterConfiguration:
9797
controllerManager:
9898
extraArgs:
99-
cloud-provider: external
99+
- name: cloud-provider
100+
value: external
100101
initConfiguration:
101102
nodeRegistration:
102103
criSocket: /var/run/containerd/containerd.sock
103104
kubeletExtraArgs:
104-
cloud-provider: external
105+
- name: cloud-provider
106+
value: external
105107
name: '{{ local_hostname }}'
106108
joinConfiguration:
107109
nodeRegistration:
108110
criSocket: /var/run/containerd/containerd.sock
109111
kubeletExtraArgs:
110-
cloud-provider: external
112+
- name: cloud-provider
113+
value: external
111114
name: '{{ local_hostname }}'
112115
preKubeadmCommands:
113116
- hostnamectl set-hostname "{{ ds.meta_data.hostname }}"
@@ -143,7 +146,8 @@ spec:
143146
nodeRegistration:
144147
criSocket: /var/run/containerd/containerd.sock
145148
kubeletExtraArgs:
146-
cloud-provider: external
149+
- name: cloud-provider
150+
value: external
147151
name: '{{ local_hostname }}'
148152
preKubeadmCommands:
149153
- hostnamectl set-hostname "{{ ds.meta_data.hostname }}"

‎templates/cluster-template-ignition.yaml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ spec:
7070
clusterConfiguration:
7171
controllerManager:
7272
extraArgs:
73-
cloud-provider: external
73+
- name: cloud-provider
74+
value: external
7475
files:
7576
- content: |
7677
apiVersion: v1
@@ -264,13 +265,15 @@ spec:
264265
nodeRegistration:
265266
criSocket: /var/run/containerd/containerd.sock
266267
kubeletExtraArgs:
267-
cloud-provider: external
268+
- name: cloud-provider
269+
value: external
268270
name: $${COREOS_CUSTOM_HOSTNAME}
269271
joinConfiguration:
270272
nodeRegistration:
271273
criSocket: /var/run/containerd/containerd.sock
272274
kubeletExtraArgs:
273-
cloud-provider: external
275+
- name: cloud-provider
276+
value: external
274277
name: $${COREOS_CUSTOM_HOSTNAME}
275278
preKubeadmCommands:
276279
- envsubst < /etc/kubeadm.yml > /etc/kubeadm.yml.tmp
@@ -367,7 +370,8 @@ spec:
367370
nodeRegistration:
368371
criSocket: /var/run/containerd/containerd.sock
369372
kubeletExtraArgs:
370-
cloud-provider: external
373+
- name: cloud-provider
374+
value: external
371375
name: $${COREOS_CUSTOM_HOSTNAME}
372376
preKubeadmCommands:
373377
- envsubst < /etc/kubeadm.yml > /etc/kubeadm.yml.tmp

‎templates/cluster-template-node-ipam.yaml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ spec:
106106
clusterConfiguration:
107107
controllerManager:
108108
extraArgs:
109-
cloud-provider: external
109+
- name: cloud-provider
110+
value: external
110111
files:
111112
- content: |
112113
apiVersion: v1
@@ -236,13 +237,15 @@ spec:
236237
nodeRegistration:
237238
criSocket: /var/run/containerd/containerd.sock
238239
kubeletExtraArgs:
239-
cloud-provider: external
240+
- name: cloud-provider
241+
value: external
240242
name: '{{ local_hostname }}'
241243
joinConfiguration:
242244
nodeRegistration:
243245
criSocket: /var/run/containerd/containerd.sock
244246
kubeletExtraArgs:
245-
cloud-provider: external
247+
- name: cloud-provider
248+
value: external
246249
name: '{{ local_hostname }}'
247250
preKubeadmCommands:
248251
- hostnamectl set-hostname "{{ ds.meta_data.hostname }}"
@@ -278,7 +281,8 @@ spec:
278281
nodeRegistration:
279282
criSocket: /var/run/containerd/containerd.sock
280283
kubeletExtraArgs:
281-
cloud-provider: external
284+
- name: cloud-provider
285+
value: external
282286
name: '{{ local_hostname }}'
283287
preKubeadmCommands:
284288
- hostnamectl set-hostname "{{ ds.meta_data.hostname }}"

‎templates/cluster-template-supervisor.yaml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ spec:
6565
clusterConfiguration:
6666
controllerManager:
6767
extraArgs:
68-
cloud-provider: external
68+
- name: cloud-provider
69+
value: external
6970
files:
7071
- content: |
7172
apiVersion: v1
@@ -195,13 +196,15 @@ spec:
195196
nodeRegistration:
196197
criSocket: /var/run/containerd/containerd.sock
197198
kubeletExtraArgs:
198-
cloud-provider: external
199+
- name: cloud-provider
200+
value: external
199201
name: '{{ local_hostname }}'
200202
joinConfiguration:
201203
nodeRegistration:
202204
criSocket: /var/run/containerd/containerd.sock
203205
kubeletExtraArgs:
204-
cloud-provider: external
206+
- name: cloud-provider
207+
value: external
205208
name: '{{ local_hostname }}'
206209
preKubeadmCommands:
207210
- dhclient eth0
@@ -238,7 +241,8 @@ spec:
238241
nodeRegistration:
239242
criSocket: /var/run/containerd/containerd.sock
240243
kubeletExtraArgs:
241-
cloud-provider: external
244+
- name: cloud-provider
245+
value: external
242246
name: '{{ local_hostname }}'
243247
preKubeadmCommands:
244248
- dhclient eth0

0 commit comments

Comments
 (0)