Skip to content

Commit 0e85653

Browse files
authored
Update cluster class templates with v1beta2 API changes (kubernetes-sigs#2468)
1 parent 4a0fa23 commit 0e85653

File tree

4 files changed

+54
-58
lines changed

4 files changed

+54
-58
lines changed

templates/cluster-template-powervs-clusterclass.yaml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,33 +33,32 @@ metadata:
3333
spec:
3434
controlPlane:
3535
machineInfrastructure:
36-
ref:
36+
templateRef:
3737
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
3838
kind: IBMPowerVSMachineTemplate
3939
name: ${IBMPOWERVS_CLUSTER_CLASS_NAME}-control-plane-machinetemplate
40-
ref:
40+
templateRef:
4141
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
4242
kind: KubeadmControlPlaneTemplate
4343
name: ${IBMPOWERVS_CLUSTER_CLASS_NAME}-control-plane
4444
infrastructure:
45-
ref:
45+
templateRef:
4646
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
4747
kind: IBMPowerVSClusterTemplate
4848
name: ${IBMPOWERVS_CLUSTER_CLASS_NAME}-cluster-template
4949
workers:
5050
machineDeployments:
51-
- class: default-worker
52-
template:
53-
bootstrap:
54-
ref:
55-
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
56-
kind: KubeadmConfigTemplate
57-
name: ${IBMPOWERVS_CLUSTER_CLASS_NAME}-md-0
58-
infrastructure:
59-
ref:
60-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
61-
kind: IBMPowerVSMachineTemplate
62-
name: ${IBMPOWERVS_CLUSTER_CLASS_NAME}-worker-machinetemplate
51+
- bootstrap:
52+
templateRef:
53+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
54+
kind: KubeadmConfigTemplate
55+
name: ${IBMPOWERVS_CLUSTER_CLASS_NAME}-md-0
56+
class: default-worker
57+
infrastructure:
58+
templateRef:
59+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
60+
kind: IBMPowerVSMachineTemplate
61+
name: ${IBMPOWERVS_CLUSTER_CLASS_NAME}-worker-machinetemplate
6362
---
6463
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
6564
kind: IBMPowerVSClusterTemplate

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

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,33 +33,32 @@ metadata:
3333
spec:
3434
controlPlane:
3535
machineInfrastructure:
36-
ref:
36+
templateRef:
3737
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
3838
kind: IBMPowerVSMachineTemplate
3939
name: "${IBMPOWERVS_CLUSTER_CLASS_NAME}-control-plane-machinetemplate"
40-
ref:
40+
templateRef:
4141
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
4242
kind: KubeadmControlPlaneTemplate
4343
name: "${IBMPOWERVS_CLUSTER_CLASS_NAME}-control-plane"
4444
infrastructure:
45-
ref:
45+
templateRef:
4646
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
4747
kind: IBMPowerVSClusterTemplate
4848
name: "${IBMPOWERVS_CLUSTER_CLASS_NAME}-cluster-template"
4949
workers:
5050
machineDeployments:
5151
- class: default-worker
52-
template:
53-
bootstrap:
54-
ref:
55-
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
56-
kind: KubeadmConfigTemplate
57-
name: "${IBMPOWERVS_CLUSTER_CLASS_NAME}-md-0"
58-
infrastructure:
59-
ref:
60-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
61-
kind: IBMPowerVSMachineTemplate
62-
name: "${IBMPOWERVS_CLUSTER_CLASS_NAME}-worker-machinetemplate"
52+
bootstrap:
53+
templateRef:
54+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
55+
kind: KubeadmConfigTemplate
56+
name: "${IBMPOWERVS_CLUSTER_CLASS_NAME}-md-0"
57+
infrastructure:
58+
templateRef:
59+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
60+
kind: IBMPowerVSMachineTemplate
61+
name: "${IBMPOWERVS_CLUSTER_CLASS_NAME}-worker-machinetemplate"
6362
---
6463
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
6564
kind: IBMPowerVSClusterTemplate

templates/cluster-template-vpc-clusterclass.yaml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,33 +34,32 @@ metadata:
3434
spec:
3535
controlPlane:
3636
machineInfrastructure:
37-
ref:
37+
templateRef:
3838
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
3939
kind: IBMVPCMachineTemplate
4040
name: ${IBMVPC_CLUSTER_CLASS_NAME}-control-plane-machinetemplate
41-
ref:
41+
templateRef:
4242
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
4343
kind: KubeadmControlPlaneTemplate
4444
name: ${IBMVPC_CLUSTER_CLASS_NAME}-control-plane
4545
infrastructure:
46-
ref:
46+
templateRef:
4747
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
4848
kind: IBMVPCClusterTemplate
4949
name: ${IBMVPC_CLUSTER_CLASS_NAME}-cluster-template
5050
workers:
5151
machineDeployments:
52-
- class: default-worker
53-
template:
54-
bootstrap:
55-
ref:
56-
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
57-
kind: KubeadmConfigTemplate
58-
name: ${IBMVPC_CLUSTER_CLASS_NAME}-md-0
59-
infrastructure:
60-
ref:
61-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
62-
kind: IBMVPCMachineTemplate
63-
name: ${IBMVPC_CLUSTER_CLASS_NAME}-worker-machinetemplate
52+
- bootstrap:
53+
templateRef:
54+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
55+
kind: KubeadmConfigTemplate
56+
name: ${IBMVPC_CLUSTER_CLASS_NAME}-md-0
57+
class: default-worker
58+
infrastructure:
59+
templateRef:
60+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
61+
kind: IBMVPCMachineTemplate
62+
name: ${IBMVPC_CLUSTER_CLASS_NAME}-worker-machinetemplate
6463
---
6564
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
6665
kind: IBMVPCClusterTemplate

templates/cluster-template-vpc-clusterclass/cluster-with-kcp.yaml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,33 +34,32 @@ metadata:
3434
spec:
3535
controlPlane:
3636
machineInfrastructure:
37-
ref:
37+
templateRef:
3838
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
3939
kind: IBMVPCMachineTemplate
4040
name: ${IBMVPC_CLUSTER_CLASS_NAME}-control-plane-machinetemplate
41-
ref:
41+
templateRef:
4242
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
4343
kind: KubeadmControlPlaneTemplate
4444
name: ${IBMVPC_CLUSTER_CLASS_NAME}-control-plane
4545
infrastructure:
46-
ref:
46+
templateRef:
4747
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
4848
kind: IBMVPCClusterTemplate
4949
name: ${IBMVPC_CLUSTER_CLASS_NAME}-cluster-template
5050
workers:
5151
machineDeployments:
5252
- class: default-worker
53-
template:
54-
bootstrap:
55-
ref:
56-
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
57-
kind: KubeadmConfigTemplate
58-
name: ${IBMVPC_CLUSTER_CLASS_NAME}-md-0
59-
infrastructure:
60-
ref:
61-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
62-
kind: IBMVPCMachineTemplate
63-
name: ${IBMVPC_CLUSTER_CLASS_NAME}-worker-machinetemplate
53+
bootstrap:
54+
templateRef:
55+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
56+
kind: KubeadmConfigTemplate
57+
name: ${IBMVPC_CLUSTER_CLASS_NAME}-md-0
58+
infrastructure:
59+
templateRef:
60+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
61+
kind: IBMVPCMachineTemplate
62+
name: ${IBMVPC_CLUSTER_CLASS_NAME}-worker-machinetemplate
6463
---
6564
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
6665
kind: IBMVPCClusterTemplate

0 commit comments

Comments
 (0)