Skip to content

Commit 80ab777

Browse files
Karthik-K-NKarthik-K-N
committed
Update templates to use v1beta2 version
1 parent 962c418 commit 80ab777

18 files changed

+116
-80
lines changed

‎templates/addons/crs-powervs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: addons.cluster.x-k8s.io/v1beta1
1+
apiVersion: addons.cluster.x-k8s.io/v1beta2
22
kind: ClusterResourceSet
33
metadata:
44
name: crs-cloud-conf

‎templates/addons/crs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: addons.cluster.x-k8s.io/v1beta1
1+
apiVersion: addons.cluster.x-k8s.io/v1beta2
22
kind: ClusterResourceSet
33
metadata:
44
name: crs-cloud-conf

‎templates/bases/powervs/cluster.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: cluster.x-k8s.io/v1beta1
1+
apiVersion: cluster.x-k8s.io/v1beta2
22
kind: Cluster
33
metadata:
44
labels:
@@ -18,7 +18,7 @@ spec:
1818
kind: IBMPowerVSCluster
1919
name: "${CLUSTER_NAME}"
2020
controlPlaneRef:
21-
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
21+
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
2222
kind: KubeadmControlPlane
2323
name: "${CLUSTER_NAME}-control-plane"
2424
---

‎templates/bases/powervs/kcp.yaml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kind: KubeadmControlPlane
2-
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
2+
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
33
metadata:
44
name: "${CLUSTER_NAME}-control-plane"
55
spec:
@@ -24,8 +24,10 @@ spec:
2424
nodeRegistration:
2525
criSocket: /var/run/containerd/containerd.sock
2626
kubeletExtraArgs:
27-
cloud-provider: external
28-
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
27+
- name: cloud-provider
28+
value: external
29+
- name: eviction-hard
30+
value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
2931
name: '{{ v1.local_hostname }}'
3032
joinConfiguration:
3133
discovery:
@@ -37,10 +39,11 @@ spec:
3739
nodeRegistration:
3840
criSocket: /var/run/containerd/containerd.sock
3941
kubeletExtraArgs:
40-
cloud-provider: external
41-
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
42+
- name: cloud-provider
43+
value: external
44+
- name: eviction-hard
45+
value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
4246
name: '{{ v1.local_hostname }}'
43-
useExperimentalRetryJoin: true
4447
preKubeadmCommands:
4548
- hostname "{{ v1.local_hostname }}"
4649
- echo "::1 ipv6-localhost ipv6-loopback" >/etc/hosts

‎templates/bases/powervs/kubeadm-config.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
1+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
22
kind: KubeadmConfigTemplate
33
metadata:
44
labels:
@@ -17,8 +17,10 @@ spec:
1717
nodeRegistration:
1818
criSocket: /var/run/containerd/containerd.sock
1919
kubeletExtraArgs:
20-
cloud-provider: external
21-
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
20+
- name: cloud-provider
21+
value: external
22+
- name: eviction-hard
23+
value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
2224
name: '{{ v1.local_hostname }}'
2325
preKubeadmCommands:
2426
- hostname "{{ v1.local_hostname }}"

‎templates/bases/powervs/md.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: cluster.x-k8s.io/v1beta1
1+
apiVersion: cluster.x-k8s.io/v1beta2
22
kind: MachineDeployment
33
metadata:
44
name: "${CLUSTER_NAME}-md-0"
@@ -12,7 +12,7 @@ spec:
1212
bootstrap:
1313
configRef:
1414
name: "${CLUSTER_NAME}-md-0"
15-
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
15+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
1616
kind: KubeadmConfigTemplate
1717
infrastructureRef:
1818
name: "${CLUSTER_NAME}-md-0"

‎templates/bases/vpc/kcp.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,19 @@ spec:
2727
nodeRegistration:
2828
criSocket: /var/run/containerd/containerd.sock
2929
kubeletExtraArgs:
30-
cloud-provider: external
31-
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
30+
- name: cloud-provider
31+
value: external
32+
- name: eviction-hard
33+
value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
3234
joinConfiguration:
3335
discovery: {}
3436
nodeRegistration:
3537
criSocket: /var/run/containerd/containerd.sock
3638
kubeletExtraArgs:
37-
cloud-provider: external
38-
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
39+
- name: cloud-provider
40+
value: external
41+
- name: eviction-hard
42+
value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
3943
---
4044
kind: IBMVPCMachineTemplate
4145
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2

‎templates/bases/vpc/kubeadm-config.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,7 @@ spec:
88
joinConfiguration:
99
nodeRegistration:
1010
kubeletExtraArgs:
11-
cloud-provider: external
12-
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
11+
- name: cloud-provider
12+
value: external
13+
- name: eviction-hard
14+
value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%

‎templates/cluster-template-powervs-clusterclass.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@ spec:
239239
- echo "{{ v1.local_hostname }}" >/etc/hostname
240240
- for script in $(find /etc/pre-kubeadm-commands/ -name '*.sh' -type f | sort);
241241
do echo "Running script $script"; "$script"; done
242-
useExperimentalRetryJoin: true
243242
---
244243
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
245244
kind: KubeadmConfigTemplate

