Skip to content

Commit f3b0f7a

Browse files
author
Joshua Reed
committed
Changed to match API.
1 parent 5630c69 commit f3b0f7a

3 files changed

+24
-13
lines changed

templates/cluster-template-managed-ssh.yaml

+8-5
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,11 @@ metadata:
6666
spec:
6767
template:
6868
spec:
69-
offering: ${CLOUDSTACK_CONTROL_PLANE_MACHINE_OFFERING}
7069
sshKey: ${CLOUDSTACK_SSH_KEY_NAME}
71-
template: ${CLOUDSTACK_TEMPLATE_NAME}
70+
offering:
71+
name: ${CLOUDSTACK_CONTROL_PLANE_MACHINE_OFFERING}
72+
template:
73+
name: ${CLOUDSTACK_TEMPLATE_NAME}
7274
---
7375
apiVersion: cluster.x-k8s.io/v1beta1
7476
kind: MachineDeployment
@@ -100,9 +102,11 @@ metadata:
100102
spec:
101103
template:
102104
spec:
103-
offering: ${CLOUDSTACK_WORKER_MACHINE_OFFERING}
104105
sshKey: ${CLOUDSTACK_SSH_KEY_NAME}
105-
template: ${CLOUDSTACK_TEMPLATE_NAME}
106+
offering:
107+
name: ${CLOUDSTACK_WORKER_MACHINE_OFFERING}
108+
template:
109+
name: ${CLOUDSTACK_TEMPLATE_NAME}
106110
---
107111
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
108112
kind: KubeadmConfigTemplate
@@ -118,4 +122,3 @@ spec:
118122
name: '{{ local_hostname }}'
119123
preKubeadmCommands:
120124
- swapoff -a
121-

templates/cluster-template-ssh-material.yaml

+8-4
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,10 @@ metadata:
7171
spec:
7272
template:
7373
spec:
74-
offering: ${CLOUDSTACK_CONTROL_PLANE_MACHINE_OFFERING}
75-
template: ${CLOUDSTACK_TEMPLATE_NAME}
74+
offering:
75+
name: ${CLOUDSTACK_CONTROL_PLANE_MACHINE_OFFERING}
76+
template:
77+
name: ${CLOUDSTACK_TEMPLATE_NAME}
7678
---
7779
apiVersion: cluster.x-k8s.io/v1beta1
7880
kind: MachineDeployment
@@ -104,8 +106,10 @@ metadata:
104106
spec:
105107
template:
106108
spec:
107-
offering: ${CLOUDSTACK_WORKER_MACHINE_OFFERING}
108-
template: ${CLOUDSTACK_TEMPLATE_NAME}
109+
offering:
110+
name: ${CLOUDSTACK_WORKER_MACHINE_OFFERING}
111+
template:
112+
name: ${CLOUDSTACK_TEMPLATE_NAME}
109113
---
110114
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
111115
kind: KubeadmConfigTemplate

templates/cluster-template.yaml

+8-4
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,10 @@ metadata:
6666
spec:
6767
template:
6868
spec:
69-
offering: ${CLOUDSTACK_CONTROL_PLANE_MACHINE_OFFERING}
70-
template: ${CLOUDSTACK_TEMPLATE_NAME}
69+
offering:
70+
name: ${CLOUDSTACK_CONTROL_PLANE_MACHINE_OFFERING}
71+
template:
72+
name: ${CLOUDSTACK_TEMPLATE_NAME}
7173
---
7274
apiVersion: cluster.x-k8s.io/v1beta1
7375
kind: MachineDeployment
@@ -99,8 +101,10 @@ metadata:
99101
spec:
100102
template:
101103
spec:
102-
offering: ${CLOUDSTACK_WORKER_MACHINE_OFFERING}
103-
template: ${CLOUDSTACK_TEMPLATE_NAME}
104+
offering:
105+
name: ${CLOUDSTACK_WORKER_MACHINE_OFFERING}
106+
template:
107+
name: ${CLOUDSTACK_TEMPLATE_NAME}
104108
---
105109
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
106110
kind: KubeadmConfigTemplate

0 commit comments

Comments
 (0)