Merge pull request #789 from nader-ziada/defaults

k8s-ci-robot · web-flow · commit 6cf2090ab429 · 2020-07-15T17:14:34.000-07:00
⚠ add variable defaults to templates
diff --git a/config/default/cloud_environment.yaml b/config/default/cloud_environment.yaml
@@ -4,4 +4,5 @@ metadata:
   name: manager-bootstrap-cloud-env
   namespace: system
 data:
-  cloud-env: ${AZURE_ENVIRONMENT}
+  cloud-env: ${AZURE_ENVIRONMENT:-"AzurePublicCloud"}
+  
diff --git a/docs/development.md b/docs/development.md
@@ -282,7 +282,7 @@ export AZURE_SSH_PUBLIC_KEY=$(cat "${SSH_KEY_FILE}.pub" | base64 | tr -d '\r\n')
 
 # To populate secret in azure.json file.
 export AZURE_JSON_B64=$(echo '{
-    "cloud": "${AZURE_ENVIRONMENT}",
+    "cloud": "${AZURE_ENVIRONMENT:="AzurePublicCloud"}",
     "tenantId": "${AZURE_TENANT_ID}",
     "subscriptionId": "${AZURE_SUBSCRIPTION_ID}",
     "aadClientId": "${AZURE_CLIENT_ID}",
@@ -291,7 +291,7 @@ export AZURE_JSON_B64=$(echo '{
     "securityGroupName": "${CLUSTER_NAME}-node-nsg",
     "location": "${AZURE_LOCATION}",
     "vmType": "vmss",
-    "vnetName": "${AZURE_VNET_NAME}",
+    "vnetName": "${AZURE_VNET_NAME:=$CLUSTER_NAME-vnet}",
     "vnetResourceGroup": "${CLUSTER_NAME}",
     "subnetName": "${CLUSTER_NAME}-node-subnet",
     "routeTableName": "${CLUSTER_NAME}-node-routetable",
@@ -302,6 +302,9 @@ export AZURE_JSON_B64=$(echo '{
 }' | envsubst | base64 | tr -d '\r\n')
 ```
 
+⚠️ Please note the generated templates include default values and therefore requrie the use of `clusterctl` to create the cluster 
+or the use of `envsubst` to replace these values 
+
 ##### Creating the cluster
 
 ⚠️ Make sure you followed the previous two steps to build the dev image and set the required environment variables before proceding.
diff --git a/hack/create-dev-cluster.sh b/hack/create-dev-cluster.sh
@@ -59,7 +59,7 @@ fi
 export AZURE_SSH_PUBLIC_KEY=$(cat "${SSH_KEY_FILE}.pub" | base64 | tr -d '\r\n')
 
 export AZURE_JSON_B64=$(echo '{
-    "cloud": "${AZURE_ENVIRONMENT}",
+    "cloud": "${AZURE_ENVIRONMENT:="AzurePublicCloud"}",
     "tenantId": "${AZURE_TENANT_ID}",
     "subscriptionId": "${AZURE_SUBSCRIPTION_ID}",
     "aadClientId": "${AZURE_CLIENT_ID}",
@@ -68,7 +68,7 @@ export AZURE_JSON_B64=$(echo '{
     "securityGroupName": "${CLUSTER_NAME}-node-nsg",
     "location": "${AZURE_LOCATION}",
     "vmType": "vmss",
-    "vnetName": "${AZURE_VNET_NAME}",
+    "vnetName": "${AZURE_VNET_NAME:=$CLUSTER_NAME-vnet}",
     "vnetResourceGroup": "${CLUSTER_NAME}",
     "subnetName": "${CLUSTER_NAME}-node-subnet",
     "routeTableName": "${CLUSTER_NAME}-node-routetable",
diff --git a/templates/cluster-template-aks.yaml b/templates/cluster-template-aks.yaml
@@ -26,7 +26,7 @@ spec:
   defaultPoolRef:
     name: agentpool0
   location: ${AZURE_LOCATION}
-  resourceGroup: ${AZURE_RESOURCE_GROUP}
+  resourceGroup: ${AZURE_RESOURCE_GROUP:=$CLUSTER_NAME}
   sshPublicKey: ${AZURE_SSH_PUBLIC_KEY}
   subscriptionID: ${AZURE_SUBSCRIPTION_ID}
   version: ${KUBERNETES_VERSION}
diff --git a/templates/cluster-template-external-cloud-provider.yaml b/templates/cluster-template-external-cloud-provider.yaml
@@ -26,8 +26,8 @@ spec:
   location: ${AZURE_LOCATION}
   networkSpec:
     vnet:
-      name: ${AZURE_VNET_NAME}
-  resourceGroup: ${AZURE_RESOURCE_GROUP}
+      name: ${AZURE_VNET_NAME:=$CLUSTER_NAME-vnet}
+  resourceGroup: ${AZURE_RESOURCE_GROUP:=$CLUSTER_NAME}
   subscriptionID: ${AZURE_SUBSCRIPTION_ID}
 ---
 apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
diff --git a/templates/cluster-template-machinepool.yaml b/templates/cluster-template-machinepool.yaml
@@ -26,8 +26,8 @@ spec:
   location: ${AZURE_LOCATION}
   networkSpec:
     vnet:
-      name: ${AZURE_VNET_NAME}
-  resourceGroup: ${AZURE_RESOURCE_GROUP}
+      name: ${AZURE_VNET_NAME:=$CLUSTER_NAME-vnet}
+  resourceGroup: ${AZURE_RESOURCE_GROUP:=$CLUSTER_NAME}
   subscriptionID: ${AZURE_SUBSCRIPTION_ID}
 ---
 apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
diff --git a/templates/cluster-template-system-assigned-identity.yaml b/templates/cluster-template-system-assigned-identity.yaml
@@ -26,8 +26,8 @@ spec:
   location: ${AZURE_LOCATION}
   networkSpec:
     vnet:
-      name: ${AZURE_VNET_NAME}
-  resourceGroup: ${AZURE_RESOURCE_GROUP}
+      name: ${AZURE_VNET_NAME:=$CLUSTER_NAME-vnet}
+  resourceGroup: ${AZURE_RESOURCE_GROUP:=$CLUSTER_NAME}
   subscriptionID: ${AZURE_SUBSCRIPTION_ID}
 ---
 apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
diff --git a/templates/cluster-template-user-assigned-identity.yaml b/templates/cluster-template-user-assigned-identity.yaml
@@ -26,8 +26,8 @@ spec:
   location: ${AZURE_LOCATION}
   networkSpec:
     vnet:
-      name: ${AZURE_VNET_NAME}
-  resourceGroup: ${AZURE_RESOURCE_GROUP}
+      name: ${AZURE_VNET_NAME:=$CLUSTER_NAME-vnet}
+  resourceGroup: ${AZURE_RESOURCE_GROUP:=$CLUSTER_NAME}
   subscriptionID: ${AZURE_SUBSCRIPTION_ID}
 ---
 apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml
@@ -26,8 +26,8 @@ spec:
   location: ${AZURE_LOCATION}
   networkSpec:
     vnet:
-      name: ${AZURE_VNET_NAME}
-  resourceGroup: ${AZURE_RESOURCE_GROUP}
+      name: ${AZURE_VNET_NAME:=$CLUSTER_NAME-vnet}
+  resourceGroup: ${AZURE_RESOURCE_GROUP:=$CLUSTER_NAME}
   subscriptionID: ${AZURE_SUBSCRIPTION_ID}
 ---
 apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
diff --git a/templates/flavors/aks/cluster-template.yaml b/templates/flavors/aks/cluster-template.yaml
@@ -29,7 +29,7 @@ metadata:
   name: ${CLUSTER_NAME}-control-plane
 spec:
   subscriptionID: ${AZURE_SUBSCRIPTION_ID}
-  resourceGroup: "${AZURE_RESOURCE_GROUP}"
+  resourceGroup: "${AZURE_RESOURCE_GROUP:=$CLUSTER_NAME}"
   location: "${AZURE_LOCATION}"
   defaultPoolRef:
     name: "agentpool0"
diff --git a/templates/flavors/base/cluster-template.yaml b/templates/flavors/base/cluster-template.yaml
@@ -21,12 +21,12 @@ kind: AzureCluster
 metadata:
   name: ${CLUSTER_NAME}
 spec:
-  resourceGroup: "${AZURE_RESOURCE_GROUP}"
+  resourceGroup: "${AZURE_RESOURCE_GROUP:=$CLUSTER_NAME}"
   location: "${AZURE_LOCATION}"
   subscriptionID: ${AZURE_SUBSCRIPTION_ID}
   networkSpec:
     vnet:
-      name: "${AZURE_VNET_NAME}"
+      name: "${AZURE_VNET_NAME:=$CLUSTER_NAME-vnet}"
 ---
 kind: KubeadmControlPlane
 apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
diff --git a/templates/test/cluster-template-prow-ci-version.yaml b/templates/test/cluster-template-prow-ci-version.yaml
@@ -29,8 +29,8 @@ spec:
   location: ${AZURE_LOCATION}
   networkSpec:
     vnet:
-      name: ${AZURE_VNET_NAME}
-  resourceGroup: ${AZURE_RESOURCE_GROUP}
+      name: ${AZURE_VNET_NAME:=$CLUSTER_NAME-vnet}
+  resourceGroup: ${AZURE_RESOURCE_GROUP:=$CLUSTER_NAME}
   subscriptionID: ${AZURE_SUBSCRIPTION_ID}
 ---
 apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
diff --git a/templates/test/cluster-template-prow-machine-pool-ci-version.yaml b/templates/test/cluster-template-prow-machine-pool-ci-version.yaml
@@ -29,8 +29,8 @@ spec:
   location: ${AZURE_LOCATION}
   networkSpec:
     vnet:
-      name: ${AZURE_VNET_NAME}
-  resourceGroup: ${AZURE_RESOURCE_GROUP}
+      name: ${AZURE_VNET_NAME:=$CLUSTER_NAME-vnet}
+  resourceGroup: ${AZURE_RESOURCE_GROUP:=$CLUSTER_NAME}
   subscriptionID: ${AZURE_SUBSCRIPTION_ID}
 ---
 apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
diff --git a/templates/test/cluster-template-prow-machine-pool.yaml b/templates/test/cluster-template-prow-machine-pool.yaml
@@ -29,8 +29,8 @@ spec:
   location: ${AZURE_LOCATION}
   networkSpec:
     vnet:
-      name: ${AZURE_VNET_NAME}
-  resourceGroup: ${AZURE_RESOURCE_GROUP}
+      name: ${AZURE_VNET_NAME:=$CLUSTER_NAME-vnet}
+  resourceGroup: ${AZURE_RESOURCE_GROUP:=$CLUSTER_NAME}
   subscriptionID: ${AZURE_SUBSCRIPTION_ID}
 ---
 apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
diff --git a/templates/test/cluster-template-prow.yaml b/templates/test/cluster-template-prow.yaml
@@ -29,8 +29,8 @@ spec:
   location: ${AZURE_LOCATION}
   networkSpec:
     vnet:
-      name: ${AZURE_VNET_NAME}
-  resourceGroup: ${AZURE_RESOURCE_GROUP}
+      name: ${AZURE_VNET_NAME:=$CLUSTER_NAME-vnet}
+  resourceGroup: ${AZURE_RESOURCE_GROUP:=$CLUSTER_NAME}
   subscriptionID: ${AZURE_SUBSCRIPTION_ID}
 ---
 apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
