vnet peering should be done after the API server is accessible

Author: nawazkh

Tiltfile

@@ -423,10 +423,6 @@ def deploy_worker_templates(template, substitutions):
     flavor_cmd += "export CLUSTER_NAME=" + flavor.replace("windows", "win") + "-$RANDOM; echo " + yaml + "> ./.tiltbuild/" + flavor + "; cat ./.tiltbuild/" + flavor + " | " + envsubst_cmd + " | " + kubectl_cmd + " apply -f -; "
     flavor_cmd += "echo \"Cluster ${CLUSTER_NAME} created, don't forget to delete\"; "
 
-    # if using AKS as mgmt cluster, peer vnets even before kubeconfig of the deployed cluster is available
-    if ("aks" in settings.get("kustomize_substitutions", {}).get("MGMT_CLUSTER_NAME", "")) and settings.get("subscription-type", "") == "msft":
-        flavor_cmd += peer_vnets()
-
     # wait for kubeconfig to be available
     flavor_cmd += "echo \"Waiting for kubeconfig to be available\"; "
     flavor_cmd += "until " + kubectl_cmd + " get secret ${CLUSTER_NAME}-kubeconfig > /dev/null 2>&1; do sleep 5; done; "
@@ -443,6 +439,9 @@ def deploy_worker_templates(template, substitutions):
         flavor_cmd += "until " + kubectl_cmd + " --kubeconfig ./${CLUSTER_NAME}.kubeconfig get configmap kubeadm-config --namespace=kube-system > /dev/null 2>&1; do sleep 5; done; "
         flavor_cmd += kubectl_cmd + " --kubeconfig ./${CLUSTER_NAME}.kubeconfig create namespace calico-system --dry-run=client -o yaml | " + kubectl_cmd + " --kubeconfig ./${CLUSTER_NAME}.kubeconfig apply -f -; " + kubectl_cmd + " --kubeconfig ./${CLUSTER_NAME}.kubeconfig get configmap kubeadm-config --namespace=kube-system -o yaml | sed 's/namespace: kube-system/namespace: calico-system/' | " + kubectl_cmd + " --kubeconfig ./${CLUSTER_NAME}.kubeconfig apply -f -; "
 
+    # if using AKS as mgmt cluster and the user is of msft tenant, peer vnets even before kubeconfig of the deployed cluster is available
+    if ("aks" in settings.get("kustomize_substitutions", {}).get("MGMT_CLUSTER_NAME", "")) and settings.get("subscription-type", "") == "msft":
+        flavor_cmd += peer_vnets()
 
     flavor_cmd += get_addons(flavor_name)