Skip to content

Commit b951b0b

Browse files
author
Cecile Robert-Michon
committed
Rename KCP infrastructureTemplate to machineTemplate
1 parent afe9c20 commit b951b0b

31 files changed

+155
-124
lines changed

‎templates/cluster-template-aad.yaml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ metadata:
3838
name: ${CLUSTER_NAME}-control-plane
3939
namespace: default
4040
spec:
41-
infrastructureTemplate:
42-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
43-
kind: AzureMachineTemplate
44-
name: ${CLUSTER_NAME}-control-plane
4541
kubeadmConfigSpec:
4642
clusterConfiguration:
4743
apiServer:
@@ -116,6 +112,11 @@ spec:
116112
- - LABEL=etcd_disk
117113
- /var/lib/etcddisk
118114
useExperimentalRetryJoin: true
115+
machineTemplate:
116+
infrastructureRef:
117+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
118+
kind: AzureMachineTemplate
119+
name: ${CLUSTER_NAME}-control-plane
119120
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
120121
version: ${KUBERNETES_VERSION}
121122
---

‎templates/cluster-template-ephemeral.yaml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ metadata:
3838
name: ${CLUSTER_NAME}-control-plane
3939
namespace: default
4040
spec:
41-
infrastructureTemplate:
42-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
43-
kind: AzureMachineTemplate
44-
name: ${CLUSTER_NAME}-control-plane
4541
kubeadmConfigSpec:
4642
clusterConfiguration:
4743
apiServer:
@@ -110,6 +106,11 @@ spec:
110106
mounts:
111107
- - LABEL=etcd_disk
112108
- /var/lib/etcddisk
109+
machineTemplate:
110+
infrastructureRef:
111+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
112+
kind: AzureMachineTemplate
113+
name: ${CLUSTER_NAME}-control-plane
113114
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
114115
version: ${KUBERNETES_VERSION}
115116
---

‎templates/cluster-template-external-cloud-provider.yaml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ metadata:
3939
name: ${CLUSTER_NAME}-control-plane
4040
namespace: default
4141
spec:
42-
infrastructureTemplate:
43-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
44-
kind: AzureMachineTemplate
45-
name: ${CLUSTER_NAME}-control-plane
4642
kubeadmConfigSpec:
4743
clusterConfiguration:
4844
apiServer:
@@ -111,6 +107,11 @@ spec:
111107
mounts:
112108
- - LABEL=etcd_disk
113109
- /var/lib/etcddisk
110+
machineTemplate:
111+
infrastructureRef:
112+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
113+
kind: AzureMachineTemplate
114+
name: ${CLUSTER_NAME}-control-plane
114115
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
115116
version: ${KUBERNETES_VERSION}
116117
---

‎templates/cluster-template-ipv6.yaml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,6 @@ metadata:
5555
name: ${CLUSTER_NAME}-control-plane
5656
namespace: default
5757
spec:
58-
infrastructureTemplate:
59-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
60-
kind: AzureMachineTemplate
61-
name: ${CLUSTER_NAME}-control-plane
6258
kubeadmConfigSpec:
6359
clusterConfiguration:
6460
apiServer:
@@ -150,6 +146,11 @@ spec:
150146
- echo "DNSStubListener=no" >> /etc/systemd/resolved.conf
151147
- mv /etc/resolv.conf /etc/resolv.conf.OLD && ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf
152148
- systemctl restart systemd-resolved
149+
machineTemplate:
150+
infrastructureRef:
151+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
152+
kind: AzureMachineTemplate
153+
name: ${CLUSTER_NAME}-control-plane
153154
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
154155
version: ${KUBERNETES_VERSION}
155156
---

‎templates/cluster-template-machinepool-system-assigned-identity.yaml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ metadata:
3838
name: ${CLUSTER_NAME}-control-plane
3939
namespace: default
4040
spec:
41-
infrastructureTemplate:
42-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
43-
kind: AzureMachineTemplate
44-
name: ${CLUSTER_NAME}-control-plane
4541
kubeadmConfigSpec:
4642
clusterConfiguration:
4743
apiServer:
@@ -110,6 +106,11 @@ spec:
110106
mounts:
111107
- - LABEL=etcd_disk
112108
- /var/lib/etcddisk
109+
machineTemplate:
110+
infrastructureRef:
111+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
112+
kind: AzureMachineTemplate
113+
name: ${CLUSTER_NAME}-control-plane
113114
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
114115
version: ${KUBERNETES_VERSION}
115116
---

