Skip to content

Commit 65a35e8

Browse files
authored
Merge pull request #3982 from sbueringer/pr-bump-capi-in-capv-20260505
🌱 Bump CAPV to CAPI main (2026.05.05)
2 parents b673b46 + 1016bb6 commit 65a35e8

12 files changed

Lines changed: 67 additions & 55 deletions

File tree

Makefile

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

206-
CAPI_HACK_TOOLS_VER := 16d0a6538ef0d519cfe42603d895448fb8a7602e # Note: this the commit ID of CAPI v1.13.1
206+
CAPI_HACK_TOOLS_VER := 3466e650b30305d4979f314ca7d769a32c5bcefe # Note: this the commit ID of CAPI main 05.05.2026.
207207

208208
BOSKOSCTL_BIN := boskosctl
209209
BOSKOSCTL := $(abspath $(TOOLS_BIN_DIR)/$(BOSKOSCTL_BIN))

go.mod

Lines changed: 2 additions & 2 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.25.0
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.13.1
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.13.0-rc.0.0.20260504113540-3466e650b303
66

77
require (
88
github.com/vmware-tanzu/net-operator-api v0.0.0-20250826165015-90a4bb21727b
@@ -72,7 +72,7 @@ require (
7272
go.opentelemetry.io/otel/trace v1.43.0 // indirect
7373
go.opentelemetry.io/proto/otlp v1.10.0 // indirect
7474
go.uber.org/multierr v1.11.0 // indirect
75-
go.uber.org/zap v1.27.1 // indirect
75+
go.uber.org/zap v1.28.0 // indirect
7676
go.yaml.in/yaml/v2 v2.4.3 // indirect
7777
go.yaml.in/yaml/v3 v3.0.4 // indirect
7878
golang.org/x/net v0.53.0 // indirect

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF
2626
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
2727
github.com/coredns/caddy v1.1.1 h1:2eYKZT7i6yxIfGP3qLJoJ7HAsDJqYB+X68g4NYjSrE0=
2828
github.com/coredns/caddy v1.1.1/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
29-
github.com/coredns/corefile-migration v1.0.31 h1:f7WGhY8M2Jn8P2dVO0p7wSQ1QKsMARl6WEyUjCb/V38=
30-
github.com/coredns/corefile-migration v1.0.31/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY=
29+
github.com/coredns/corefile-migration v1.0.32 h1:tlbtXBpt7UzmedEoMqnfqOTnGCvzYfJ/Rrfqf+/W+TY=
30+
github.com/coredns/corefile-migration v1.0.32/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY=
3131
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
3232
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
3333
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -223,8 +223,8 @@ go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
223223
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
224224
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
225225
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
226-
go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc=
227-
go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
226+
go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo=
227+
go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q=
228228
go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
229229
go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
230230
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
@@ -301,8 +301,8 @@ k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzk
301301
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
302302
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
303303
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
304-
sigs.k8s.io/cluster-api v1.13.1 h1:5qksGznSU1fJOXIxsI4EayTqG1Q9S0qJNp3HdsVm1KU=
305-
sigs.k8s.io/cluster-api v1.13.1/go.mod h1:Hqq5yucu3OwPiAjNEh/O/zZX4dF63MD8Q6I0cwL/bUU=
304+
sigs.k8s.io/cluster-api v1.13.0-rc.0.0.20260504113540-3466e650b303 h1:lUOnkSL/H/v10g5MH/dBq6DgAreUFZbYwyIuGQLaHAQ=
305+
sigs.k8s.io/cluster-api v1.13.0-rc.0.0.20260504113540-3466e650b303/go.mod h1:AdKITY06fxi1yU5o00UZY3mACFhA0wwzz+zctlSYpcM=
306306
sigs.k8s.io/controller-runtime v0.23.3 h1:VjB/vhoPoA9l1kEKZHBMnQF33tdCLQKJtydy4iqwZ80=
307307
sigs.k8s.io/controller-runtime v0.23.3/go.mod h1:B6COOxKptp+YaUT5q4l6LqUJTRpizbgf9KSRNdQGns0=
308308
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=

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.25.0
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.13.1
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.13.0-rc.0.0.20260504113540-3466e650b303
66

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

packaging/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
149149
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
150150
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
151151
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
152-
go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc=
153-
go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
152+
go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo=
153+
go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q=
154154
go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
155155
go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
156156
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
@@ -207,8 +207,8 @@ k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 h1:Y3gxNAuB0OBLImH611+UDZ
207207
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ=
208208
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzkbzn+gDM4X9T4Ck=
209209
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
210-
sigs.k8s.io/cluster-api v1.13.1 h1:5qksGznSU1fJOXIxsI4EayTqG1Q9S0qJNp3HdsVm1KU=
211-
sigs.k8s.io/cluster-api v1.13.1/go.mod h1:Hqq5yucu3OwPiAjNEh/O/zZX4dF63MD8Q6I0cwL/bUU=
210+
sigs.k8s.io/cluster-api v1.13.0-rc.0.0.20260504113540-3466e650b303 h1:lUOnkSL/H/v10g5MH/dBq6DgAreUFZbYwyIuGQLaHAQ=
211+
sigs.k8s.io/cluster-api v1.13.0-rc.0.0.20260504113540-3466e650b303/go.mod h1:AdKITY06fxi1yU5o00UZY3mACFhA0wwzz+zctlSYpcM=
212212
sigs.k8s.io/controller-runtime v0.23.3 h1:VjB/vhoPoA9l1kEKZHBMnQF33tdCLQKJtydy4iqwZ80=
213213
sigs.k8s.io/controller-runtime v0.23.3/go.mod h1:B6COOxKptp+YaUT5q4l6LqUJTRpizbgf9KSRNdQGns0=
214214
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=

test/e2e/config/vsphere.yaml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,15 @@ providers:
2626
- name: cluster-api
2727
type: CoreProvider
2828
versions:
29+
- name: "v1.14.99"
30+
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20260505/core-components.yaml"
31+
type: "url"
32+
contract: v1beta2
33+
files:
34+
- sourcePath: "../data/shared/capi/v1.14/metadata.yaml"
35+
replacements:
36+
- old: "imagePullPolicy: Always"
37+
new: "imagePullPolicy: IfNotPresent"
2938
- name: "{go://sigs.k8s.io/cluster-api@v1.13}"
3039
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.13}/core-components.yaml"
3140
type: "url"
@@ -53,19 +62,19 @@ providers:
5362
replacements:
5463
- old: "imagePullPolicy: Always"
5564
new: "imagePullPolicy: IfNotPresent"
56-
- name: "{go://sigs.k8s.io/cluster-api@v1.10}"
57-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.10}/core-components.yaml"
65+
66+
- name: kubeadm
67+
type: BootstrapProvider
68+
versions:
69+
- name: "v1.14.99"
70+
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20260505/bootstrap-components.yaml"
5871
type: "url"
59-
contract: v1beta1
72+
contract: v1beta2
6073
files:
61-
- sourcePath: "../data/shared/capi/v1.10/metadata.yaml"
74+
- sourcePath: "../data/shared/capi/v1.14/metadata.yaml"
6275
replacements:
6376
- old: "imagePullPolicy: Always"
6477
new: "imagePullPolicy: IfNotPresent"
65-
66-
- name: kubeadm
67-
type: BootstrapProvider
68-
versions:
6978
- name: "{go://sigs.k8s.io/cluster-api@v1.13}"
7079
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.13}/bootstrap-components.yaml"
7180
type: "url"
@@ -93,19 +102,19 @@ providers:
93102
replacements:
94103
- old: "imagePullPolicy: Always"
95104
new: "imagePullPolicy: IfNotPresent"
96-
- name: "{go://sigs.k8s.io/cluster-api@v1.10}"
97-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.10}/bootstrap-components.yaml"
105+
106+
- name: kubeadm
107+
type: ControlPlaneProvider
108+
versions:
109+
- name: "v1.14.99"
110+
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20260505/control-plane-components.yaml"
98111
type: "url"
99-
contract: v1beta1
112+
contract: v1beta2
100113
files:
101-
- sourcePath: "../data/shared/capi/v1.10/metadata.yaml"
114+
- sourcePath: "../data/shared/capi/v1.14/metadata.yaml"
102115
replacements:
103116
- old: "imagePullPolicy: Always"
104117
new: "imagePullPolicy: IfNotPresent"
105-
106-
- name: kubeadm
107-
type: ControlPlaneProvider
108-
versions:
109118
- name: "{go://sigs.k8s.io/cluster-api@v1.13}"
110119
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.13}/control-plane-components.yaml"
111120
type: "url"
@@ -133,15 +142,6 @@ providers:
133142
replacements:
134143
- old: "imagePullPolicy: Always"
135144
new: "imagePullPolicy: IfNotPresent"
136-
- name: "{go://sigs.k8s.io/cluster-api@v1.10}"
137-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.10}/control-plane-components.yaml"
138-
type: "url"
139-
contract: v1beta1
140-
files:
141-
- sourcePath: "../data/shared/capi/v1.10/metadata.yaml"
142-
replacements:
143-
- old: "imagePullPolicy: Always"
144-
new: "imagePullPolicy: IfNotPresent"
145145

