build: Reorg example kustomizations (#453)

Reorganised the example kustomization following @deepakm-ntnx's
comments.

Author: jimmidyson

charts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/aws-cluster-class.yaml

@@ -21,42 +21,42 @@ spec:
       kind: AWSClusterTemplate
       name: aws-quick-start
   patches:
-    - external:
-        discoverVariablesExtension: awsclusterconfigvars.cluster-api-runtime-extensions-nutanix
-        generateExtension: awsclusterconfigpatch.cluster-api-runtime-extensions-nutanix
-      name: cluster-config
-    - external:
-        discoverVariablesExtension: awsworkerconfigvars.cluster-api-runtime-extensions-nutanix
-        generateExtension: awsworkerconfigpatch.cluster-api-runtime-extensions-nutanix
-      name: worker-config
-    - definitions:
-        - jsonPatches:
-            - op: add
-              path: /spec/template/spec/identityRef
-              value:
-                kind: AWSClusterControllerIdentity
-                name: default
-          selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
-            kind: AWSClusterTemplate
-            matchResources:
-              infrastructureCluster: true
-      description: AWSClusterStaticIdentity identityRef to use when creating the cluster
-      name: identityRef
+  - external:
+      discoverVariablesExtension: awsclusterconfigvars.cluster-api-runtime-extensions-nutanix
+      generateExtension: awsclusterconfigpatch.cluster-api-runtime-extensions-nutanix
+    name: cluster-config
+  - external:
+      discoverVariablesExtension: awsworkerconfigvars.cluster-api-runtime-extensions-nutanix
+      generateExtension: awsworkerconfigpatch.cluster-api-runtime-extensions-nutanix
+    name: worker-config
+  - definitions:
+    - jsonPatches:
+      - op: add
+        path: /spec/template/spec/identityRef
+        value:
+          kind: AWSClusterControllerIdentity
+          name: default
+      selector:
+        apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
+        kind: AWSClusterTemplate
+        matchResources:
+          infrastructureCluster: true
+    description: AWSClusterStaticIdentity identityRef to use when creating the cluster
+    name: identityRef
   workers:
     machineDeployments:
-      - class: default-worker
-        template:
-          bootstrap:
-            ref:
-              apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
-              kind: KubeadmConfigTemplate
-              name: aws-quick-start-worker-bootstraptemplate
-          infrastructure:
-            ref:
-              apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
-              kind: AWSMachineTemplate
-              name: aws-quick-start-worker-machinetemplate
+    - class: default-worker
+      template:
+        bootstrap:
+          ref:
+            apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+            kind: KubeadmConfigTemplate
+            name: aws-quick-start-worker-bootstraptemplate
+        infrastructure:
+          ref:
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
+            kind: AWSMachineTemplate
+            name: aws-quick-start-worker-machinetemplate
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
 kind: AWSClusterTemplate

charts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/docker-cluster-class.yaml

@@ -21,28 +21,28 @@ spec:
       kind: DockerClusterTemplate
       name: docker-quick-start-cluster
   patches:
-    - external:
-        discoverVariablesExtension: dockerclusterconfigvars.cluster-api-runtime-extensions-nutanix
-        generateExtension: dockerclusterconfigpatch.cluster-api-runtime-extensions-nutanix
-      name: cluster-config
-    - external:
-        discoverVariablesExtension: dockerworkerconfigvars.cluster-api-runtime-extensions-nutanix
-        generateExtension: dockerworkerconfigpatch.cluster-api-runtime-extensions-nutanix
-      name: worker-config
+  - external:
+      discoverVariablesExtension: dockerclusterconfigvars.cluster-api-runtime-extensions-nutanix
+      generateExtension: dockerclusterconfigpatch.cluster-api-runtime-extensions-nutanix
+    name: cluster-config
+  - external:
+      discoverVariablesExtension: dockerworkerconfigvars.cluster-api-runtime-extensions-nutanix
+      generateExtension: dockerworkerconfigpatch.cluster-api-runtime-extensions-nutanix
+    name: worker-config
   workers:
     machineDeployments:
-      - class: default-worker
-        template:
-          bootstrap:
-            ref:
-              apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
-              kind: KubeadmConfigTemplate
-              name: docker-quick-start-default-worker-bootstraptemplate
-          infrastructure:
-            ref:
-              apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
-              kind: DockerMachineTemplate
-              name: docker-quick-start-default-worker-machinetemplate
+    - class: default-worker
+      template:
+        bootstrap:
+          ref:
+            apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+            kind: KubeadmConfigTemplate
+            name: docker-quick-start-default-worker-bootstraptemplate
+        infrastructure:
+          ref:
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+            kind: DockerMachineTemplate
+            name: docker-quick-start-default-worker-machinetemplate
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: DockerClusterTemplate
@@ -67,10 +67,10 @@ spec:
         clusterConfiguration:
           apiServer:
             certSANs:
-              - localhost
-              - 127.0.0.1
-              - 0.0.0.0
-              - host.docker.internal
+            - localhost
+            - 127.0.0.1
+            - 0.0.0.0
+            - host.docker.internal
           controllerManager:
             extraArgs:
               enable-hostpath-provisioner: "true"
@@ -89,8 +89,8 @@ spec:
   template:
     spec:
       extraMounts:
-        - containerPath: /var/run/docker.sock
-          hostPath: /var/run/docker.sock
+      - containerPath: /var/run/docker.sock
+        hostPath: /var/run/docker.sock
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: DockerMachineTemplate
@@ -102,8 +102,8 @@ spec:
   template:
     spec:
       extraMounts:
-        - containerPath: /var/run/docker.sock
-          hostPath: /var/run/docker.sock
+      - containerPath: /var/run/docker.sock
+        hostPath: /var/run/docker.sock
 ---
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
 kind: KubeadmConfigTemplate

examples/capi-quick-start/aws-cluster-calico-crs.yaml

@@ -8,53 +8,53 @@ spec:
   clusterNetwork:
     pods:
       cidrBlocks:
-        - ${POD_CIDR:-192.168.0.0/16}
-    serviceDomain: cluster.local
+      - ${POD_CIDR:-192.168.0.0/16}
+    serviceDomain: ${SERVICE_DOMAIN:="cluster.local"}
     services:
       cidrBlocks:
-        - ${SERVICE_CIDR:-10.128.0.0/12}
+      - ${SERVICE_CIDR:-10.128.0.0/12}
   topology:
     class: aws-quick-start
     controlPlane:
       replicas: ${CONTROL_PLANE_MACHINE_COUNT}
     variables:
-      - name: clusterConfig
-        value:
-          addons:
-            clusterAutoscaler:
-              strategy: ClusterResourceSet
-            cni:
-              provider: Calico
-              strategy: ClusterResourceSet
-            cpi: {}
-            csi:
-              providers:
-                - name: aws-ebs
-            nfd:
-              strategy: ClusterResourceSet
-          aws:
-            region: us-west-2
-          controlPlane:
-            aws:
-              ami:
-                lookup:
-                  baseOS: ${AMI_LOOKUP_BASEOS}
-                  format: ${AMI_LOOKUP_FORMAT}
-                  org: "${AMI_LOOKUP_ORG}"
-      - name: workerConfig
-        value:
+    - name: clusterConfig
+      value:
+        addons:
+          clusterAutoscaler:
+            strategy: ClusterResourceSet
+          cni:
+            provider: Calico
+            strategy: ClusterResourceSet
+          cpi: {}
+          csi:
+            providers:
+            - name: aws-ebs
+          nfd:
+            strategy: ClusterResourceSet
+        aws:
+          region: us-west-2
+        controlPlane:
           aws:
             ami:
               lookup:
                 baseOS: ${AMI_LOOKUP_BASEOS}
                 format: ${AMI_LOOKUP_FORMAT}
                 org: "${AMI_LOOKUP_ORG}"
+    - name: workerConfig
+      value:
+        aws:
+          ami:
+            lookup:
+              baseOS: ${AMI_LOOKUP_BASEOS}
+              format: ${AMI_LOOKUP_FORMAT}
+              org: "${AMI_LOOKUP_ORG}"
     version: ${KUBERNETES_VERSION}
     workers:
       machineDeployments:
-        - class: default-worker
-          metadata:
-            annotations:
-              cluster.x-k8s.io/cluster-api-autoscaler-node-group-max-size: "${WORKER_MACHINE_COUNT}"
-              cluster.x-k8s.io/cluster-api-autoscaler-node-group-min-size: "${WORKER_MACHINE_COUNT}"
-          name: md-0
+      - class: default-worker
+        metadata:
+          annotations:
+            cluster.x-k8s.io/cluster-api-autoscaler-node-group-max-size: "${WORKER_MACHINE_COUNT}"
+            cluster.x-k8s.io/cluster-api-autoscaler-node-group-min-size: "${WORKER_MACHINE_COUNT}"
+        name: md-0

examples/capi-quick-start/aws-cluster-calico-helm-addon.yaml

@@ -8,53 +8,53 @@ spec:
   clusterNetwork:
     pods:
       cidrBlocks:
-        - ${POD_CIDR:-192.168.0.0/16}
-    serviceDomain: cluster.local
+      - ${POD_CIDR:-192.168.0.0/16}
+    serviceDomain: ${SERVICE_DOMAIN:="cluster.local"}
     services:
       cidrBlocks:
-        - ${SERVICE_CIDR:-10.128.0.0/12}
+      - ${SERVICE_CIDR:-10.128.0.0/12}
   topology:
     class: aws-quick-start
     controlPlane:
       replicas: ${CONTROL_PLANE_MACHINE_COUNT}
     variables:
-      - name: clusterConfig
-        value:
-          addons:
-            clusterAutoscaler:
-              strategy: HelmAddon
-            cni:
-              provider: Calico
-              strategy: HelmAddon
-            cpi: {}
-            csi:
-              providers:
-                - name: aws-ebs
-            nfd:
-              strategy: HelmAddon
-          aws:
-            region: us-west-2
-          controlPlane:
-            aws:
-              ami:
-                lookup:
-                  baseOS: ${AMI_LOOKUP_BASEOS}
-                  format: ${AMI_LOOKUP_FORMAT}
-                  org: "${AMI_LOOKUP_ORG}"
-      - name: workerConfig
-        value:
+    - name: clusterConfig
+      value:
+        addons:
+          clusterAutoscaler:
+            strategy: HelmAddon
+          cni:
+            provider: Calico
+            strategy: HelmAddon
+          cpi: {}
+          csi:
+            providers:
+            - name: aws-ebs
+          nfd:
+            strategy: HelmAddon
+        aws:
+          region: us-west-2
+        controlPlane:
           aws:
             ami:
               lookup:
                 baseOS: ${AMI_LOOKUP_BASEOS}
                 format: ${AMI_LOOKUP_FORMAT}
                 org: "${AMI_LOOKUP_ORG}"
+    - name: workerConfig
+      value:
+        aws:
+          ami:
+            lookup:
+              baseOS: ${AMI_LOOKUP_BASEOS}
+              format: ${AMI_LOOKUP_FORMAT}
+              org: "${AMI_LOOKUP_ORG}"
     version: ${KUBERNETES_VERSION}
     workers:
       machineDeployments:
-        - class: default-worker
-          metadata:
-            annotations:
-              cluster.x-k8s.io/cluster-api-autoscaler-node-group-max-size: "${WORKER_MACHINE_COUNT}"
-              cluster.x-k8s.io/cluster-api-autoscaler-node-group-min-size: "${WORKER_MACHINE_COUNT}"
-          name: md-0
+      - class: default-worker
+        metadata:
+          annotations:
+            cluster.x-k8s.io/cluster-api-autoscaler-node-group-max-size: "${WORKER_MACHINE_COUNT}"
+            cluster.x-k8s.io/cluster-api-autoscaler-node-group-min-size: "${WORKER_MACHINE_COUNT}"
+        name: md-0