‎templates/cluster-template-machinepool-user-assigned-identity.yaml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ metadata:
3838
name: ${CLUSTER_NAME}-control-plane
3939
namespace: default
4040
spec:
41-
infrastructureTemplate:
42-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
43-
kind: AzureMachineTemplate
44-
name: ${CLUSTER_NAME}-control-plane
4541
kubeadmConfigSpec:
4642
clusterConfiguration:
4743
apiServer:
@@ -110,6 +106,11 @@ spec:
110106
mounts:
111107
- - LABEL=etcd_disk
112108
- /var/lib/etcddisk
109+
machineTemplate:
110+
infrastructureRef:
111+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
112+
kind: AzureMachineTemplate
113+
name: ${CLUSTER_NAME}-control-plane
113114
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
114115
version: ${KUBERNETES_VERSION}
115116
---

‎templates/cluster-template-machinepool-windows.yaml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ metadata:
3838
name: ${CLUSTER_NAME}-control-plane
3939
namespace: default
4040
spec:
41-
infrastructureTemplate:
42-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
43-
kind: AzureMachineTemplate
44-
name: ${CLUSTER_NAME}-control-plane
4541
kubeadmConfigSpec:
4642
clusterConfiguration:
4743
apiServer:
@@ -127,6 +123,11 @@ spec:
127123
- mac=$(ip -o link | grep eth0 | grep ether | awk '{ print $17 }')
128124
- sed -i -e "s/MACADDRESS/$${mac}/g" /etc/netplan/60-eth0.yaml
129125
- netplan apply
126+
machineTemplate:
127+
infrastructureRef:
128+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
129+
kind: AzureMachineTemplate
130+
name: ${CLUSTER_NAME}-control-plane
130131
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
131132
version: ${KUBERNETES_VERSION}
132133
---

‎templates/cluster-template-machinepool.yaml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ metadata:
3838
name: ${CLUSTER_NAME}-control-plane
3939
namespace: default
4040
spec:
41-
infrastructureTemplate:
42-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
43-
kind: AzureMachineTemplate
44-
name: ${CLUSTER_NAME}-control-plane
4541
kubeadmConfigSpec:
4642
clusterConfiguration:
4743
apiServer:
@@ -110,6 +106,11 @@ spec:
110106
mounts:
111107
- - LABEL=etcd_disk
112108
- /var/lib/etcddisk
109+
machineTemplate:
110+
infrastructureRef:
111+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
112+
kind: AzureMachineTemplate
113+
name: ${CLUSTER_NAME}-control-plane
113114
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
114115
version: ${KUBERNETES_VERSION}
115116
---

‎templates/cluster-template-multi-tenancy.yaml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@ metadata:
4343
name: ${CLUSTER_NAME}-control-plane
4444
namespace: default
4545
spec:
46-
infrastructureTemplate:
47-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
48-
kind: AzureMachineTemplate
49-
name: ${CLUSTER_NAME}-control-plane
5046
kubeadmConfigSpec:
5147
clusterConfiguration:
5248
apiServer:
@@ -115,6 +111,11 @@ spec:
115111
mounts:
116112
- - LABEL=etcd_disk
117113
- /var/lib/etcddisk
114+
machineTemplate:
115+
infrastructureRef:
116+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
117+
kind: AzureMachineTemplate
118+
name: ${CLUSTER_NAME}-control-plane
118119
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
119120
version: ${KUBERNETES_VERSION}
120121
---

‎templates/cluster-template-nvidia-gpu.yaml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ metadata:
3939
name: ${CLUSTER_NAME}-control-plane
4040
namespace: default
4141
spec:
42-
infrastructureTemplate:
43-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
44-
kind: AzureMachineTemplate
45-
name: ${CLUSTER_NAME}-control-plane
4642
kubeadmConfigSpec:
4743
clusterConfiguration:
4844
apiServer:
@@ -111,6 +107,11 @@ spec:
111107
mounts:
112108
- - LABEL=etcd_disk
113109
- /var/lib/etcddisk
110+
machineTemplate:
111+
infrastructureRef:
112+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
113+
kind: AzureMachineTemplate
114+
name: ${CLUSTER_NAME}-control-plane
114115
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
115116
version: ${KUBERNETES_VERSION}
116117
---

0 commit comments

Comments
 (0)