146146
- name: in-cluster
147147
type: IPAMProvider

test/e2e/data/shared/capi/v1.10/metadata.yaml renamed to test/e2e/data/shared/capi/v1.14/metadata.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,18 @@
66
apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
77
kind: Metadata
88
releaseSeries:
9+
- major: 1
10+
minor: 14
11+
contract: v1beta2
12+
- major: 1
13+
minor: 13
14+
contract: v1beta2
15+
- major: 1
16+
minor: 12
17+
contract: v1beta2
18+
- major: 1
19+
minor: 11
20+
contract: v1beta2
921
- major: 1
1022
minor: 10
1123
contract: v1beta1

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.25.0
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.13.1
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.13.0-rc.0.0.20260504113540-3466e650b303
66

7-
replace sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.13.1
7+
replace sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.13.0-rc.0.0.20260504113540-3466e650b303
88

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

@@ -153,7 +153,7 @@ require (
153153
go.opentelemetry.io/otel/trace v1.43.0 // indirect
154154
go.opentelemetry.io/proto/otlp v1.10.0 // indirect
155155
go.uber.org/multierr v1.11.0 // indirect
156-
go.uber.org/zap v1.27.1 // indirect
156+
go.uber.org/zap v1.28.0 // indirect
157157
go.yaml.in/yaml/v2 v2.4.3 // indirect
158158
go.yaml.in/yaml/v3 v3.0.4 // indirect
159159
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect

test/go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151X
4040
github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=
4141
github.com/coredns/caddy v1.1.1 h1:2eYKZT7i6yxIfGP3qLJoJ7HAsDJqYB+X68g4NYjSrE0=
4242
github.com/coredns/caddy v1.1.1/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
43-
github.com/coredns/corefile-migration v1.0.31 h1:f7WGhY8M2Jn8P2dVO0p7wSQ1QKsMARl6WEyUjCb/V38=
44-
github.com/coredns/corefile-migration v1.0.31/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY=
43+
github.com/coredns/corefile-migration v1.0.32 h1:tlbtXBpt7UzmedEoMqnfqOTnGCvzYfJ/Rrfqf+/W+TY=
44+
github.com/coredns/corefile-migration v1.0.32/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY=
4545
github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
4646
github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
4747
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
@@ -353,8 +353,8 @@ go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
353353
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
354354
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
355355
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
356-
go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc=
357-
go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
356+
go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo=
357+
go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q=
358358
go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
359359
go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
360360
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
@@ -459,10 +459,10 @@ pgregory.net/rapid v1.2.0 h1:keKAYRcjm+e1F0oAuU5F5+YPAWcyxNNRK2wud503Gnk=
459459
pgregory.net/rapid v1.2.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=
460460
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
461461
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
462-
sigs.k8s.io/cluster-api v1.13.1 h1:5qksGznSU1fJOXIxsI4EayTqG1Q9S0qJNp3HdsVm1KU=
463-
sigs.k8s.io/cluster-api v1.13.1/go.mod h1:Hqq5yucu3OwPiAjNEh/O/zZX4dF63MD8Q6I0cwL/bUU=
464-
sigs.k8s.io/cluster-api/test v1.13.1 h1:NimY83SFiO24J3GhF2Fw+iUcKzRPUY2Ev0wRPbogl2k=
465-
sigs.k8s.io/cluster-api/test v1.13.1/go.mod h1:3FL7oJBT6ThT63TcbTigSNNXCXK/2CJ5b8ODbaVs3nk=
462+
sigs.k8s.io/cluster-api v1.13.0-rc.0.0.20260504113540-3466e650b303 h1:lUOnkSL/H/v10g5MH/dBq6DgAreUFZbYwyIuGQLaHAQ=
463+
sigs.k8s.io/cluster-api v1.13.0-rc.0.0.20260504113540-3466e650b303/go.mod h1:AdKITY06fxi1yU5o00UZY3mACFhA0wwzz+zctlSYpcM=
464+
sigs.k8s.io/cluster-api/test v1.13.0-rc.0.0.20260504113540-3466e650b303 h1:vJ7dOSlby6X8tFKlAn9Ab0Ev3jvXYrQk+507LkYr1Bo=
465+
sigs.k8s.io/cluster-api/test v1.13.0-rc.0.0.20260504113540-3466e650b303/go.mod h1:lh1LYVTmXzZoNyw6X5nb2p9qbiYHuFcSUo0RZm5QvhY=
466466
sigs.k8s.io/controller-runtime v0.23.3 h1:VjB/vhoPoA9l1kEKZHBMnQF33tdCLQKJtydy4iqwZ80=
467467
sigs.k8s.io/controller-runtime v0.23.3/go.mod h1:B6COOxKptp+YaUT5q4l6LqUJTRpizbgf9KSRNdQGns0=
468468
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=

test/infrastructure/vcsim/controllers/controlplaneendpoint_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func (r *ControlPlaneEndpointReconciler) reconcileNormal(_ context.Context, cont
9393
// IMPORTANT: The fact that both the listener and the resourceGroup for a workload cluster have
9494
// the same name is used as assumptions in other part of the implementation.
9595
listenerName := klog.KObj(controlPlaneEndpoint).String()
96-
listener, err := r.APIServerMux.InitWorkloadClusterListenerWithPort(listenerName, controlPlaneEndpoint.Status.Port)
96+
listener, err := r.APIServerMux.InitWorkloadClusterListener(listenerName, controlPlaneEndpoint.Status.Port)
9797
if err != nil {
9898
return errors.Wrapf(err, "failed to init the listener for the control plane endpoint")
9999
}

0 commit comments

Comments
 (0)