test: Add azure.json path for custom cloud k8s config & Update stabil…

…ity timeout for Azure CNI network policy (#3895)
Azure · Oct 8, 2020 · c1d004e · c1d004e
1 parent 45eefc8
commit c1d004e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/parts/k8s/cloud-init/artifacts/cse_customcloud.sh b/parts/k8s/cloud-init/artifacts/cse_customcloud.sh
@@ -43,6 +43,7 @@ ensureCustomCloudSourcesList() {
 
 configureK8sCustomCloud() {
   {{- if IsAzureStackCloud}}
+  local azure_json_path="/etc/kubernetes/azure.json"
   export -f ensureAzureStackCertificates
   retrycmd 60 10 30 bash -c ensureAzureStackCertificates
   set +x
@@ -65,20 +66,20 @@ configureK8sCustomCloud() {
     SERVICE_PRINCIPAL_CLIENT_SECRET_PASSWORD=${SERVICE_PRINCIPAL_CLIENT_SECRET_PASSWORD#'"'}
     SERVICE_PRINCIPAL_CLIENT_SECRET_PASSWORD=${SERVICE_PRINCIPAL_CLIENT_SECRET_PASSWORD%'"'}
 
-    KUBERNETES_FILE_DIR=$(dirname "${AZURE_JSON_PATH}")
+    KUBERNETES_FILE_DIR=$(dirname "${azure_json_path}")
     K8S_CLIENT_CERT_PATH="${KUBERNETES_FILE_DIR}/k8s_auth_certificate.pfx"
     echo $SERVICE_PRINCIPAL_CLIENT_SECRET_CERT | base64 --decode >$K8S_CLIENT_CERT_PATH
     # shellcheck disable=SC2002,SC2005
-    echo $(cat "${AZURE_JSON_PATH}" |
+    echo $(cat "${azure_json_path}" |
       jq --arg K8S_CLIENT_CERT_PATH ${K8S_CLIENT_CERT_PATH} '. + {aadClientCertPath:($K8S_CLIENT_CERT_PATH)}' |
       jq --arg SERVICE_PRINCIPAL_CLIENT_SECRET_PASSWORD ${SERVICE_PRINCIPAL_CLIENT_SECRET_PASSWORD} '. + {aadClientCertPassword:($SERVICE_PRINCIPAL_CLIENT_SECRET_PASSWORD)}' |
-      jq 'del(.aadClientSecret)') >${AZURE_JSON_PATH}
+      jq 'del(.aadClientSecret)') >${azure_json_path}
   fi
 
   if [[ ${IDENTITY_SYSTEM,,} == "adfs" ]]; then
     # update the tenent id for ADFS environment.
     # shellcheck disable=SC2002,SC2005
-    echo $(cat "${AZURE_JSON_PATH}" | jq '.tenantId = "adfs"') >${AZURE_JSON_PATH}
+    echo $(cat "${azure_json_path}" | jq '.tenantId = "adfs"') >${azure_json_path}
   fi
   set -x
 

diff --git a/pkg/engine/templates_generated.go b/pkg/engine/templates_generated.go
diff --git a/test/e2e/kubernetes/kubernetes_test.go b/test/e2e/kubernetes/kubernetes_test.go
@@ -170,6 +170,8 @@ var _ = BeforeSuite(func() {
 	stabilityCommandTimeout = 3 * time.Second
 	if eng.ExpandedDefinition.Properties.OrchestratorProfile.KubernetesConfig.NetworkPolicy == api.NetworkPolicyCalico {
 		stabilityCommandTimeout = 10 * time.Second
+	} else if eng.ExpandedDefinition.Properties.OrchestratorProfile.KubernetesConfig.NetworkPolicy == api.NetworkPolicyAzure {
+		stabilityCommandTimeout = 15 * time.Second
 	}
 	Expect(dnsAddonName).NotTo(Equal(""))