‎templates/cluster-template-powervs-clusterclass/cluster-with-kcp.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,4 +239,3 @@ spec:
239239
- echo "{{ v1.local_hostname }}" >/etc/hostname
240240
- for script in $(find /etc/pre-kubeadm-commands/ -name '*.sh' -type f | sort);
241241
do echo "Running script $script"; "$script"; done
242-
useExperimentalRetryJoin: true

‎templates/cluster-template-powervs-create-infra.yaml

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: cluster.x-k8s.io/v1beta1
1+
apiVersion: cluster.x-k8s.io/v1beta2
22
kind: Cluster
33
metadata:
44
labels:
@@ -16,7 +16,7 @@ spec:
1616
cidrBlocks:
1717
- ${SERVICE_CIDR:="10.128.0.0/12"}
1818
controlPlaneRef:
19-
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
19+
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
2020
kind: KubeadmControlPlane
2121
name: ${CLUSTER_NAME}-control-plane
2222
infrastructureRef:
@@ -49,7 +49,7 @@ spec:
4949
loadBalancers:
5050
- name: ${CLUSTER_NAME}-loadbalancer
5151
---
52-
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
52+
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
5353
kind: KubeadmControlPlane
5454
metadata:
5555
name: ${CLUSTER_NAME}-control-plane
@@ -59,32 +59,38 @@ spec:
5959
clusterConfiguration:
6060
apiServer:
6161
extraArgs:
62-
cloud-provider: external
62+
- name: cloud-provider
63+
value: external
6364
controllerManager:
6465
extraArgs:
65-
cloud-provider: external
66-
enable-hostpath-provisioner: "true"
66+
- name: cloud-provider
67+
value: external
68+
- name: enable-hostpath-provisioner
69+
value: "true"
6770
initConfiguration:
6871
nodeRegistration:
6972
criSocket: /var/run/containerd/containerd.sock
7073
kubeletExtraArgs:
71-
cloud-provider: external
72-
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
74+
- name: cloud-provider
75+
value: external
76+
- name: eviction-hard
77+
value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
7378
name: '{{ v1.local_hostname }}'
7479
joinConfiguration:
7580
nodeRegistration:
7681
criSocket: /var/run/containerd/containerd.sock
7782
kubeletExtraArgs:
78-
cloud-provider: external
79-
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
83+
- name: cloud-provider
84+
value: external
85+
- name: eviction-hard
86+
value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
8087
name: '{{ v1.local_hostname }}'
8188
preKubeadmCommands:
8289
- hostname "{{ v1.local_hostname }}"
8390
- echo "::1 ipv6-localhost ipv6-loopback" >/etc/hosts
8491
- echo "127.0.0.1 localhost" >>/etc/hosts
8592
- echo "127.0.0.1 {{ v1.local_hostname }}" >>/etc/hosts
8693
- echo "{{ v1.local_hostname }}" >/etc/hostname
87-
useExperimentalRetryJoin: true
8894
machineTemplate:
8995
infrastructureRef:
9096
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
@@ -111,7 +117,7 @@ spec:
111117
serviceInstance:
112118
name: ${CLUSTER_NAME}-serviceInstance
113119
---
114-
apiVersion: cluster.x-k8s.io/v1beta1
120+
apiVersion: cluster.x-k8s.io/v1beta2
115121
kind: MachineDeployment
116122
metadata:
117123
name: ${CLUSTER_NAME}-md-0
@@ -123,7 +129,7 @@ spec:
123129
spec:
124130
bootstrap:
125131
configRef:
126-
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
132+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
127133
kind: KubeadmConfigTemplate
128134
name: ${CLUSTER_NAME}-md-0
129135
clusterName: ${CLUSTER_NAME}
@@ -151,7 +157,7 @@ spec:
151157
serviceInstance:
152158
name: ${CLUSTER_NAME}-serviceInstance
153159
---
154-
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
160+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
155161
kind: KubeadmConfigTemplate
156162
metadata:
157163
labels:
@@ -166,8 +172,10 @@ spec:
166172
nodeRegistration:
167173
criSocket: /var/run/containerd/containerd.sock
168174
kubeletExtraArgs:
169-
cloud-provider: external
170-
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
175+
- name: cloud-provider
176+
value: external
177+
- name: eviction-hard
178+
value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
171179
name: '{{ v1.local_hostname }}'
172180
preKubeadmCommands:
173181
- hostname "{{ v1.local_hostname }}"
@@ -192,7 +200,7 @@ spec:
192200
status:
193201
ready: false
194202
---
195-
apiVersion: addons.cluster.x-k8s.io/v1beta1
203+
apiVersion: addons.cluster.x-k8s.io/v1beta2
196204
kind: ClusterResourceSet
197205
metadata:
198206
name: crs-cloud-conf

