Skip to content

Commit 5967b05

Browse files
chrischdichrischdi
authored
🌱 e2e: fixes to node-drain and multidisk e2e test (#3358)
* e2e: use different namespace name for test pods to still match the capi regex pattern * e2e: add custom machine drain rule for kube-system * Bump sigs.k8s.io/cluster-api to 065f159469f356c029c7fdef92cce1d2e4b0ebc6 * fixup multidisk test * fixup
1 parent 71ea1a5 commit 5967b05

File tree

12 files changed

+167
-117
lines changed

12 files changed

+167
-117
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 := 5ccaeb33b1427bf6783d8a38e95c6848a98d8f53 # Note: this a commit ID of from CAPI main, supposed to be in v1.10
193+
CAPI_HACK_TOOLS_VER := 065f159469f356c029c7fdef92cce1d2e4b0ebc6 # Note: this a commit ID of from CAPI main, supposed to be in v1.10
194194

195195
BOSKOSCTL_BIN := boskosctl
196196
BOSKOSCTL := $(abspath $(TOOLS_BIN_DIR)/$(BOSKOSCTL_BIN))

‎go.mod

Lines changed: 10 additions & 10 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.23.0
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.9.0-rc.0.0.20250205112616-d5158c2503c8
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.9.0-rc.0.0.20250214165422-065f159469f3
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,16 +32,16 @@ require (
3232
golang.org/x/tools v0.30.0
3333
gopkg.in/gcfg.v1 v1.2.3
3434
gopkg.in/yaml.v2 v2.4.0
35-
k8s.io/api v0.32.1
36-
k8s.io/apiextensions-apiserver v0.32.1
37-
k8s.io/apimachinery v0.32.1
38-
k8s.io/client-go v0.32.1
39-
k8s.io/cluster-bootstrap v0.32.1
40-
k8s.io/component-base v0.32.1
35+
k8s.io/api v0.32.2
36+
k8s.io/apiextensions-apiserver v0.32.2
37+
k8s.io/apimachinery v0.32.2
38+
k8s.io/client-go v0.32.2
39+
k8s.io/cluster-bootstrap v0.32.2
40+
k8s.io/component-base v0.32.2
4141
k8s.io/klog/v2 v2.130.1
4242
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
4343
sigs.k8s.io/cluster-api v0.0.0-00010101000000-000000000000
44-
sigs.k8s.io/controller-runtime v0.20.1
44+
sigs.k8s.io/controller-runtime v0.20.2
4545
sigs.k8s.io/yaml v1.4.0
4646
)
4747

@@ -75,7 +75,7 @@ require (
7575
go.uber.org/multierr v1.11.0 // indirect
7676
go.uber.org/zap v1.27.0 // indirect
7777
golang.org/x/net v0.35.0 // indirect
78-
golang.org/x/oauth2 v0.25.0 // indirect
78+
golang.org/x/oauth2 v0.26.0 // indirect
7979
golang.org/x/sync v0.11.0 // indirect
8080
golang.org/x/sys v0.30.0 // indirect
8181
golang.org/x/term v0.29.0 // indirect
@@ -122,7 +122,7 @@ require (
122122
gopkg.in/fsnotify.v1 v1.4.7
123123
gopkg.in/inf.v0 v0.9.1 // indirect
124124
gopkg.in/yaml.v3 v3.0.1 // indirect
125-
k8s.io/apiserver v0.32.1 // indirect
125+
k8s.io/apiserver v0.32.2 // indirect
126126
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
127127
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
128128
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect

‎go.sum

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
313313
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
314314
golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
315315
golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
316-
golang.org/x/oauth2 v0.25.0 h1:CY4y7XT9v0cRI9oupztF8AgiIu99L/ksR/Xp/6jrZ70=
317-
golang.org/x/oauth2 v0.25.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
316+
golang.org/x/oauth2 v0.26.0 h1:afQXWNNaeC4nvZ0Ed9XvCCzXM6UHJG7iCg0W4fPqSBE=
317+
golang.org/x/oauth2 v0.26.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
318318
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
319319
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
320320
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -388,21 +388,21 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
388388
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
389389
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
390390
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
391-
k8s.io/api v0.32.1 h1:f562zw9cy+GvXzXf0CKlVQ7yHJVYzLfL6JAS4kOAaOc=
392-
k8s.io/api v0.32.1/go.mod h1:/Yi/BqkuueW1BgpoePYBRdDYfjPF5sgTr5+YqDZra5k=
393-
k8s.io/apiextensions-apiserver v0.32.1 h1:hjkALhRUeCariC8DiVmb5jj0VjIc1N0DREP32+6UXZw=
394-
k8s.io/apiextensions-apiserver v0.32.1/go.mod h1:sxWIGuGiYov7Io1fAS2X06NjMIk5CbRHc2StSmbaQto=
391+
k8s.io/api v0.32.2 h1:bZrMLEkgizC24G9eViHGOPbW+aRo9duEISRIJKfdJuw=
392+
k8s.io/api v0.32.2/go.mod h1:hKlhk4x1sJyYnHENsrdCWw31FEmCijNGPJO5WzHiJ6Y=
393+
k8s.io/apiextensions-apiserver v0.32.2 h1:2YMk285jWMk2188V2AERy5yDwBYrjgWYggscghPCvV4=
394+
k8s.io/apiextensions-apiserver v0.32.2/go.mod h1:GPwf8sph7YlJT3H6aKUWtd0E+oyShk/YHWQHf/OOgCA=
395395
k8s.io/apimachinery v0.17.4/go.mod h1:gxLnyZcGNdZTCLnq3fgzyg2A5BVCHTNDFrw8AmuJ+0g=
396-
k8s.io/apimachinery v0.32.1 h1:683ENpaCBjma4CYqsmZyhEzrGz6cjn1MY/X2jB2hkZs=
397-
k8s.io/apimachinery v0.32.1/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
398-
k8s.io/apiserver v0.32.1 h1:oo0OozRos66WFq87Zc5tclUX2r0mymoVHRq8JmR7Aak=
399-
k8s.io/apiserver v0.32.1/go.mod h1:UcB9tWjBY7aryeI5zAgzVJB/6k7E97bkr1RgqDz0jPw=
400-
k8s.io/client-go v0.32.1 h1:otM0AxdhdBIaQh7l1Q0jQpmo7WOFIk5FFa4bg6YMdUU=
401-
k8s.io/client-go v0.32.1/go.mod h1:aTTKZY7MdxUaJ/KiUs8D+GssR9zJZi77ZqtzcGXIiDg=
402-
k8s.io/cluster-bootstrap v0.32.1 h1:sHOsbrfWn2EDZus/vwPX2IE1wCw2CuByrIFcaY3zDMo=
403-
k8s.io/cluster-bootstrap v0.32.1/go.mod h1:AAoSp7mIY02P2QBRYoFglKobjD++rPzAdlQeUYObVkA=
404-
k8s.io/component-base v0.32.1 h1:/5IfJ0dHIKBWysGV0yKTFfacZ5yNV1sulPh3ilJjRZk=
405-
k8s.io/component-base v0.32.1/go.mod h1:j1iMMHi/sqAHeG5z+O9BFNCF698a1u0186zkjMZQ28w=
396+
k8s.io/apimachinery v0.32.2 h1:yoQBR9ZGkA6Rgmhbp/yuT9/g+4lxtsGYwW6dR6BDPLQ=
397+
k8s.io/apimachinery v0.32.2/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
398+
k8s.io/apiserver v0.32.2 h1:WzyxAu4mvLkQxwD9hGa4ZfExo3yZZaYzoYvvVDlM6vw=
399+
k8s.io/apiserver v0.32.2/go.mod h1:PEwREHiHNU2oFdte7BjzA1ZyjWjuckORLIK/wLV5goM=
400+
k8s.io/client-go v0.32.2 h1:4dYCD4Nz+9RApM2b/3BtVvBHw54QjMFUl1OLcJG5yOA=
401+
k8s.io/client-go v0.32.2/go.mod h1:fpZ4oJXclZ3r2nDOv+Ux3XcJutfrwjKTCHz2H3sww94=
402+
k8s.io/cluster-bootstrap v0.32.2 h1:2M/VDIVeUuqdyUfZIMHl39Q6NDomLxny8s/yNQLs+18=
403+
k8s.io/cluster-bootstrap v0.32.2/go.mod h1:jzzJvoOU5mjuNXLlORra1pANHtVLWKZWXc4XAjHjMPY=
404+
k8s.io/component-base v0.32.2 h1:1aUL5Vdmu7qNo4ZsE+569PV5zFatM9hl+lb3dEea2zU=
405+
k8s.io/component-base v0.32.2/go.mod h1:PXJ61Vx9Lg+P5mS8TLd7bCIr+eMJRQTyXe8KvkrvJq0=
406406
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
407407
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
408408
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
@@ -415,10 +415,10 @@ k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6J
415415
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
416416
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 h1:CPT0ExVicCzcpeN4baWEV2ko2Z/AsiZgEdwgcfwLgMo=
417417
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
418-
sigs.k8s.io/cluster-api v1.9.0-rc.0.0.20250205112616-d5158c2503c8 h1:vqlOZG5uKc1SKGG65FB0tmO22sMakT+lCzEuKlkXlsA=
419-
sigs.k8s.io/cluster-api v1.9.0-rc.0.0.20250205112616-d5158c2503c8/go.mod h1:mIt2rlw7HjsGpEAXlhWiuWqDdA3YAuHIbqWCKqnKR0M=
420-
sigs.k8s.io/controller-runtime v0.20.1 h1:JbGMAG/X94NeM3xvjenVUaBjy6Ui4Ogd/J5ZtjZnHaE=
421-
sigs.k8s.io/controller-runtime v0.20.1/go.mod h1:BrP3w158MwvB3ZbNpaAcIKkHQ7YGpYnzpoSTZ8E14WU=
418+
sigs.k8s.io/cluster-api v1.9.0-rc.0.0.20250214165422-065f159469f3 h1:oZh7dhqQxRnFLl4ayS8WsRAfpTNCfDWY6d9sbfe/dL0=
419+
sigs.k8s.io/cluster-api v1.9.0-rc.0.0.20250214165422-065f159469f3/go.mod h1:9UtSb2Ni0j/H5tHZxXGr3/mHPkkIPc95OkShJ2iwmnw=
420+
sigs.k8s.io/controller-runtime v0.20.2 h1:/439OZVxoEc02psi1h4QO3bHzTgu49bb347Xp4gW1pc=
421+
sigs.k8s.io/controller-runtime v0.20.2/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
422422
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
423423
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
424424
sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=

‎packaging/go.mod

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@ module sigs.k8s.io/cluster-api-provider-vsphere/packaging
22

33
go 1.23.0
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.9.0-rc.0.0.20250205112616-d5158c2503c8
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.9.0-rc.0.0.20250214165422-065f159469f3
66

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

99
require (
1010
github.com/onsi/gomega v1.36.2
1111
github.com/pkg/errors v0.9.1
1212
github.com/spf13/cobra v1.8.1
13-
k8s.io/api v0.32.1
14-
k8s.io/apiextensions-apiserver v0.32.1
15-
k8s.io/apimachinery v0.32.1
13+
k8s.io/api v0.32.2
14+
k8s.io/apiextensions-apiserver v0.32.2
15+
k8s.io/apimachinery v0.32.2
1616
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
1717
sigs.k8s.io/cluster-api v0.0.0-00010101000000-000000000000
1818
sigs.k8s.io/cluster-api-provider-vsphere v0.0.0-00010101000000-000000000000
19-
sigs.k8s.io/controller-runtime v0.20.1
19+
sigs.k8s.io/controller-runtime v0.20.2
2020
sigs.k8s.io/kustomize/api v0.18.0
2121
sigs.k8s.io/kustomize/kyaml v0.18.1
2222
sigs.k8s.io/yaml v1.4.0
@@ -64,7 +64,7 @@ require (
6464
go.opentelemetry.io/otel v1.28.0 // indirect
6565
go.opentelemetry.io/otel/trace v1.28.0 // indirect
6666
golang.org/x/net v0.35.0 // indirect
67-
golang.org/x/oauth2 v0.25.0 // indirect
67+
golang.org/x/oauth2 v0.26.0 // indirect
6868
golang.org/x/sync v0.11.0 // indirect
6969
golang.org/x/sys v0.30.0 // indirect
7070
golang.org/x/term v0.29.0 // indirect
@@ -75,9 +75,9 @@ require (
7575
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
7676
gopkg.in/inf.v0 v0.9.1 // indirect
7777
gopkg.in/yaml.v3 v3.0.1 // indirect
78-
k8s.io/client-go v0.32.1 // indirect
79-
k8s.io/cluster-bootstrap v0.32.1 // indirect
80-
k8s.io/component-base v0.32.1 // indirect
78+
k8s.io/client-go v0.32.2 // indirect
79+
k8s.io/cluster-bootstrap v0.32.2 // indirect
80+
k8s.io/component-base v0.32.2 // indirect
8181
k8s.io/klog/v2 v2.130.1 // indirect
8282
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
8383
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect

‎packaging/go.sum

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
164164
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
165165
golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
166166
golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
167-
golang.org/x/oauth2 v0.25.0 h1:CY4y7XT9v0cRI9oupztF8AgiIu99L/ksR/Xp/6jrZ70=
168-
golang.org/x/oauth2 v0.25.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
167+
golang.org/x/oauth2 v0.26.0 h1:afQXWNNaeC4nvZ0Ed9XvCCzXM6UHJG7iCg0W4fPqSBE=
168+
golang.org/x/oauth2 v0.26.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
169169
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
170170
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
171171
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -214,28 +214,28 @@ gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRN
214214
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
215215
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
216216
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
217-
k8s.io/api v0.32.1 h1:f562zw9cy+GvXzXf0CKlVQ7yHJVYzLfL6JAS4kOAaOc=
218-
k8s.io/api v0.32.1/go.mod h1:/Yi/BqkuueW1BgpoePYBRdDYfjPF5sgTr5+YqDZra5k=
219-
k8s.io/apiextensions-apiserver v0.32.1 h1:hjkALhRUeCariC8DiVmb5jj0VjIc1N0DREP32+6UXZw=
220-
k8s.io/apiextensions-apiserver v0.32.1/go.mod h1:sxWIGuGiYov7Io1fAS2X06NjMIk5CbRHc2StSmbaQto=
221-
k8s.io/apimachinery v0.32.1 h1:683ENpaCBjma4CYqsmZyhEzrGz6cjn1MY/X2jB2hkZs=
222-
k8s.io/apimachinery v0.32.1/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
223-
k8s.io/client-go v0.32.1 h1:otM0AxdhdBIaQh7l1Q0jQpmo7WOFIk5FFa4bg6YMdUU=
224-
k8s.io/client-go v0.32.1/go.mod h1:aTTKZY7MdxUaJ/KiUs8D+GssR9zJZi77ZqtzcGXIiDg=
225-
k8s.io/cluster-bootstrap v0.32.1 h1:sHOsbrfWn2EDZus/vwPX2IE1wCw2CuByrIFcaY3zDMo=
226-
k8s.io/cluster-bootstrap v0.32.1/go.mod h1:AAoSp7mIY02P2QBRYoFglKobjD++rPzAdlQeUYObVkA=
227-
k8s.io/component-base v0.32.1 h1:/5IfJ0dHIKBWysGV0yKTFfacZ5yNV1sulPh3ilJjRZk=
228-
k8s.io/component-base v0.32.1/go.mod h1:j1iMMHi/sqAHeG5z+O9BFNCF698a1u0186zkjMZQ28w=
217+
k8s.io/api v0.32.2 h1:bZrMLEkgizC24G9eViHGOPbW+aRo9duEISRIJKfdJuw=
218+
k8s.io/api v0.32.2/go.mod h1:hKlhk4x1sJyYnHENsrdCWw31FEmCijNGPJO5WzHiJ6Y=
219+
k8s.io/apiextensions-apiserver v0.32.2 h1:2YMk285jWMk2188V2AERy5yDwBYrjgWYggscghPCvV4=
220+
k8s.io/apiextensions-apiserver v0.32.2/go.mod h1:GPwf8sph7YlJT3H6aKUWtd0E+oyShk/YHWQHf/OOgCA=
221+
k8s.io/apimachinery v0.32.2 h1:yoQBR9ZGkA6Rgmhbp/yuT9/g+4lxtsGYwW6dR6BDPLQ=
222+
k8s.io/apimachinery v0.32.2/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
223+
k8s.io/client-go v0.32.2 h1:4dYCD4Nz+9RApM2b/3BtVvBHw54QjMFUl1OLcJG5yOA=
224+
k8s.io/client-go v0.32.2/go.mod h1:fpZ4oJXclZ3r2nDOv+Ux3XcJutfrwjKTCHz2H3sww94=
225+
k8s.io/cluster-bootstrap v0.32.2 h1:2M/VDIVeUuqdyUfZIMHl39Q6NDomLxny8s/yNQLs+18=
226+
k8s.io/cluster-bootstrap v0.32.2/go.mod h1:jzzJvoOU5mjuNXLlORra1pANHtVLWKZWXc4XAjHjMPY=
227+
k8s.io/component-base v0.32.2 h1:1aUL5Vdmu7qNo4ZsE+569PV5zFatM9hl+lb3dEea2zU=
228+
k8s.io/component-base v0.32.2/go.mod h1:PXJ61Vx9Lg+P5mS8TLd7bCIr+eMJRQTyXe8KvkrvJq0=
229229
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
230230
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
231231
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y=
232232
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4=
233233
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
234234
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
235-
sigs.k8s.io/cluster-api v1.9.0-rc.0.0.20250205112616-d5158c2503c8 h1:vqlOZG5uKc1SKGG65FB0tmO22sMakT+lCzEuKlkXlsA=
236-
sigs.k8s.io/cluster-api v1.9.0-rc.0.0.20250205112616-d5158c2503c8/go.mod h1:mIt2rlw7HjsGpEAXlhWiuWqDdA3YAuHIbqWCKqnKR0M=
237-
sigs.k8s.io/controller-runtime v0.20.1 h1:JbGMAG/X94NeM3xvjenVUaBjy6Ui4Ogd/J5ZtjZnHaE=
238-
sigs.k8s.io/controller-runtime v0.20.1/go.mod h1:BrP3w158MwvB3ZbNpaAcIKkHQ7YGpYnzpoSTZ8E14WU=
235+
sigs.k8s.io/cluster-api v1.9.0-rc.0.0.20250214165422-065f159469f3 h1:oZh7dhqQxRnFLl4ayS8WsRAfpTNCfDWY6d9sbfe/dL0=
236+
sigs.k8s.io/cluster-api v1.9.0-rc.0.0.20250214165422-065f159469f3/go.mod h1:9UtSb2Ni0j/H5tHZxXGr3/mHPkkIPc95OkShJ2iwmnw=
237+
sigs.k8s.io/controller-runtime v0.20.2 h1:/439OZVxoEc02psi1h4QO3bHzTgu49bb347Xp4gW1pc=
238+
sigs.k8s.io/controller-runtime v0.20.2/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
239239
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
240240
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
241241
sigs.k8s.io/kustomize/api v0.18.0 h1:hTzp67k+3NEVInwz5BHyzc9rGxIauoXferXyjv5lWPo=

‎pkg/services/govmomi/vcenter/clone.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -441,8 +441,6 @@ func createDataDisks(ctx context.Context, dataDiskDefs []infrav1.VSphereDisk, de
441441
}
442442

443443
// Set provisioning type for the new data disk.
444-
// Currently, if ThinProvisioned is not set, GOVC will set default to false. We may want to change this behavior
445-
// to match what template image OS disk has configured to make them match if not set.
446444
switch dataDisk.ProvisioningMode {
447445
case infrav1.ThinProvisioningMode:
448446
backing.ThinProvisioned = types.NewBool(true)
@@ -452,7 +450,7 @@ func createDataDisks(ctx context.Context, dataDiskDefs []infrav1.VSphereDisk, de
452450
backing.ThinProvisioned = types.NewBool(false)
453451
backing.EagerlyScrub = types.NewBool(true)
454452
default:
455-
log.V(2).Info("No provisioning type detected. Leaving configuration empty.")
453+
log.V(2).Info("No provisioning type detected. Leaving configuration empty.")
456454
}
457455

458456
dev := &types.VirtualDisk{

‎pkg/services/govmomi/vcenter/clone_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -300,9 +300,7 @@ func TestCreateDataDisks(t *testing.T) {
300300
g.Expect(backingInfo.ThinProvisioned).To(gomega.Equal(types.NewBool(false)))
301301
g.Expect(backingInfo.EagerlyScrub).To(gomega.Equal(types.NewBool(true)))
302302
default:
303-
// Currently, if not set, GOVC will set default to false. We may want to change this behavior to match what template image OS disk is to make them match if not set.
304-
g.Expect(backingInfo.ThinProvisioned).To(gomega.BeNil())
305-
g.Expect(backingInfo.EagerlyScrub).To(gomega.BeNil())
303+
// If not set, the behaviour may depend on the configuration of the backing datastore.
306304
}
307305
}
308306
}

‎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.10.99"
30-
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20250205/core-components.yaml"
30+
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20250216/core-components.yaml"
3131
type: "url"
3232
contract: v1beta1
3333
files:
@@ -76,7 +76,7 @@ providers:
7676
type: BootstrapProvider
7777
versions:
7878
- name: "v1.10.99"
79-
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20250205/bootstrap-components.yaml"
79+
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20250216/bootstrap-components.yaml"
8080
type: "url"
8181
contract: v1beta1
8282
files:
@@ -125,7 +125,7 @@ providers:
125125
type: ControlPlaneProvider
126126
versions:
127127
- name: "v1.10.99"
128-
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20250205/control-plane-components.yaml"
128+
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20250216/control-plane-components.yaml"
129129
type: "url"
130130
contract: v1beta1
131131
files:

‎test/e2e/multi_disk_test.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,9 @@ func verifyDisks(ctx context.Context, input diskSpecInput) {
100100
Expect(disks).To(HaveLen(diskCount), fmt.Sprintf("Disk count of VM should be %d", diskCount))
101101

102102
// Check each disk to see if its provisioning type matches the expected
103-
var osDiskBackingInfo *types.VirtualDiskFlatVer2BackingInfo
104103
for diskIndex, disk := range disks {
105104
// Skip first disk since it is the OS
106105
if diskIndex == 0 {
107-
osDiskBackingInfo = disk.GetVirtualDevice().Backing.(*types.VirtualDiskFlatVer2BackingInfo)
108106
continue
109107
}
110108

@@ -123,11 +121,8 @@ func verifyDisks(ctx context.Context, input diskSpecInput) {
123121
Expect(backingInfo.ThinProvisioned).To(Equal(types.NewBool(false)), "ThinProvisioned should be false for resulting disk when data disk provisionType is EagerlyZeroed")
124122
Expect(backingInfo.EagerlyScrub).To(Equal(types.NewBool(true)), "EagerlyScrub should be true for resulting disk when data disk provisionType is EagerlyZeroed")
125123
default:
126-
// Currently, the settings for default behavior of disks during clone can come from templates settings,
127-
// the default storage policy, or the clone's settings. Our tests will compare against os disk to make
128-
// sure they are the same.
129-
Expect(backingInfo.ThinProvisioned).To(Equal(osDiskBackingInfo.ThinProvisioned), "ThinProvisioned should match OS disk for resulting disk when data disk provisionType is not set")
130-
Expect(backingInfo.EagerlyScrub).To(Equal(osDiskBackingInfo.EagerlyScrub), "EagerlyScrub should match OS disk for resulting disk when data disk provisionType is not set")
124+
// Currently, the settings for default behavior of new disks during clone can come from templates settings,
125+
// the default storage policy, the clone's settings or the datastore configuration.
131126
}
132127

133128
// Check disk size

0 commit comments

Comments
 (0)