Template fixes

templates/flavors/aks-clusterclass-cluster/cluster.yaml

@@ -1,20 +1,21 @@
-# The Cluster object is the top level owner of all resources.
-# It coordinates between the control plane and the infrastructure/machines.
 apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   name: ${CLUSTER_NAME}
   namespace: default
 spec:
   clusterNetwork:
-    services:
+    pods:
       cidrBlocks:
       - 192.168.0.0/16
-  controlPlaneRef:
-    apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
-    kind: AzureManagedControlPlane
-    name: ${CLUSTER_NAME}
-  infrastructureRef:
-    apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
-    kind: AzureManagedCluster
-    name: ${CLUSTER_NAME}
+  topology:
+    class: default
+    version: ${KUBERNETES_VERSION}
+    workers:
+      machinePools:
+      - class: default-system
+        name: mp-0
+        replicas: 1
+      - class: default-worker
+        name: mp-1
+        replicas: 1

templates/flavors/aks-clusterclass/azure-managed-cluster-template.yaml

@@ -3,4 +3,7 @@ kind: AzureManagedClusterTemplate
 metadata:
   name: ${CLUSTER_NAME}
   namespace: default
+spec:	
+  template:	
+    spec: {}
 

templates/flavors/aks-clusterclass/azure-managed-machinepool-template.yaml

@@ -0,0 +1,23 @@
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+kind: AzureManagedMachinePoolTemplate
+metadata:
+  name: ${CLUSTER_NAME}-pool0
+  namespace: default
+spec:
+  template:
+    spec:
+      mode: System
+      name: pool0
+      sku: ${AZURE_NODE_MACHINE_TYPE}
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+kind: AzureManagedMachinePoolTemplate
+metadata:
+  name: ${CLUSTER_NAME}-pool1
+  namespace: default
+spec:
+  template:
+    spec:
+      mode: User
+      name: pool1
+      sku: ${AZURE_NODE_MACHINE_TYPE}

templates/flavors/aks-clusterclass/kubeadm-config-template.yaml

@@ -0,0 +1,47 @@
+apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+kind: KubeadmConfigTemplate
+metadata:
+  name: ${CLUSTER_NAME}-pool0
+  namespace: default
+spec:
+  template:
+    spec:
+      files:
+      - contentFrom:
+          secret:
+            key: worker-node-azure.json
+            name: replace_me
+        owner: root:root
+        path: /etc/kubernetes/azure.json
+        permissions: "0644"
+      joinConfiguration:
+        nodeRegistration:
+          kubeletExtraArgs:
+            azure-container-registry-config: /etc/kubernetes/azure.json
+            cloud-provider: external
+          name: '{{ ds.meta_data["local_hostname"] }}'
+      preKubeadmCommands: []
+---
+apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+kind: KubeadmConfigTemplate
+metadata:
+  name: ${CLUSTER_NAME}-pool1
+  namespace: default
+spec:
+  template:
+    spec:
+      files:
+      - contentFrom:
+          secret:
+            key: worker-node-azure.json
+            name: replace_me
+        owner: root:root
+        path: /etc/kubernetes/azure.json
+        permissions: "0644"
+      joinConfiguration:
+        nodeRegistration:
+          kubeletExtraArgs:
+            azure-container-registry-config: /etc/kubernetes/azure.json
+            cloud-provider: external
+          name: '{{ ds.meta_data["local_hostname"] }}'
+      preKubeadmCommands: []

templates/flavors/aks-clusterclass/kustomization.yaml

@@ -3,11 +3,8 @@ kind: Kustomization
 namespace: default
 resources:
 - clusterclass.yaml
-- cluster.yaml
 - azure-managed-controlplane-template.yaml
 - azure-managed-cluster-template.yaml
-- ../aks/machinepool.yaml
-- ../aks/azure-managed-machinepool.yaml
+- azure-managed-machinepool-template.yaml
 - ../../azure-cluster-identity
-patchesStrategicMerge:
-- patches/managedazurecluster-identity-ref.yaml
+- kubeadm-config-template.yaml

templates/flavors/clusterclass-cluster/kustomization.yaml

@@ -0,0 +1,3 @@
+namespace: default
+resources:
+- cluster.yaml

templates/flavors/clusterclass/kustomization.yaml

@@ -1,7 +1,6 @@
 namespace: default
 resources:
   - clusterclass.yaml
-  - cluster.yaml
   - azure-cluster-template.yaml
   - azure-machine-template-controlplane.yaml
   - azure-machine-template-worker.yaml