From 55aee765e47e5a99c07bddb67965f183ebd16b49 Mon Sep 17 00:00:00 2001
From: zawachte-msft <zawachte@microsoft.com>
Date: Thu, 3 Sep 2020 07:29:45 -0700
Subject: [PATCH] use default

---
 templates/flavors/base/cluster-template.yaml   | 14 ++++++++------
 templates/flavors/default/patches/default.yaml |  6 ++++--
 templates/flavors/mgmt/mgmt-machine.yaml       |  4 ++--
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/templates/flavors/base/cluster-template.yaml b/templates/flavors/base/cluster-template.yaml
index 2f415333..7c4095fa 100644
--- a/templates/flavors/base/cluster-template.yaml
+++ b/templates/flavors/base/cluster-template.yaml
@@ -10,7 +10,7 @@ spec:
         osType: "Linux"
       location: "westus"
       vmSize: ${AZURESTACKHCI_WORKER_MACHINE_TYPE}
-      sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY}
+      sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY:=""}
 ---
 kind: AzureStackHCIMachineTemplate
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
@@ -23,7 +23,7 @@ spec:
         osType: "Linux"
       location: "westus"
       vmSize: ${AZURESTACKHCI_CONTROL_PLANE_MACHINE_TYPE}
-      sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY}
+      sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY:=""}
 ---
 apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
 kind: KubeadmConfigTemplate
@@ -52,7 +52,7 @@ spec:
         osType: "Windows"
       location: "westus"
       vmSize: ${AZURESTACKHCI_WINDOWS_WORKER_MACHINE_TYPE}
-      sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY}
+      sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY:=""}
 ---
 apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
 kind: KubeadmConfigTemplate
@@ -201,9 +201,11 @@ metadata:
 spec:
   clusterNetwork:
     pods:
-      cidrBlocks: ["${AZURESTACKHCI_POD_CIDR}"]
+      cidrBlocks: 
+      - ${AZURESTACKHCI_POD_CIDR:=""}
     services:
-      cidrBlocks: ["${AZURESTACKHCI_SERVICE_CIDR}"]
+      cidrBlocks: 
+      - ${AZURESTACKHCI_SERVICE_CIDR:=""}
   infrastructureRef:
     apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
     kind: AzureStackHCICluster
@@ -222,7 +224,7 @@ spec:
   azureStackHCILoadBalancer:
     image:
       osType: "Linux"
-    sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY}
+    sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY:=""}
     vmSize: "${AZURESTACKHCI_LOAD_BALANCER_MACHINE_TYPE}"
   version: "${KUBERNETES_VERSION}"
 ---
diff --git a/templates/flavors/default/patches/default.yaml b/templates/flavors/default/patches/default.yaml
index 5e638c98..d1c4cc66 100644
--- a/templates/flavors/default/patches/default.yaml
+++ b/templates/flavors/default/patches/default.yaml
@@ -6,9 +6,11 @@ metadata:
 spec:
   clusterNetwork:
     pods:
-      cidrBlocks: ["${AZURESTACKHCI_POD_CIDR}"]
+      cidrBlocks: 
+      - ${AZURESTACKHCI_POD_CIDR:=""}
     services:
-      cidrBlocks: ["${AZURESTACKHCI_SERVICE_CIDR}"]
+      cidrBlocks: 
+      - ${AZURESTACKHCI_SERVICE_CIDR:=""}
   infrastructureRef:
     apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
     kind: AzureStackHCICluster
diff --git a/templates/flavors/mgmt/mgmt-machine.yaml b/templates/flavors/mgmt/mgmt-machine.yaml
index 22dec3c0..c41c7321 100644
--- a/templates/flavors/mgmt/mgmt-machine.yaml
+++ b/templates/flavors/mgmt/mgmt-machine.yaml
@@ -4,7 +4,7 @@ kind: Machine
 metadata:
   labels:
     cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME}
-    cluster.x-k8s.io/control-plane: "true"
+    cluster.x-k8s.io/control-plane: ""
   name: ${CLUSTER_NAME}-control-plane-0
   namespace: default
 spec:
@@ -32,7 +32,7 @@ metadata:
 spec:
   location: westus
   providerID: moc://${CLUSTER_NAME}-control-plane-0
-  sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY}
+  sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY:=""}
   vmSize: ${AZURESTACKHCI_CONTROL_PLANE_MACHINE_TYPE}
 ---
 apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3