Skip to content

🌱 Bump CAPI to v1.11.0-alpha.0 #3478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 28, 2025
+87 −50
Merged

🌱 Bump CAPI to v1.11.0-alpha.0 #3478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ IMPORT_BOSS_VER := v0.28.1
IMPORT_BOSS := $(abspath $(TOOLS_BIN_DIR)/$(IMPORT_BOSS_BIN))
IMPORT_BOSS_PKG := k8s.io/code-generator/cmd/import-boss

CAPI_HACK_TOOLS_VER := 071d769879ff13ae358c82a6d267da97e13f05f6 # Note: this the commit ID of CAPI on main at 19th May 2025
CAPI_HACK_TOOLS_VER := 5eee55a4d0ddf653535c1a9235001735861ba4c2 # Note: this the commit ID for CAPI v1.11.0-alpha.0

BOSKOSCTL_BIN := boskosctl
BOSKOSCTL := $(abspath $(TOOLS_BIN_DIR)/$(BOSKOSCTL_BIN))
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-vsphere

go 1.24.0

replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.0-beta.0.0.20250527052821-4642e1497262
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.0-alpha.0

replace github.com/vmware-tanzu/vm-operator/pkg/constants/testlabels => github.com/vmware-tanzu/vm-operator/pkg/constants/testlabels v0.0.0-20240404200847-de75746a9505

Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,8 +376,8 @@ k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6J
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
sigs.k8s.io/cluster-api v1.10.0-beta.0.0.20250527052821-4642e1497262 h1:GcAHcaAycWzdtTRwW/rcQwcABVoCxyh+lJ6l2paqMoU=
sigs.k8s.io/cluster-api v1.10.0-beta.0.0.20250527052821-4642e1497262/go.mod h1:UmipfrOBTqjRNX7X4zuJCInq28/Fh6xq9RklOJ/DMR4=
sigs.k8s.io/cluster-api v1.11.0-alpha.0 h1:QyU9uGq2fAee+LC+/q3Q5QxCLnAUzMFYzIiIAM/sCfU=
sigs.k8s.io/cluster-api v1.11.0-alpha.0/go.mod h1:UmipfrOBTqjRNX7X4zuJCInq28/Fh6xq9RklOJ/DMR4=
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
Expand Down
21 changes: 15 additions & 6 deletions packaging/flavorgen/flavors/generators.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,8 +453,11 @@ func defaultKubeadmInitSpec(files []bootstrapv1.File) bootstrapv1.KubeadmConfigS
},
ClusterConfiguration: &bootstrapv1.ClusterConfiguration{
ControllerManager: bootstrapv1.ControlPlaneComponent{
ExtraArgs: map[string]string{
"cloud-provider": "external",
ExtraArgs: []bootstrapv1.Arg{
{
Name: "cloud-provider",
Value: "external",
},
},
},
},
Expand Down Expand Up @@ -483,8 +486,11 @@ func ignitionKubeadmInitSpec(files []bootstrapv1.File) bootstrapv1.KubeadmConfig
},
ClusterConfiguration: &bootstrapv1.ClusterConfiguration{
ControllerManager: bootstrapv1.ControlPlaneComponent{
ExtraArgs: map[string]string{
"cloud-provider": "external",
ExtraArgs: []bootstrapv1.Arg{
{
Name: "cloud-provider",
Value: "external",
},
},
},
},
Expand Down Expand Up @@ -558,8 +564,11 @@ func defaultNodeRegistrationOptions() bootstrapv1.NodeRegistrationOptions {
return bootstrapv1.NodeRegistrationOptions{
Name: "{{ local_hostname }}",
CRISocket: "/var/run/containerd/containerd.sock",
KubeletExtraArgs: map[string]string{
"cloud-provider": "external",
KubeletExtraArgs: []bootstrapv1.Arg{
{
Name: "cloud-provider",
Value: "external",
},
},
}
}
Expand Down
2 changes: 1 addition & 1 deletion packaging/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-vsphere/packaging

go 1.24.0

replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.0-beta.0.0.20250527052821-4642e1497262
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.0-alpha.0

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

Expand Down
4 changes: 2 additions & 2 deletions packaging/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,8 @@ k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUy
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
sigs.k8s.io/cluster-api v1.10.0-beta.0.0.20250527052821-4642e1497262 h1:GcAHcaAycWzdtTRwW/rcQwcABVoCxyh+lJ6l2paqMoU=
sigs.k8s.io/cluster-api v1.10.0-beta.0.0.20250527052821-4642e1497262/go.mod h1:UmipfrOBTqjRNX7X4zuJCInq28/Fh6xq9RklOJ/DMR4=
sigs.k8s.io/cluster-api v1.11.0-alpha.0 h1:QyU9uGq2fAee+LC+/q3Q5QxCLnAUzMFYzIiIAM/sCfU=
sigs.k8s.io/cluster-api v1.11.0-alpha.0/go.mod h1:UmipfrOBTqjRNX7X4zuJCInq28/Fh6xq9RklOJ/DMR4=
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
Expand Down
12 changes: 8 additions & 4 deletions templates/cluster-template-external-loadbalancer.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,21 @@ spec:
clusterConfiguration:
controllerManager:
extraArgs:
cloud-provider: external
- name: cloud-provider
value: external
initConfiguration:
nodeRegistration:
criSocket: /var/run/containerd/containerd.sock
kubeletExtraArgs:
cloud-provider: external
- name: cloud-provider
value: external
name: '{{ local_hostname }}'
joinConfiguration:
nodeRegistration:
criSocket: /var/run/containerd/containerd.sock
kubeletExtraArgs:
cloud-provider: external
- name: cloud-provider
value: external
name: '{{ local_hostname }}'
preKubeadmCommands:
- hostnamectl set-hostname "{{ ds.meta_data.hostname }}"
Expand Down Expand Up @@ -143,7 +146,8 @@ spec:
nodeRegistration:
criSocket: /var/run/containerd/containerd.sock
kubeletExtraArgs:
cloud-provider: external
- name: cloud-provider
value: external
name: '{{ local_hostname }}'
preKubeadmCommands:
- hostnamectl set-hostname "{{ ds.meta_data.hostname }}"
Expand Down
12 changes: 8 additions & 4 deletions templates/cluster-template-ignition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ spec:
clusterConfiguration:
controllerManager:
extraArgs:
cloud-provider: external
- name: cloud-provider
value: external
files:
- content: |
apiVersion: v1
Expand Down Expand Up @@ -264,13 +265,15 @@ spec:
nodeRegistration:
criSocket: /var/run/containerd/containerd.sock
kubeletExtraArgs:
cloud-provider: external
- name: cloud-provider
value: external
name: $${COREOS_CUSTOM_HOSTNAME}
joinConfiguration:
nodeRegistration:
criSocket: /var/run/containerd/containerd.sock
kubeletExtraArgs:
cloud-provider: external
- name: cloud-provider
value: external
name: $${COREOS_CUSTOM_HOSTNAME}
preKubeadmCommands:
- envsubst < /etc/kubeadm.yml > /etc/kubeadm.yml.tmp
Expand Down Expand Up @@ -367,7 +370,8 @@ spec:
nodeRegistration:
criSocket: /var/run/containerd/containerd.sock
kubeletExtraArgs:
cloud-provider: external
- name: cloud-provider
value: external
name: $${COREOS_CUSTOM_HOSTNAME}
preKubeadmCommands:
- envsubst < /etc/kubeadm.yml > /etc/kubeadm.yml.tmp
Expand Down
12 changes: 8 additions & 4 deletions templates/cluster-template-node-ipam.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ spec:
clusterConfiguration:
controllerManager:
extraArgs:
cloud-provider: external
- name: cloud-provider
value: external
files:
- content: |
apiVersion: v1
Expand Down Expand Up @@ -236,13 +237,15 @@ spec:
nodeRegistration:
criSocket: /var/run/containerd/containerd.sock
kubeletExtraArgs:
cloud-provider: external
- name: cloud-provider
value: external
name: '{{ local_hostname }}'
joinConfiguration:
nodeRegistration:
criSocket: /var/run/containerd/containerd.sock
kubeletExtraArgs:
cloud-provider: external
- name: cloud-provider
value: external
name: '{{ local_hostname }}'
preKubeadmCommands:
- hostnamectl set-hostname "{{ ds.meta_data.hostname }}"
Expand Down Expand Up @@ -278,7 +281,8 @@ spec:
nodeRegistration:
criSocket: /var/run/containerd/containerd.sock
kubeletExtraArgs:
cloud-provider: external
- name: cloud-provider
value: external
name: '{{ local_hostname }}'
preKubeadmCommands:
- hostnamectl set-hostname "{{ ds.meta_data.hostname }}"
Expand Down
12 changes: 8 additions & 4 deletions templates/cluster-template-supervisor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ spec:
clusterConfiguration:
controllerManager:
extraArgs:
cloud-provider: external
- name: cloud-provider
value: external
files:
- content: |
apiVersion: v1
Expand Down Expand Up @@ -195,13 +196,15 @@ spec:
nodeRegistration:
criSocket: /var/run/containerd/containerd.sock
kubeletExtraArgs:
cloud-provider: external
- name: cloud-provider
value: external
name: '{{ local_hostname }}'
joinConfiguration:
nodeRegistration:
criSocket: /var/run/containerd/containerd.sock
kubeletExtraArgs:
cloud-provider: external
- name: cloud-provider
value: external
name: '{{ local_hostname }}'
preKubeadmCommands:
- dhclient eth0
Expand Down Expand Up @@ -238,7 +241,8 @@ spec:
nodeRegistration:
criSocket: /var/run/containerd/containerd.sock
kubeletExtraArgs:
cloud-provider: external
- name: cloud-provider
value: external
name: '{{ local_hostname }}'
preKubeadmCommands:
- dhclient eth0
Expand Down
12 changes: 8 additions & 4 deletions templates/cluster-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ spec:
clusterConfiguration:
controllerManager:
extraArgs:
cloud-provider: external
- name: cloud-provider
value: external
files:
- content: |
apiVersion: v1
Expand Down Expand Up @@ -226,13 +227,15 @@ spec:
nodeRegistration:
criSocket: /var/run/containerd/containerd.sock
kubeletExtraArgs:
cloud-provider: external
- name: cloud-provider
value: external
name: '{{ local_hostname }}'
joinConfiguration:
nodeRegistration:
criSocket: /var/run/containerd/containerd.sock
kubeletExtraArgs:
cloud-provider: external
- name: cloud-provider
value: external
name: '{{ local_hostname }}'
preKubeadmCommands:
- hostnamectl set-hostname "{{ ds.meta_data.hostname }}"
Expand Down Expand Up @@ -268,7 +271,8 @@ spec:
nodeRegistration:
criSocket: /var/run/containerd/containerd.sock
kubeletExtraArgs:
cloud-provider: external
- name: cloud-provider
value: external
name: '{{ local_hostname }}'
preKubeadmCommands:
- hostnamectl set-hostname "{{ ds.meta_data.hostname }}"
Expand Down
12 changes: 8 additions & 4 deletions templates/clusterclass-template-supervisor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,18 +266,21 @@ spec:
clusterConfiguration:
controllerManager:
extraArgs:
cloud-provider: external
- name: cloud-provider
value: external
initConfiguration:
nodeRegistration:
criSocket: /var/run/containerd/containerd.sock
kubeletExtraArgs:
cloud-provider: external
- name: cloud-provider
value: external
name: '{{ local_hostname }}'
joinConfiguration:
nodeRegistration:
criSocket: /var/run/containerd/containerd.sock
kubeletExtraArgs:
cloud-provider: external
- name: cloud-provider
value: external
name: '{{ local_hostname }}'
preKubeadmCommands:
- dhclient eth0
Expand Down Expand Up @@ -307,7 +310,8 @@ spec:
nodeRegistration:
criSocket: /var/run/containerd/containerd.sock
kubeletExtraArgs:
cloud-provider: external
- name: cloud-provider
value: external
name: '{{ local_hostname }}'
preKubeadmCommands:
- dhclient eth0
Expand Down
12 changes: 8 additions & 4 deletions templates/clusterclass-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,18 +324,21 @@ spec:
clusterConfiguration:
controllerManager:
extraArgs:
cloud-provider: external
- name: cloud-provider
value: external
initConfiguration:
nodeRegistration:
criSocket: /var/run/containerd/containerd.sock
kubeletExtraArgs:
cloud-provider: external
- name: cloud-provider
value: external
name: '{{ local_hostname }}'
joinConfiguration:
nodeRegistration:
criSocket: /var/run/containerd/containerd.sock
kubeletExtraArgs:
cloud-provider: external
- name: cloud-provider
value: external
name: '{{ local_hostname }}'
preKubeadmCommands:
- hostnamectl set-hostname "{{ ds.meta_data.hostname }}"
Expand Down Expand Up @@ -364,7 +367,8 @@ spec:
nodeRegistration:
criSocket: /var/run/containerd/containerd.sock
kubeletExtraArgs:
cloud-provider: external
- name: cloud-provider
value: external
name: '{{ local_hostname }}'
preKubeadmCommands:
- hostnamectl set-hostname "{{ ds.meta_data.hostname }}"
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/config/vsphere.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ providers:
type: CoreProvider
versions:
- name: "v1.11.99"
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20250527/core-components.yaml"
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20250528/core-components.yaml"
type: "url"
contract: v1beta2
files:
Expand Down Expand Up @@ -67,7 +67,7 @@ providers:
type: BootstrapProvider
versions:
- name: "v1.11.99"
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20250527/bootstrap-components.yaml"
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20250528/bootstrap-components.yaml"
type: "url"
contract: v1beta2
files:
Expand Down Expand Up @@ -107,7 +107,7 @@ providers:
type: ControlPlaneProvider
versions:
- name: "v1.11.99"
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20250527/control-plane-components.yaml"
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20250528/control-plane-components.yaml"
type: "url"
contract: v1beta2
files:
Expand Down
4 changes: 2 additions & 2 deletions test/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ module sigs.k8s.io/cluster-api-provider-vsphere/test

go 1.24.0

replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.0-beta.0.0.20250527052821-4642e1497262
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.0-alpha.0

replace sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.10.0-beta.0.0.20250527052821-4642e1497262
replace sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.11.0-alpha.0

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

Expand Down
Loading
Loading