Skip to content

Commit d6e535d

Browse files
Amulyam24Amulyam24
authored
Update e2e templates with v1beta2 API references (#2394)
1 parent 48aebb9 commit d6e535d

File tree

3 files changed

+46
-33
lines changed

3 files changed

+46
-33
lines changed

‎test/e2e/data/templates/cluster-template-powervs-md-remediation.yaml

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ stringData:
245245
ibmcloud_api_key: ${BASE64_API_KEY}
246246
type: addons.cluster.x-k8s.io/resource-set
247247
---
248-
apiVersion: addons.cluster.x-k8s.io/v1beta1
248+
apiVersion: addons.cluster.x-k8s.io/v1beta2
249249
kind: ClusterResourceSet
250250
metadata:
251251
name: crs-cloud-conf
@@ -262,7 +262,7 @@ spec:
262262
name: cloud-controller-manager-addon
263263
strategy: ApplyOnce
264264
---
265-
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
265+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
266266
kind: KubeadmConfigTemplate
267267
metadata:
268268
labels:
@@ -282,8 +282,10 @@ spec:
282282
nodeRegistration:
283283
criSocket: /var/run/containerd/containerd.sock
284284
kubeletExtraArgs:
285-
cloud-provider: external
286-
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
285+
- name: cloud-provider
286+
value: external
287+
- name: eviction-hard
288+
value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
287289
name: '{{ v1.local_hostname }}'
288290
preKubeadmCommands:
289291
- hostname "{{ v1.local_hostname }}"
@@ -292,7 +294,7 @@ spec:
292294
- echo "127.0.0.1 {{ v1.local_hostname }}" >>/etc/hosts
293295
- echo "{{ v1.local_hostname }}" >/etc/hostname
294296
---
295-
apiVersion: cluster.x-k8s.io/v1beta1
297+
apiVersion: cluster.x-k8s.io/v1beta2
296298
kind: Cluster
297299
metadata:
298300
labels:
@@ -309,15 +311,15 @@ spec:
309311
cidrBlocks:
310312
- ${SERVICE_CIDR:="10.128.0.0/12"}
311313
controlPlaneRef:
312-
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
314+
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
313315
kind: KubeadmControlPlane
314316
name: ${CLUSTER_NAME}-control-plane
315317
infrastructureRef:
316318
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
317319
kind: IBMPowerVSCluster
318320
name: ${CLUSTER_NAME}
319321
---
320-
apiVersion: cluster.x-k8s.io/v1beta1
322+
apiVersion: cluster.x-k8s.io/v1beta2
321323
kind: MachineDeployment
322324
metadata:
323325
name: ${CLUSTER_NAME}-md-0
@@ -332,7 +334,7 @@ spec:
332334
spec:
333335
bootstrap:
334336
configRef:
335-
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
337+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
336338
kind: KubeadmConfigTemplate
337339
name: ${CLUSTER_NAME}-md-0
338340
clusterName: ${CLUSTER_NAME}
@@ -342,7 +344,7 @@ spec:
342344
name: ${CLUSTER_NAME}-md-0
343345
version: ${KUBERNETES_VERSION}
344346
---
345-
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
347+
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
346348
kind: KubeadmControlPlane
347349
metadata:
348350
name: ${CLUSTER_NAME}-control-plane
@@ -354,12 +356,13 @@ spec:
354356
- ${IBMPOWERVS_VIP}
355357
- ${IBMPOWERVS_VIP_EXTERNAL}
356358
extraArgs:
357-
cloud-provider: external
359+
- name: cloud-provider
360+
value: external
358361
controlPlaneEndpoint: ${IBMPOWERVS_VIP}:${API_SERVER_PORT:=6443}
359362
controllerManager:
360363
extraArgs:
361-
cloud-provider: external
362-
enable-hostpath-provisioner: "true"
364+
- name: cloud-provider
365+
value: external
363366
files:
364367
- content: |
365368
apiVersion: v1
@@ -481,8 +484,10 @@ spec:
481484
nodeRegistration:
482485
criSocket: /var/run/containerd/containerd.sock
483486
kubeletExtraArgs:
484-
cloud-provider: external
485-
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
487+
- name: cloud-provider
488+
value: external
489+
- name: eviction-hard
490+
value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
486491
name: '{{ v1.local_hostname }}'
487492
joinConfiguration:
488493
discovery:
@@ -494,8 +499,10 @@ spec:
494499
nodeRegistration:
495500
criSocket: /var/run/containerd/containerd.sock
496501
kubeletExtraArgs:
497-
cloud-provider: external
498-
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
502+
- name: cloud-provider
503+
value: external
504+
- name: eviction-hard
505+
value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
499506
name: '{{ v1.local_hostname }}'
500507
preKubeadmCommands:
501508
- hostname "{{ v1.local_hostname }}"
@@ -506,7 +513,6 @@ spec:
506513
- mkdir -p /etc/pre-kubeadm-commands
507514
- for script in $(find /etc/pre-kubeadm-commands/ -name '*.sh' -type f | sort);
508515
do echo "Running script $script"; "$script"; done
509-
useExperimentalRetryJoin: true
510516
machineTemplate:
511517
infrastructureRef:
512518
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2

‎test/e2e/data/templates/cluster-template-powervs-md-remediation/patches/mhc-label.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
apiVersion: cluster.x-k8s.io/v1beta1
2+
apiVersion: cluster.x-k8s.io/v1beta2
33
kind: MachineDeployment
44
metadata:
55
name: "${CLUSTER_NAME}-md-0"

‎test/e2e/data/templates/cluster-template-vpc.yaml

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ stringData:
239239
ibmcloud_api_key: ${BASE64_API_KEY}
240240
type: addons.cluster.x-k8s.io/resource-set
241241
---
242-
apiVersion: addons.cluster.x-k8s.io/v1beta1
242+
apiVersion: addons.cluster.x-k8s.io/v1beta2
243243
kind: ClusterResourceSet
244244
metadata:
245245
name: crs-cloud-conf
@@ -256,7 +256,7 @@ spec:
256256
name: cloud-controller-manager-addon
257257
strategy: ApplyOnce
258258
---
259-
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
259+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
260260
kind: KubeadmConfigTemplate
261261
metadata:
262262
name: ${CLUSTER_NAME}-md-0
@@ -266,10 +266,12 @@ spec:
266266
joinConfiguration:
267267
nodeRegistration:
268268
kubeletExtraArgs:
269-
cloud-provider: external
270-
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
269+
- name: cloud-provider
270+
value: external
271+
- name: eviction-hard
272+
value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
271273
---
272-
apiVersion: cluster.x-k8s.io/v1beta1
274+
apiVersion: cluster.x-k8s.io/v1beta2
273275
kind: Cluster
274276
metadata:
275277
labels:
@@ -287,7 +289,7 @@ spec:
287289
cidrBlocks:
288290
- ${SERVICE_CIDR:="10.128.0.0/12"}
289291
controlPlaneRef:
290-
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
292+
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
291293
kind: KubeadmControlPlane
292294
name: ${CLUSTER_NAME}-control-plane
293295
namespace: ${NAMESPACE}
@@ -297,7 +299,7 @@ spec:
297299
name: ${CLUSTER_NAME}
298300
namespace: ${NAMESPACE}
299301
---
300-
apiVersion: cluster.x-k8s.io/v1beta1
302+
apiVersion: cluster.x-k8s.io/v1beta2
301303
kind: MachineDeployment
302304
metadata:
303305
name: ${CLUSTER_NAME}-md-0
@@ -318,7 +320,7 @@ spec:
318320
name: ${CLUSTER_NAME}-md-0
319321
version: ${KUBERNETES_VERSION}
320322
---
321-
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
323+
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
322324
kind: KubeadmControlPlane
323325
metadata:
324326
name: ${CLUSTER_NAME}-control-plane
@@ -331,11 +333,12 @@ spec:
331333
- localhost
332334
- 127.0.0.1
333335
extraArgs:
334-
cloud-provider: external
336+
- name: cloud-provider
337+
value: external
335338
controllerManager:
336339
extraArgs:
337-
cloud-provider: external
338-
enable-hostpath-provisioner: "true"
340+
- name: cloud-provider
341+
value: external
339342
dns: {}
340343
etcd: {}
341344
kubernetesVersion: ${KUBERNETES_VERSION}
@@ -345,15 +348,19 @@ spec:
345348
nodeRegistration:
346349
criSocket: /var/run/containerd/containerd.sock
347350
kubeletExtraArgs:
348-
cloud-provider: external
349-
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
351+
- name: cloud-provider
352+
value: external
353+
- name: eviction-hard
354+
value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
350355
joinConfiguration:
351356
discovery: {}
352357
nodeRegistration:
353358
criSocket: /var/run/containerd/containerd.sock
354359
kubeletExtraArgs:
355-
cloud-provider: external
356-
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
360+
- name: cloud-provider
361+
value: external
362+
- name: eviction-hard
363+
value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
357364
machineTemplate:
358365
infrastructureRef:
359366
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2

0 commit comments

Comments
 (0)