‎templates/cluster-template-powervs.yaml

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: cluster.x-k8s.io/v1beta1
1+
apiVersion: cluster.x-k8s.io/v1beta2
22
kind: Cluster
33
metadata:
44
labels:
@@ -15,7 +15,7 @@ spec:
1515
cidrBlocks:
1616
- ${SERVICE_CIDR:="10.128.0.0/12"}
1717
controlPlaneRef:
18-
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
18+
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
1919
kind: KubeadmControlPlane
2020
name: ${CLUSTER_NAME}-control-plane
2121
infrastructureRef:
@@ -37,7 +37,7 @@ spec:
3737
name: ${IBMPOWERVS_NETWORK_NAME}
3838
serviceInstanceID: ${IBMPOWERVS_SERVICE_INSTANCE_ID}
3939
---
40-
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
40+
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
4141
kind: KubeadmControlPlane
4242
metadata:
4343
name: ${CLUSTER_NAME}-control-plane
@@ -49,12 +49,15 @@ spec:
4949
- ${IBMPOWERVS_VIP}
5050
- ${IBMPOWERVS_VIP_EXTERNAL}
5151
extraArgs:
52-
cloud-provider: external
52+
- name: cloud-provider
53+
value: external
5354
controlPlaneEndpoint: ${IBMPOWERVS_VIP}:${API_SERVER_PORT:=6443}
5455
controllerManager:
5556
extraArgs:
56-
cloud-provider: external
57-
enable-hostpath-provisioner: "true"
57+
- name: cloud-provider
58+
value: external
59+
- name: enable-hostpath-provisioner
60+
value: "true"
5861
files:
5962
- content: |
6063
apiVersion: v1
@@ -176,8 +179,10 @@ spec:
176179
nodeRegistration:
177180
criSocket: /var/run/containerd/containerd.sock
178181
kubeletExtraArgs:
179-
cloud-provider: external
180-
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
182+
- name: cloud-provider
183+
value: external
184+
- name: eviction-hard
185+
value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
181186
name: '{{ v1.local_hostname }}'
182187
joinConfiguration:
183188
discovery:
@@ -189,8 +194,10 @@ spec:
189194
nodeRegistration:
190195
criSocket: /var/run/containerd/containerd.sock
191196
kubeletExtraArgs:
192-
cloud-provider: external
193-
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
197+
- name: cloud-provider
198+
value: external
199+
- name: eviction-hard
200+
value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
194201
name: '{{ v1.local_hostname }}'
195202
preKubeadmCommands:
196203
- hostname "{{ v1.local_hostname }}"
@@ -201,7 +208,6 @@ spec:
201208
- mkdir -p /etc/pre-kubeadm-commands
202209
- for script in $(find /etc/pre-kubeadm-commands/ -name '*.sh' -type f | sort);
203210
do echo "Running script $script"; "$script"; done
204-
useExperimentalRetryJoin: true
205211
machineTemplate:
206212
infrastructureRef:
207213
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
@@ -228,7 +234,7 @@ spec:
228234
sshKey: ${IBMPOWERVS_SSHKEY_NAME}
229235
systemType: ${IBMPOWERVS_CONTROL_PLANE_SYSTYPE:="s922"}
230236
---
231-
apiVersion: cluster.x-k8s.io/v1beta1
237+
apiVersion: cluster.x-k8s.io/v1beta2
232238
kind: MachineDeployment
233239
metadata:
234240
name: ${CLUSTER_NAME}-md-0
@@ -239,7 +245,7 @@ spec:
239245
spec:
240246
bootstrap:
241247
configRef:
242-
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
248+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
243249
kind: KubeadmConfigTemplate
244250
name: ${CLUSTER_NAME}-md-0
245251
clusterName: ${CLUSTER_NAME}
@@ -267,7 +273,7 @@ spec:
267273
sshKey: ${IBMPOWERVS_SSHKEY_NAME}
268274
systemType: ${IBMPOWERVS_COMPUTE_SYSTYPE:="s922"}
269275
---
270-
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
276+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
271277
kind: KubeadmConfigTemplate
272278
metadata:
273279
labels:
@@ -287,8 +293,10 @@ spec:
287293
nodeRegistration:
288294
criSocket: /var/run/containerd/containerd.sock
289295
kubeletExtraArgs:
290-
cloud-provider: external
291-
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
296+
- name: cloud-provider
297+
value: external
298+
- name: eviction-hard
299+
value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
292300
name: '{{ v1.local_hostname }}'
293301
preKubeadmCommands:
294302
- hostname "{{ v1.local_hostname }}"
@@ -297,7 +305,7 @@ spec:
297305
- echo "127.0.0.1 {{ v1.local_hostname }}" >>/etc/hosts
298306
- echo "{{ v1.local_hostname }}" >/etc/hostname
299307
---
300-
apiVersion: addons.cluster.x-k8s.io/v1beta1
308+
apiVersion: addons.cluster.x-k8s.io/v1beta2
301309
kind: ClusterResourceSet
302310
metadata:
303311
name: crs-cloud-conf

‎templates/cluster-template-powervs/cluster.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: cluster.x-k8s.io/v1beta1
1+
apiVersion: cluster.x-k8s.io/v1beta2
22
kind: Cluster
33
metadata:
44
name: "${CLUSTER_NAME}"

0 commit comments

Comments
 (0)