Skip to content

Commit b3a3ffc

Browse files
sbueringersbueringer
committed
Bump apimachinery to v0.34 in packaging
1 parent 52680fb commit b3a3ffc

10 files changed

+50
-68
lines changed

‎packaging/go.mod‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ require (
1010
github.com/onsi/gomega v1.37.0
1111
github.com/pkg/errors v0.9.1
1212
github.com/spf13/cobra v1.9.1
13-
k8s.io/api v0.33.2
14-
k8s.io/apiextensions-apiserver v0.33.2
15-
k8s.io/apimachinery v0.33.2
16-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
13+
k8s.io/api v0.34.0-alpha.2
14+
k8s.io/apiextensions-apiserver v0.34.0-alpha.2
15+
k8s.io/apimachinery v0.34.0-alpha.2
16+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
1717
sigs.k8s.io/cluster-api v0.0.0-00010101000000-000000000000
1818
sigs.k8s.io/cluster-api-provider-vsphere v0.0.0-00010101000000-000000000000
1919
sigs.k8s.io/controller-runtime v0.21.0
@@ -30,8 +30,8 @@ require (
3030
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3131
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
3232
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
33-
github.com/fsnotify/fsnotify v1.8.0 // indirect
34-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
33+
github.com/fsnotify/fsnotify v1.9.0 // indirect
34+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
3535
github.com/go-errors/errors v1.4.2 // indirect
3636
github.com/go-logr/logr v1.4.3 // indirect
3737
github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -48,18 +48,19 @@ require (
4848
github.com/json-iterator/go v1.1.12 // indirect
4949
github.com/mailru/easyjson v0.7.7 // indirect
5050
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
51-
github.com/modern-go/reflect2 v1.0.2 // indirect
51+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
5252
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
5353
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
54+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
5455
github.com/prometheus/client_golang v1.22.0 // indirect
5556
github.com/prometheus/client_model v0.6.1 // indirect
5657
github.com/prometheus/common v0.62.0 // indirect
5758
github.com/prometheus/procfs v0.15.1 // indirect
5859
github.com/spf13/pflag v1.0.6 // indirect
5960
github.com/x448/float16 v0.8.4 // indirect
6061
github.com/xlab/treeprint v1.2.0 // indirect
61-
go.opentelemetry.io/otel v1.33.0 // indirect
62-
go.opentelemetry.io/otel/trace v1.33.0 // indirect
62+
go.opentelemetry.io/otel v1.35.0 // indirect
63+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
6364
go.yaml.in/yaml/v2 v2.4.2 // indirect
6465
go.yaml.in/yaml/v3 v3.0.3 // indirect
6566
golang.org/x/net v0.41.0 // indirect
@@ -74,12 +75,12 @@ require (
7475
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
7576
gopkg.in/inf.v0 v0.9.1 // indirect
7677
gopkg.in/yaml.v3 v3.0.1 // indirect
77-
k8s.io/client-go v0.33.2 // indirect
78+
k8s.io/client-go v0.34.0-alpha.2 // indirect
7879
k8s.io/cluster-bootstrap v0.33.2 // indirect
79-
k8s.io/component-base v0.33.2 // indirect
80+
k8s.io/component-base v0.34.0-alpha.2 // indirect
8081
k8s.io/klog/v2 v2.130.1 // indirect
81-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
82+
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a // indirect
8283
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
8384
sigs.k8s.io/randfill v1.0.0 // indirect
84-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
85+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
8586
)

‎packaging/go.sum‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ github.com/evanphx/json-patch v5.7.0+incompatible h1:vgGkfT/9f8zE6tvSCe74nfpAVDQ
2020
github.com/evanphx/json-patch v5.7.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
2121
github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjTM0wiaDU=
2222
github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM=
23-
github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
24-
github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
25-
github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
26-
github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
23+
github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
24+
github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
25+
github.com/fxamacker/cbor/v2 v2.8.0 h1:fFtUGXUzXPHTIUdne5+zzMPTfffl3RD5qYnkY40vtxU=
26+
github.com/fxamacker/cbor/v2 v2.8.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
2727
github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
2828
github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
2929
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
@@ -84,8 +84,9 @@ github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJ
8484
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
8585
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
8686
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
87-
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
8887
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
88+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFdJifH4BDsTlE89Zl93FEloxaWZfGcifgq8=
89+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
8990
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/2gBQ3RWajuToeY6ZtZTIKv2v7ThUy5KKusIT0yc0=
9091
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4=
9192
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
@@ -144,10 +145,10 @@ github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ=
144145
github.com/xlab/treeprint v1.2.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0=
145146
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
146147
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
147-
go.opentelemetry.io/otel v1.33.0 h1:/FerN9bax5LoK51X/sI0SVYrjSE0/yUL7DpxW4K3FWw=
148-
go.opentelemetry.io/otel v1.33.0/go.mod h1:SUUkR6csvUQl+yjReHu5uM3EtVV7MBm5FHKRlNx4I8I=
149-
go.opentelemetry.io/otel/trace v1.33.0 h1:cCJuF7LRjUFso9LPnEAHJDB2pqzp+hbO8eu1qqW2d/s=
150-
go.opentelemetry.io/otel/trace v1.33.0/go.mod h1:uIcdVUZMpTAmz0tI1z04GoVSezK37CbGV4fr1f2nBck=
148+
go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ=
149+
go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y=
150+
go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs=
151+
go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc=
151152
go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
152153
go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
153154
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
@@ -221,24 +222,24 @@ gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRN
221222
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
222223
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
223224
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
224-
k8s.io/api v0.33.2 h1:YgwIS5jKfA+BZg//OQhkJNIfie/kmRsO0BmNaVSimvY=
225-
k8s.io/api v0.33.2/go.mod h1:fhrbphQJSM2cXzCWgqU29xLDuks4mu7ti9vveEnpSXs=
226-
k8s.io/apiextensions-apiserver v0.33.2 h1:6gnkIbngnaUflR3XwE1mCefN3YS8yTD631JXQhsU6M8=
227-
k8s.io/apiextensions-apiserver v0.33.2/go.mod h1:IvVanieYsEHJImTKXGP6XCOjTwv2LUMos0YWc9O+QP8=
228-
k8s.io/apimachinery v0.33.2 h1:IHFVhqg59mb8PJWTLi8m1mAoepkUNYmptHsV+Z1m5jY=
229-
k8s.io/apimachinery v0.33.2/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
230-
k8s.io/client-go v0.33.2 h1:z8CIcc0P581x/J1ZYf4CNzRKxRvQAwoAolYPbtQes+E=
231-
k8s.io/client-go v0.33.2/go.mod h1:9mCgT4wROvL948w6f6ArJNb7yQd7QsvqavDeZHvNmHo=
225+
k8s.io/api v0.34.0-alpha.2 h1:nSjp8/FHPoEn/UEy/TWBKkGA2DwS2JJypsuv1l5kidQ=
226+
k8s.io/api v0.34.0-alpha.2/go.mod h1:QADmt+iVmFauWh94wDpD53xDNB5cmLTTFECEJlhE5To=
227+
k8s.io/apiextensions-apiserver v0.34.0-alpha.2 h1:hBrCOLTT0Gavt/kviPfv6b6P+hmoCja7m9ewLzDqw6o=
228+
k8s.io/apiextensions-apiserver v0.34.0-alpha.2/go.mod h1:Lbus5MTRVmJ7uTzLngou3HMMTCRvnvGQmL5aJoYKOL0=
229+
k8s.io/apimachinery v0.34.0-alpha.2 h1:kKK+KUnbsRWJObxY3pChe0IYkEWG5L4Qsmr/iTIuFQE=
230+
k8s.io/apimachinery v0.34.0-alpha.2/go.mod h1:HYUvaFuBNToT/JW+lhc2D9BYgqj6xhI5eORJ7BnvKpM=
231+
k8s.io/client-go v0.34.0-alpha.2 h1:3TwS7HoRQZ8hQp9Sud4j+oS0O2N++3lyMVJavogALzw=
232+
k8s.io/client-go v0.34.0-alpha.2/go.mod h1:DWWpv2S99iGzK+cUwhQBe1ipIU9PVeREVjl/XWHlr4Y=
232233
k8s.io/cluster-bootstrap v0.33.2 h1:cWsfYylvQTpmZ5MdW8roYfumfz5qCOlSWh12pA4NEPs=
233234
k8s.io/cluster-bootstrap v0.33.2/go.mod h1:iD2UEJ7Le2nHHJyboWpLnqtAhOcw2eifd6Wg6I/BlFk=
234-
k8s.io/component-base v0.33.2 h1:sCCsn9s/dG3ZrQTX/Us0/Sx2R0G5kwa0wbZFYoVp/+0=
235-
k8s.io/component-base v0.33.2/go.mod h1:/41uw9wKzuelhN+u+/C59ixxf4tYQKW7p32ddkYNe2k=
235+
k8s.io/component-base v0.34.0-alpha.2 h1:IRXrJ1nZHmzp4sAGYiv8uN2XvOCTelLwWXr5DxJp4cQ=
236+
k8s.io/component-base v0.34.0-alpha.2/go.mod h1:nk7MlWTLUWnSkaR72wJEH+bD6+zBtPb3CL9EMi2aMWc=
236237
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
237238
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
238-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=
239-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
240-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
241-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
239+
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a h1:ZV3Zr+/7s7aVbjNGICQt+ppKWsF1tehxggNfbM7XnG8=
240+
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
241+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
242+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
242243
sigs.k8s.io/cluster-api v1.11.0-alpha.2.0.20250707091926-afb1afee283a h1:HzcwOLFPG5/WmrezfV1MdOnshMove9fSZgZIi0cLSaM=
243244
sigs.k8s.io/cluster-api v1.11.0-alpha.2.0.20250707091926-afb1afee283a/go.mod h1:AougDuRB0zXAygnmSTEJiQ1f/s382U2DfboFHbaK1VQ=
244245
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
@@ -252,8 +253,8 @@ sigs.k8s.io/kustomize/kyaml v0.18.1/go.mod h1:C3L2BFVU1jgcddNBE1TxuVLgS46TjObMwW
252253
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
253254
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
254255
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
255-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 h1:IUA9nvMmnKWcj5jl84xn+T5MnlZKThmUW1TdblaLVAc=
256-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
256+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI=
257+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
257258
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
258259
sigs.k8s.io/yaml v1.5.0 h1:M10b2U7aEUY6hRtU870n2VTPgR5RZiL/I6Lcc2F4NUQ=
259260
sigs.k8s.io/yaml v1.5.0/go.mod h1:wZs27Rbxoai4C0f8/9urLZtZtF3avA3gKvGyPdDqTO4=

‎templates/cluster-template-ignition.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ spec:
7777
apiVersion: v1
7878
kind: Pod
7979
metadata:
80-
creationTimestamp: null
8180
name: kube-vip
8281
namespace: kube-system
8382
spec:

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ spec:
113113
apiVersion: v1
114114
kind: Pod
115115
metadata:
116-
creationTimestamp: null
117116
name: kube-vip
118117
namespace: kube-system
119118
spec:

‎templates/cluster-template-supervisor.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ spec:
7272
apiVersion: v1
7373
kind: Pod
7474
metadata:
75-
creationTimestamp: null
7675
name: kube-vip
7776
namespace: kube-system
7877
spec:

‎templates/cluster-template-topology-supervisor.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ spec:
1919
apiVersion: v1
2020
kind: Pod
2121
metadata:
22-
creationTimestamp: null
2322
name: kube-vip
2423
namespace: kube-system
2524
spec:
@@ -93,7 +92,6 @@ spec:
9392
workers:
9493
machineDeployments:
9594
- class: ${CLUSTER_CLASS_NAME}-worker
96-
metadata: {}
9795
name: md-0
9896
replicas: ${WORKER_MACHINE_COUNT}
9997
---

‎templates/cluster-template-topology.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ spec:
1919
apiVersion: v1
2020
kind: Pod
2121
metadata:
22-
creationTimestamp: null
2322
name: kube-vip
2423
namespace: kube-system
2524
spec:
@@ -99,7 +98,6 @@ spec:
9998
workers:
10099
machineDeployments:
101100
- class: ${CLUSTER_CLASS_NAME}-worker
102-
metadata: {}
103101
name: md-0
104102
replicas: ${WORKER_MACHINE_COUNT}
105103
---

‎templates/cluster-template.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ spec:
103103
apiVersion: v1
104104
kind: Pod
105105
metadata:
106-
creationTimestamp: null
107106
name: kube-vip
108107
namespace: kube-system
109108
spec:

‎templates/clusterclass-template-supervisor.yaml‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -179,29 +179,25 @@ spec:
179179
controlPlane: true
180180
name: kubeVipPodManifest
181181
variables:
182-
- deprecatedV1Beta1Metadata: {}
183-
name: sshKey
182+
- name: sshKey
184183
required: false
185184
schema:
186185
openAPIV3Schema:
187186
description: Public key to SSH onto the cluster nodes.
188187
type: string
189-
- deprecatedV1Beta1Metadata: {}
190-
name: controlPlaneIpAddr
188+
- name: controlPlaneIpAddr
191189
required: true
192190
schema:
193191
openAPIV3Schema:
194192
description: Floating VIP for the control plane.
195193
type: string
196-
- deprecatedV1Beta1Metadata: {}
197-
name: controlPlanePort
194+
- name: controlPlanePort
198195
required: true
199196
schema:
200197
openAPIV3Schema:
201198
description: Port for the control plane endpoint.
202199
type: integer
203-
- deprecatedV1Beta1Metadata: {}
204-
name: kubeVipPodManifest
200+
- name: kubeVipPodManifest
205201
required: true
206202
schema:
207203
openAPIV3Schema:
@@ -221,7 +217,6 @@ spec:
221217
apiVersion: vmware.infrastructure.cluster.x-k8s.io/v1beta1
222218
kind: VSphereMachineTemplate
223219
name: ${CLUSTER_CLASS_NAME}-worker-machinetemplate
224-
metadata: {}
225220
---
226221
apiVersion: vmware.infrastructure.cluster.x-k8s.io/v1beta1
227222
kind: VSphereMachineTemplate

‎templates/clusterclass-template.yaml‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -193,36 +193,31 @@ spec:
193193
controlPlane: true
194194
name: kubeVipPodManifest
195195
variables:
196-
- deprecatedV1Beta1Metadata: {}
197-
name: sshKey
196+
- name: sshKey
198197
required: false
199198
schema:
200199
openAPIV3Schema:
201200
description: Public key to SSH onto the cluster nodes.
202201
type: string
203-
- deprecatedV1Beta1Metadata: {}
204-
name: controlPlaneIpAddr
202+
- name: controlPlaneIpAddr
205203
required: true
206204
schema:
207205
openAPIV3Schema:
208206
description: Floating VIP for the control plane.
209207
type: string
210-
- deprecatedV1Beta1Metadata: {}
211-
name: controlPlanePort
208+
- name: controlPlanePort
212209
required: true
213210
schema:
214211
openAPIV3Schema:
215212
description: Port for the control plane endpoint.
216213
type: integer
217-
- deprecatedV1Beta1Metadata: {}
218-
name: kubeVipPodManifest
214+
- name: kubeVipPodManifest
219215
required: true
220216
schema:
221217
openAPIV3Schema:
222218
description: kube-vip manifest for the control plane.
223219
type: string
224-
- deprecatedV1Beta1Metadata: {}
225-
name: infraServer
220+
- name: infraServer
226221
required: true
227222
schema:
228223
openAPIV3Schema:
@@ -232,8 +227,7 @@ spec:
232227
url:
233228
type: string
234229
type: object
235-
- deprecatedV1Beta1Metadata: {}
236-
name: credsSecretName
230+
- name: credsSecretName
237231
required: true
238232
schema:
239233
openAPIV3Schema:
@@ -253,7 +247,6 @@ spec:
253247
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
254248
kind: VSphereMachineTemplate
255249
name: ${CLUSTER_CLASS_NAME}-worker-machinetemplate
256-
metadata: {}
257250
---
258251
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
259252
kind: VSphereMachineTemplate

0 commit comments

Comments
 (0)