Skip to content

Commit 3bb1e60

Browse files
author
shiftstack-merge-bot
committed
2 parents 3094490 + fa5a8b3 commit 3bb1e60

16 files changed

+112
-122
lines changed

‎Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,8 @@ templates/cluster-template-%.yaml: kustomize/v1beta1/% $(KUSTOMIZE) FORCE
517517
.PHONY: release-templates
518518
release-templates: $(RELEASE_DIR) templates ## Generate release templates
519519
cp templates/cluster-template*.yaml $(RELEASE_DIR)/
520+
cp templates/clusterclass*.yaml $(RELEASE_DIR)/
521+
cp templates/image-template*.yaml $(RELEASE_DIR)/
520522

521523
IMAGE_PATCH_DIR := $(ARTIFACTS)/image-patch
522524

‎cloudbuild.yaml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,19 @@ options:
44
substitution_option: ALLOW_LOOSE
55
machineType: 'N1_HIGHCPU_8'
66
steps:
7-
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20241229-5dc092c636'
8-
entrypoint: make
9-
env:
10-
- DOCKER_CLI_EXPERIMENTAL=enabled
11-
- TAG=$_GIT_TAG
12-
- PULL_BASE_REF=$_PULL_BASE_REF
13-
- DOCKER_BUILDKIT=1
14-
args:
15-
- release-staging
7+
# To check if the image can handle the build, you can try it like this:
8+
# docker run --rm -it -v $(pwd):/workspace gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:${TAG}
9+
# make clean # make sure we have something to build
10+
# make staging-manifests
11+
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20250116-2a05ea7e3d'
12+
entrypoint: make
13+
env:
14+
- DOCKER_CLI_EXPERIMENTAL=enabled
15+
- TAG=$_GIT_TAG
16+
- PULL_BASE_REF=$_PULL_BASE_REF
17+
- DOCKER_BUILDKIT=1
18+
args:
19+
- release-staging
1620
substitutions:
1721
# _GIT_TAG will be filled with a git-based tag for the image, of the form vYYYYMMDD-hash, and
1822
# can be used as a substitution

‎docs/book/src/development/development.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ This document explains how to develop Cluster API Provider OpenStack (CAPO).
3838
Note that CAPO depends on ORC. No matter how you choose to work, you will need to deploy ORC in order to make CAPO functional:
3939

4040
```bash
41-
kubectl apply -f https://github.com/k-orc/openstack-resource-controller/releases/download/v1.0.0/install.yaml
41+
kubectl apply -f https://github.com/k-orc/openstack-resource-controller/releases/latest/download/install.yaml
4242
```
4343

4444
TL;DR: Here is a short version for how to develop with Tilt:
@@ -58,11 +58,12 @@ export RESOURCE_TYPE=...
5858
make tilt-up
5959
# Back in CAPO repo
6060
# Install ORC
61-
kubectl apply -f https://github.com/k-orc/openstack-resource-controller/releases/download/v1.0.0/install.yaml
61+
kubectl apply -f https://github.com/k-orc/openstack-resource-controller/releases/latest/download/install.yaml
6262
# Create secret with clouds.yaml (the file is created by create_devstack.sh)
6363
kubectl create secret generic dev-test-cloud-config --from-file=clouds.yaml
6464
# Add images to use in the tests
65-
clusterctl generate yaml --from templates/images-template.yaml | kubectl apply -f -
65+
clusterctl generate yaml --from templates/image-template-node.yaml | kubectl apply -f -
66+
clusterctl generate yaml --from templates/image-template-bastion.yaml | kubectl apply -f -
6667
```
6768

6869
At this point, you should be able to apply the `dev-test` ClusterClass and start creating/deleting `development` clusters through the Tilt UI.
@@ -95,10 +96,11 @@ After generating `infrastructure-components.yaml`, replace the `us.gcr.io/k8s-ar
9596
## Automatically Adding Images to OpenStack
9697

9798
Before you can create a Cluster, you will need a suitable image in OpenStack.
98-
There is a convenient template available in `templates/images-template.yaml` for this purpose.
99+
There are convenient templates available in `templates/image-template-*.yaml` for this purpose.
100+
For example:
99101

100102
```bash
101-
clusterctl generate yaml --from templates/images-template.yaml | kubectl apply -f -
103+
clusterctl generate yaml --from templates/image-template-node.yaml | kubectl apply -f -
102104
```
103105

