Skip to content

Commit f784894

Browse files
committed
fix definition
Signed-off-by: sivchari <shibuuuu5@gmail.com>
1 parent 9b82cec commit f784894

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

test/e2e/data/infrastructure-docker/main/bases/cluster-with-topology.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ spec:
6868
minReadySeconds: 5
6969
replicas: ${WORKER_MACHINE_COUNT}
7070
failureDomains:
71-
- name: fd4
71+
- fd4
7272
variables:
7373
# We set an empty value to use the default tag kubeadm init is using.
7474
- name: etcdImageTag

test/infrastructure/docker/templates/clusterclass-quick-start.yaml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
apiVersion: cluster.x-k8s.io/v1beta1
1+
apiVersion: cluster.x-k8s.io/v1beta2
22
kind: ClusterClass
33
metadata:
44
name: quick-start
55
spec:
66
controlPlane:
77
ref:
8-
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
8+
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
99
kind: KubeadmControlPlaneTemplate
1010
name: quick-start-control-plane
1111
machineInfrastructure:
1212
ref:
1313
kind: DockerMachineTemplate
14-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
14+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
1515
name: quick-start-control-plane
1616
machineHealthCheck:
1717
unhealthyConditions:
@@ -23,7 +23,7 @@ spec:
2323
timeout: 300s
2424
infrastructure:
2525
ref:
26-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
26+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
2727
kind: DockerClusterTemplate
2828
name: quick-start-cluster
2929
workers:
@@ -32,12 +32,12 @@ spec:
3232
template:
3333
bootstrap:
3434
ref:
35-
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
35+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
3636
kind: KubeadmConfigTemplate
3737
name: quick-start-default-worker-bootstraptemplate
3838
infrastructure:
3939
ref:
40-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
40+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
4141
kind: DockerMachineTemplate
4242
name: quick-start-default-worker-machinetemplate
4343
machineHealthCheck:
@@ -53,12 +53,12 @@ spec:
5353
template:
5454
bootstrap:
5555
ref:
56-
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
56+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
5757
kind: KubeadmConfigTemplate
5858
name: quick-start-default-worker-bootstraptemplate
5959
infrastructure:
6060
ref:
61-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
61+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
6262
kind: DockerMachinePoolTemplate
6363
name: quick-start-default-worker-machinepooltemplate
6464
variables:
@@ -114,7 +114,7 @@ spec:
114114
enabledIf: '{{ ne .imageRepository "" }}'
115115
definitions:
116116
- selector:
117-
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
117+
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
118118
kind: KubeadmControlPlaneTemplate
119119
matchResources:
120120
controlPlane: true
@@ -128,7 +128,7 @@ spec:
128128
description: "Sets tag to use for the etcd image in the KubeadmControlPlane."
129129
definitions:
130130
- selector:
131-
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
131+
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
132132
kind: KubeadmControlPlaneTemplate
133133
matchResources:
134134
controlPlane: true
@@ -144,7 +144,7 @@ spec:
144144
description: "Sets tag to use for the etcd image in the KubeadmControlPlane."
145145
definitions:
146146
- selector:
147-
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
147+
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
148148
kind: KubeadmControlPlaneTemplate
149149
matchResources:
150150
controlPlane: true
@@ -158,7 +158,7 @@ spec:
158158
description: "Sets the container image that is used for running dockerMachines for the controlPlane and default-worker machineDeployments."
159159
definitions:
160160
- selector:
161-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
161+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
162162
kind: DockerMachineTemplate
163163
matchResources:
164164
machineDeploymentClass:
@@ -171,7 +171,7 @@ spec:
171171
template: |
172172
kindest/node:{{ .builtin.machineDeployment.version | replace "+" "_" }}
173173
- selector:
174-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
174+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
175175
kind: DockerMachinePoolTemplate
176176
matchResources:
177177
machinePoolClass:
@@ -184,7 +184,7 @@ spec:
184184
template: |
185185
kindest/node:{{ .builtin.machinePool.version | replace "+" "_" }}
186186
- selector:
187-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
187+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
188188
kind: DockerMachineTemplate
189189
matchResources:
190190
controlPlane: true
@@ -198,7 +198,7 @@ spec:
198198
description: "Adds an admission configuration for PodSecurity to the kube-apiserver."
199199
definitions:
200200
- selector:
201-
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
201+
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
202202
kind: KubeadmControlPlaneTemplate
203203
matchResources:
204204
controlPlane: true
@@ -241,7 +241,7 @@ spec:
241241
path: /etc/kubernetes/kube-apiserver-admission-pss.yaml
242242
enabledIf: "{{ .podSecurityStandard.enabled }}"
243243
---
244-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
244+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
245245
kind: DockerClusterTemplate
246246
metadata:
247247
name: quick-start-cluster
@@ -250,7 +250,7 @@ spec:
250250
spec: {}
251251
---
252252
kind: KubeadmControlPlaneTemplate
253-
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
253+
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
254254
metadata:
255255
name: quick-start-control-plane
256256
spec:
@@ -266,7 +266,7 @@ spec:
266266
joinConfiguration:
267267
nodeRegistration: {} # node registration parameters are automatically injected by CAPD according to the kindest/node image in use.
268268
---
269-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
269+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
270270
kind: DockerMachineTemplate
271271
metadata:
272272
name: quick-start-control-plane
@@ -277,7 +277,7 @@ spec:
277277
- containerPath: "/var/run/docker.sock"
278278
hostPath: "/var/run/docker.sock"
279279
---
280-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
280+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
281281
kind: DockerMachineTemplate
282282
metadata:
283283
name: quick-start-default-worker-machinetemplate
@@ -288,7 +288,7 @@ spec:
288288
- containerPath: "/var/run/docker.sock"
289289
hostPath: "/var/run/docker.sock"
290290
---
291-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
291+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
292292
kind: DockerMachinePoolTemplate
293293
metadata:
294294
name: quick-start-default-worker-machinepooltemplate
@@ -297,7 +297,7 @@ spec:
297297
spec:
298298
template: {}
299299
---
300-
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
300+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
301301
kind: KubeadmConfigTemplate
302302
metadata:
303303
name: quick-start-default-worker-bootstraptemplate

0 commit comments

Comments
 (0)