Merge pull request #43 from aws/fixup/template-updates

Changed to match API.

Author: rejoshed

templates/cluster-template-managed-ssh.yaml

@@ -66,9 +66,11 @@ metadata:
 spec:
   template:
     spec:
-      offering: ${CLOUDSTACK_CONTROL_PLANE_MACHINE_OFFERING}
       sshKey: ${CLOUDSTACK_SSH_KEY_NAME}
-      template: ${CLOUDSTACK_TEMPLATE_NAME}
+      offering: 
+        name: ${CLOUDSTACK_CONTROL_PLANE_MACHINE_OFFERING}
+      template: 
+        name: ${CLOUDSTACK_TEMPLATE_NAME}
 ---
 apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineDeployment
@@ -100,9 +102,11 @@ metadata:
 spec:
   template:
     spec:
-      offering: ${CLOUDSTACK_WORKER_MACHINE_OFFERING}
       sshKey: ${CLOUDSTACK_SSH_KEY_NAME}
-      template: ${CLOUDSTACK_TEMPLATE_NAME}
+      offering: 
+        name: ${CLOUDSTACK_WORKER_MACHINE_OFFERING}
+      template: 
+        name: ${CLOUDSTACK_TEMPLATE_NAME}
 ---
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
 kind: KubeadmConfigTemplate
@@ -118,4 +122,3 @@ spec:
           name: '{{ local_hostname }}'
       preKubeadmCommands:
         - swapoff -a
-

templates/cluster-template-ssh-material.yaml

@@ -71,8 +71,10 @@ metadata:
 spec:
   template:
     spec:
-      offering: ${CLOUDSTACK_CONTROL_PLANE_MACHINE_OFFERING}
-      template: ${CLOUDSTACK_TEMPLATE_NAME}
+      offering: 
+        name: ${CLOUDSTACK_CONTROL_PLANE_MACHINE_OFFERING}
+      template: 
+        name: ${CLOUDSTACK_TEMPLATE_NAME}
 ---
 apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineDeployment
@@ -104,8 +106,10 @@ metadata:
 spec:
   template:
     spec:
-      offering: ${CLOUDSTACK_WORKER_MACHINE_OFFERING}
-      template: ${CLOUDSTACK_TEMPLATE_NAME}
+      offering: 
+        name: ${CLOUDSTACK_WORKER_MACHINE_OFFERING}
+      template: 
+        name: ${CLOUDSTACK_TEMPLATE_NAME}
 ---
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
 kind: KubeadmConfigTemplate

templates/cluster-template.yaml

@@ -66,8 +66,10 @@ metadata:
 spec:
   template:
     spec:
-      offering: ${CLOUDSTACK_CONTROL_PLANE_MACHINE_OFFERING}
-      template: ${CLOUDSTACK_TEMPLATE_NAME}
+      offering: 
+        name: ${CLOUDSTACK_CONTROL_PLANE_MACHINE_OFFERING}
+      template: 
+        name: ${CLOUDSTACK_TEMPLATE_NAME}
 ---
 apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineDeployment
@@ -99,8 +101,10 @@ metadata:
 spec:
   template:
     spec:
-      offering: ${CLOUDSTACK_WORKER_MACHINE_OFFERING}
-      template: ${CLOUDSTACK_TEMPLATE_NAME}
+      offering: 
+        name: ${CLOUDSTACK_WORKER_MACHINE_OFFERING}
+      template: 
+        name: ${CLOUDSTACK_TEMPLATE_NAME}
 ---
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
 kind: KubeadmConfigTemplate