104106
## Testing Cluster Creation using the 'dev-test' ClusterClass with Tilt

‎go.mod

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ require (
2020
golang.org/x/crypto v0.39.0
2121
golang.org/x/text v0.26.0
2222
gopkg.in/ini.v1 v1.67.0
23-
k8s.io/api v0.31.9
24-
k8s.io/apiextensions-apiserver v0.31.9
25-
k8s.io/apimachinery v0.31.9
26-
k8s.io/client-go v0.31.9
27-
k8s.io/code-generator v0.31.9
28-
k8s.io/component-base v0.31.9
23+
k8s.io/api v0.31.10
24+
k8s.io/apiextensions-apiserver v0.31.10
25+
k8s.io/apimachinery v0.31.10
26+
k8s.io/client-go v0.31.10
27+
k8s.io/code-generator v0.31.10
28+
k8s.io/component-base v0.31.10
2929
k8s.io/klog/v2 v2.130.1
3030
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
3131
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
32-
sigs.k8s.io/cluster-api v1.9.8
33-
sigs.k8s.io/cluster-api/test v1.9.8
32+
sigs.k8s.io/cluster-api v1.9.9
33+
sigs.k8s.io/cluster-api/test v1.9.9
3434
sigs.k8s.io/controller-runtime v0.19.7
3535
sigs.k8s.io/structured-merge-diff/v4 v4.7.0
3636
sigs.k8s.io/yaml v1.4.0
@@ -54,7 +54,7 @@ require (
5454
github.com/blang/semver/v4 v4.0.0 // indirect
5555
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
5656
github.com/cespare/xxhash/v2 v2.3.0 // indirect
57-
github.com/cloudflare/circl v1.3.7 // indirect
57+
github.com/cloudflare/circl v1.6.1 // indirect
5858
github.com/distribution/reference v0.6.0 // indirect
5959
github.com/docker/docker v27.3.1+incompatible // indirect
6060
github.com/docker/go-connections v0.5.0 // indirect
@@ -150,7 +150,7 @@ require (
150150
gopkg.in/inf.v0 v0.9.1 // indirect
151151
gopkg.in/yaml.v2 v2.4.0 // indirect
152152
gopkg.in/yaml.v3 v3.0.1 // indirect
153-
k8s.io/apiserver v0.31.9 // indirect
153+
k8s.io/apiserver v0.31.10 // indirect
154154
k8s.io/cluster-bootstrap v0.31.3 // indirect
155155
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
156156
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect

‎go.sum

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyY
3636
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
3737
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
3838
github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I=
39-
github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
40-
github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
39+
github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
40+
github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
4141
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
4242
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
4343
github.com/coredns/caddy v1.1.1 h1:2eYKZT7i6yxIfGP3qLJoJ7HAsDJqYB+X68g4NYjSrE0=
@@ -418,22 +418,22 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
418418
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
419419
gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=
420420
gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g=
421-
k8s.io/api v0.31.9 h1:+gN4iZNccfr6y2EX28ZgcAq4yUKNZMhg2Jl72+2hoxQ=
422-
k8s.io/api v0.31.9/go.mod h1:+rao9hnuB9AHXVoqqwxPh493H91pte1ZhfJ6oz1qLJA=
423-
k8s.io/apiextensions-apiserver v0.31.9 h1:5U+Y7vvV+lVqOBjNmmTO42PxoQrp44yzXTHievxEhdY=
424-
k8s.io/apiextensions-apiserver v0.31.9/go.mod h1:tx/XA+SO6HhoXhXqvaeF5+iHlL7dF3wWACB6plC23M8=
425-
k8s.io/apimachinery v0.31.9 h1:sLGkHzsAfWVp55os8PlKw+eeIsB3IeVU1QLb3XKHyg8=
426-
k8s.io/apimachinery v0.31.9/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
427-
k8s.io/apiserver v0.31.9 h1:Ebc8HTjGjkkiW7c2I1yK3WCv2V37P1oikVEOiw14ZeE=
428-
k8s.io/apiserver v0.31.9/go.mod h1:Nl/v7YIM6KDVDFtJDdLWQZu2Px+75vrxlMntZSU7b74=
429-
k8s.io/client-go v0.31.9 h1:SZr3xiDPdGwKeVR+jMYYubk1gJXA/go3obJeG/1Q/to=
430-
k8s.io/client-go v0.31.9/go.mod h1:ZwfOkKABRm2zSNR3s9OkADeyt0zhF9F78tJNupZM8zM=
421+
k8s.io/api v0.31.10 h1:hR39mlD3fxAMVotfj1aAEUOZhNMf+pL/XpL2zKvfLMk=
422+
k8s.io/api v0.31.10/go.mod h1:UwhlGlhYzRQuDudTdvUZ6bZZAKp0Zs82m+qEw/BZxCU=
423+
k8s.io/apiextensions-apiserver v0.31.10 h1:Scl+8yOqpbO/6eilafV7F1cpjVmobFWu8EJ3Y2TIKt4=
424+
k8s.io/apiextensions-apiserver v0.31.10/go.mod h1:0VbuO1j4eft+aMYjVy0piM+A+aITSvamJwOYRYJyHMw=
425+
k8s.io/apimachinery v0.31.10 h1:fKQxHMu8IFRsC5wsiA7ySL9Z/dw9LOmVs3cifAx1cXk=
426+
k8s.io/apimachinery v0.31.10/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
427+
k8s.io/apiserver v0.31.10 h1:oMK+nnYVh2+D7nujjeEbtBl/kbG9CyqrX06wjkFytdE=
428+
k8s.io/apiserver v0.31.10/go.mod h1:nzEhw+jN3NdDq8b+/uUqL5s4AFRmSkRv5ZJJs8eVuAc=
429+
k8s.io/client-go v0.31.10 h1:2WvGOFKKggxmx6kB6DP1NjdvLPyI6z+CtDWcQsyHpTI=
430+
k8s.io/client-go v0.31.10/go.mod h1:zRlFekIgyvhAEb8osZ6ar1//EqqGgW9C/j5jGVFNMXI=
431431
k8s.io/cluster-bootstrap v0.31.3 h1:O1Yxk1bLaxZvmQCXLaJjj5iJD+lVMfJdRUuKgbUHPlA=
432432
k8s.io/cluster-bootstrap v0.31.3/go.mod h1:TI6TCsQQB4FfcryWgNO3SLXSKWBqHjx4DfyqSFwixj8=
433-
k8s.io/code-generator v0.31.9 h1:BHGXw8ZDNsZk0xAiBOmYxvLfSSayz1oSaBs4q3iWYkM=
434-
k8s.io/code-generator v0.31.9/go.mod h1:W7iHkUd4fWSs3lK39ab8T2Vy22HzRMkgjuS1mCW4KA8=
435-
k8s.io/component-base v0.31.9 h1:trlYOQMxtaSdEcGfQQ9BukKUS7wSIWqOrq4Jnk21hSk=
436-
k8s.io/component-base v0.31.9/go.mod h1:OKZS6U9o/vzKVcwv2zPdMiAWHWhyv5/wwv3aWB5eesI=
433+
k8s.io/code-generator v0.31.10 h1:Jd8PlF7KV3qbBZmyRPbp4ILxIX5an1/wTPad0/yWydw=
434+
k8s.io/code-generator v0.31.10/go.mod h1:jvgG+pPpGNJgAj0sC2sRrVeIyW9sYNf6dEpOI1GUYGw=
435+
k8s.io/component-base v0.31.10 h1:8daIQBYMhcnuXMD1otGkjpx4d4b0UIcg18xieLTAGA0=
436+
k8s.io/component-base v0.31.10/go.mod h1:qoSFFg2SO854XgeCJwFL/LPY/oJU1vqJHhNCEgI6xhA=
437437
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 h1:NGrVE502P0s0/1hudf8zjgwki1X/TByhmAoILTarmzo=
438438
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70/go.mod h1:VH3AT8AaQOqiGjMF9p0/IM1Dj+82ZwjfxUP1IxaHE+8=
439439
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
@@ -444,10 +444,10 @@ k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1
444444
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
445445
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY=
446446
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
447-
sigs.k8s.io/cluster-api v1.9.8 h1:VtgUzUgiE16d3P/XP7tIwPgkRXkdLvVj055o7wIQpaI=
448-
sigs.k8s.io/cluster-api v1.9.8/go.mod h1:6N73nqXbB1qTD3Z7zJc5WsRBen35JOflBdP73f23M2g=
449-
sigs.k8s.io/cluster-api/test v1.9.8 h1:WERh3yx0aHQRGoQdWZB7WvHY+xgOhWFxFzw6u9TGKXA=
450-
sigs.k8s.io/cluster-api/test v1.9.8/go.mod h1:YL2wANe8TFWFBka9CDkxjPj7KALqUtK+PtKa4ChNIok=
447+
sigs.k8s.io/cluster-api v1.9.9 h1:ZwrhTmIetan8Axceh+cuDbATrprntN6QmKRSQx7D5VU=
448+
sigs.k8s.io/cluster-api v1.9.9/go.mod h1:wii7FBtUW8x6nemHTpXlbmN73nN7M9k4weGcr/X0QBI=
449+
sigs.k8s.io/cluster-api/test v1.9.9 h1:oycgwiOC0SJesyqnN1or7Hr6v3w8H34gEwvR58YWjRY=
450+
sigs.k8s.io/cluster-api/test v1.9.9/go.mod h1:TqB13BF6sHHIMN9Dss5o9Stxcqwn3gQiBTYKq7zYQ+Q=
451451
sigs.k8s.io/controller-runtime v0.19.7 h1:DLABZfMr20A+AwCZOHhcbcu+TqBXnJZaVBri9K3EO48=
452452
sigs.k8s.io/controller-runtime v0.19.7/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
453453
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

‎hack/tools/go.mod

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/itchyny/gojq v0.12.17
99
github.com/onsi/ginkgo/v2 v2.23.4
1010
go.uber.org/mock v0.5.2
11-
k8s.io/code-generator v0.31.9
11+
k8s.io/code-generator v0.31.10
1212
sigs.k8s.io/cluster-api-provider-openstack v0.0.0
1313
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20221129083400-679ae3e9e6b6
1414
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230926180527-c93e2abcb28e
@@ -118,21 +118,21 @@ require (
118118
gopkg.in/inf.v0 v0.9.1 // indirect
119119
gopkg.in/yaml.v2 v2.4.0 // indirect
120120
gopkg.in/yaml.v3 v3.0.1 // indirect
121-
k8s.io/api v0.31.9 // indirect
122-
k8s.io/apiextensions-apiserver v0.31.9 // indirect
123-
k8s.io/apimachinery v0.31.9 // indirect
124-
k8s.io/apiserver v0.31.9 // indirect
125-
k8s.io/client-go v0.31.9 // indirect
121+
k8s.io/api v0.31.10 // indirect
122+
k8s.io/apiextensions-apiserver v0.31.10 // indirect
123+
k8s.io/apimachinery v0.31.10 // indirect
124+
k8s.io/apiserver v0.31.10 // indirect
125+
k8s.io/client-go v0.31.10 // indirect
126126
k8s.io/cluster-bootstrap v0.31.3 // indirect
127-
k8s.io/component-base v0.31.9 // indirect
127+
k8s.io/component-base v0.31.10 // indirect
128128
k8s.io/gengo v0.0.0-20201203183100-97869a43a9d9 // indirect
129129
k8s.io/gengo/v2 v2.0.0-20240826214909-a7b603a56eb7 // indirect
130130
k8s.io/klog v0.2.0 // indirect
131131
k8s.io/klog/v2 v2.130.1 // indirect
132132
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
133133
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
134134
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
135-
sigs.k8s.io/cluster-api v1.9.8 // indirect
135+
sigs.k8s.io/cluster-api v1.9.9 // indirect
136136
sigs.k8s.io/controller-runtime v0.19.7 // indirect
137137
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
138138
sigs.k8s.io/kubebuilder/docs/book/utils v0.0.0-20211028165026-57688c578b5d // indirect

‎hack/tools/go.sum

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK3
3434
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
3535
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
3636
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
37-
github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
38-
github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
37+
github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
38+
github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
3939
github.com/coredns/caddy v1.1.1 h1:2eYKZT7i6yxIfGP3qLJoJ7HAsDJqYB+X68g4NYjSrE0=
4040
github.com/coredns/caddy v1.1.1/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
4141
github.com/coredns/corefile-migration v1.0.26 h1:xiiEkVB1Dwolb24pkeDUDBfygV9/XsOSq79yFCrhptY=
@@ -438,22 +438,22 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
438438
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
439439
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
440440
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
441-
k8s.io/api v0.31.9 h1:+gN4iZNccfr6y2EX28ZgcAq4yUKNZMhg2Jl72+2hoxQ=
442-
k8s.io/api v0.31.9/go.mod h1:+rao9hnuB9AHXVoqqwxPh493H91pte1ZhfJ6oz1qLJA=
443-
k8s.io/apiextensions-apiserver v0.31.9 h1:5U+Y7vvV+lVqOBjNmmTO42PxoQrp44yzXTHievxEhdY=
444-
k8s.io/apiextensions-apiserver v0.31.9/go.mod h1:tx/XA+SO6HhoXhXqvaeF5+iHlL7dF3wWACB6plC23M8=
445-
k8s.io/apimachinery v0.31.9 h1:sLGkHzsAfWVp55os8PlKw+eeIsB3IeVU1QLb3XKHyg8=
446-
k8s.io/apimachinery v0.31.9/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
447-
k8s.io/apiserver v0.31.9 h1:Ebc8HTjGjkkiW7c2I1yK3WCv2V37P1oikVEOiw14ZeE=
448-
k8s.io/apiserver v0.31.9/go.mod h1:Nl/v7YIM6KDVDFtJDdLWQZu2Px+75vrxlMntZSU7b74=
449-
k8s.io/client-go v0.31.9 h1:SZr3xiDPdGwKeVR+jMYYubk1gJXA/go3obJeG/1Q/to=
450-
k8s.io/client-go v0.31.9/go.mod h1:ZwfOkKABRm2zSNR3s9OkADeyt0zhF9F78tJNupZM8zM=
441+
k8s.io/api v0.31.10 h1:hR39mlD3fxAMVotfj1aAEUOZhNMf+pL/XpL2zKvfLMk=
442+
k8s.io/api v0.31.10/go.mod h1:UwhlGlhYzRQuDudTdvUZ6bZZAKp0Zs82m+qEw/BZxCU=
443+
k8s.io/apiextensions-apiserver v0.31.10 h1:Scl+8yOqpbO/6eilafV7F1cpjVmobFWu8EJ3Y2TIKt4=
444+
k8s.io/apiextensions-apiserver v0.31.10/go.mod h1:0VbuO1j4eft+aMYjVy0piM+A+aITSvamJwOYRYJyHMw=
445+
k8s.io/apimachinery v0.31.10 h1:fKQxHMu8IFRsC5wsiA7ySL9Z/dw9LOmVs3cifAx1cXk=
446+
k8s.io/apimachinery v0.31.10/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
447+
k8s.io/apiserver v0.31.10 h1:oMK+nnYVh2+D7nujjeEbtBl/kbG9CyqrX06wjkFytdE=
448+
k8s.io/apiserver v0.31.10/go.mod h1:nzEhw+jN3NdDq8b+/uUqL5s4AFRmSkRv5ZJJs8eVuAc=
449+
k8s.io/client-go v0.31.10 h1:2WvGOFKKggxmx6kB6DP1NjdvLPyI6z+CtDWcQsyHpTI=
450+
k8s.io/client-go v0.31.10/go.mod h1:zRlFekIgyvhAEb8osZ6ar1//EqqGgW9C/j5jGVFNMXI=
451451
k8s.io/cluster-bootstrap v0.31.3 h1:O1Yxk1bLaxZvmQCXLaJjj5iJD+lVMfJdRUuKgbUHPlA=
452452
k8s.io/cluster-bootstrap v0.31.3/go.mod h1:TI6TCsQQB4FfcryWgNO3SLXSKWBqHjx4DfyqSFwixj8=
453-
k8s.io/code-generator v0.31.9 h1:BHGXw8ZDNsZk0xAiBOmYxvLfSSayz1oSaBs4q3iWYkM=
454-
k8s.io/code-generator v0.31.9/go.mod h1:W7iHkUd4fWSs3lK39ab8T2Vy22HzRMkgjuS1mCW4KA8=
455-
k8s.io/component-base v0.31.9 h1:trlYOQMxtaSdEcGfQQ9BukKUS7wSIWqOrq4Jnk21hSk=
456-
k8s.io/component-base v0.31.9/go.mod h1:OKZS6U9o/vzKVcwv2zPdMiAWHWhyv5/wwv3aWB5eesI=
453+
k8s.io/code-generator v0.31.10 h1:Jd8PlF7KV3qbBZmyRPbp4ILxIX5an1/wTPad0/yWydw=
454+
k8s.io/code-generator v0.31.10/go.mod h1:jvgG+pPpGNJgAj0sC2sRrVeIyW9sYNf6dEpOI1GUYGw=
455+
k8s.io/component-base v0.31.10 h1:8daIQBYMhcnuXMD1otGkjpx4d4b0UIcg18xieLTAGA0=
456+
k8s.io/component-base v0.31.10/go.mod h1:qoSFFg2SO854XgeCJwFL/LPY/oJU1vqJHhNCEgI6xhA=
457457
k8s.io/gengo v0.0.0-20201203183100-97869a43a9d9 h1:1bLA4Agvs1DILmc+q2Bbcqjx6jOHO7YEFA+G+0aTZoc=
458458
k8s.io/gengo v0.0.0-20201203183100-97869a43a9d9/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
459459
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 h1:NGrVE502P0s0/1hudf8zjgwki1X/TByhmAoILTarmzo=
@@ -469,12 +469,12 @@ k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1
469469
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
470470
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY=
471471
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
472-
sigs.k8s.io/cluster-api v1.9.8 h1:VtgUzUgiE16d3P/XP7tIwPgkRXkdLvVj055o7wIQpaI=
473-
sigs.k8s.io/cluster-api v1.9.8/go.mod h1:6N73nqXbB1qTD3Z7zJc5WsRBen35JOflBdP73f23M2g=
472+
sigs.k8s.io/cluster-api v1.9.9 h1:ZwrhTmIetan8Axceh+cuDbATrprntN6QmKRSQx7D5VU=
473+
sigs.k8s.io/cluster-api v1.9.9/go.mod h1:wii7FBtUW8x6nemHTpXlbmN73nN7M9k4weGcr/X0QBI=
474474
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20221129083400-679ae3e9e6b6 h1:YF+g/Mr0DF+R0q0tnooUWUxjZ0TtDniMj0fgSh/HA6A=
475475
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20221129083400-679ae3e9e6b6/go.mod h1:7luenhlsUTb9obnAferuDFEvhtITw7JjHpXkiDmCmKY=
476-
sigs.k8s.io/cluster-api/test v1.9.8 h1:WERh3yx0aHQRGoQdWZB7WvHY+xgOhWFxFzw6u9TGKXA=
477-
sigs.k8s.io/cluster-api/test v1.9.8/go.mod h1:YL2wANe8TFWFBka9CDkxjPj7KALqUtK+PtKa4ChNIok=
476+
sigs.k8s.io/cluster-api/test v1.9.9 h1:oycgwiOC0SJesyqnN1or7Hr6v3w8H34gEwvR58YWjRY=
477+
sigs.k8s.io/cluster-api/test v1.9.9/go.mod h1:TqB13BF6sHHIMN9Dss5o9Stxcqwn3gQiBTYKq7zYQ+Q=
478478
sigs.k8s.io/controller-runtime v0.19.7 h1:DLABZfMr20A+AwCZOHhcbcu+TqBXnJZaVBri9K3EO48=
479479
sigs.k8s.io/controller-runtime v0.19.7/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
480480
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230926180527-c93e2abcb28e h1:xYNzzoK+cwgBnaRqrYFLQCSwMAYcR6a06gf3FJ369Kw=

‎kustomize/v1beta1/default/cluster-template.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@ spec:
7373
cloud-provider: external
7474
provider-id: "openstack:///'{{ instance_id }}'"
7575
clusterConfiguration:
76-
apiServer:
77-
extraArgs:
78-
cloud-provider: external
7976
controllerManager:
8077
extraArgs:
8178
cloud-provider: external

‎templates/cluster-template-flatcar-sysext.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,6 @@ metadata:
135135
spec:
136136
kubeadmConfigSpec:
137137
clusterConfiguration:
138-
apiServer:
139-
extraArgs:
140-
cloud-provider: external
141138
controllerManager:
142139
extraArgs:
143140
cloud-provider: external

‎templates/cluster-template-flatcar.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,6 @@ metadata:
9797
spec:
9898
kubeadmConfigSpec:
9999
clusterConfiguration:
100-
apiServer:
101-
extraArgs:
102-
cloud-provider: external
103100
controllerManager:
104101
extraArgs:
105102
cloud-provider: external

0 commit comments

Comments
 (0)