Merge pull request #2110 from CecileRobertMichon/makefile-wait

Update make targets to grep control plane role

Author: k8s-ci-robot

Makefile

@@ -581,7 +581,7 @@ create-workload-cluster: $(ENVSUBST)
 	timeout --foreground 300 bash -c "while ! kubectl get secrets | grep $(CLUSTER_NAME)-kubeconfig; do sleep 1; done"
 	# Get kubeconfig and store it locally.
 	kubectl get secrets $(CLUSTER_NAME)-kubeconfig -o json | jq -r .data.value | base64 --decode > ./kubeconfig
-	timeout --foreground 600 bash -c "while ! kubectl --kubeconfig=./kubeconfig get nodes | grep master; do sleep 1; done"
+	timeout --foreground 600 bash -c "while ! kubectl --kubeconfig=./kubeconfig get nodes | grep control-plane; do sleep 1; done"
 
 	@echo 'run "kubectl --kubeconfig=./kubeconfig ..." to work with the new target cluster'
 
@@ -594,7 +594,7 @@ create-aks-cluster: $(KUSTOMIZE) $(ENVSUBST)
 	timeout --foreground 300 bash -c "while ! kubectl get secrets | grep $(CLUSTER_NAME)-kubeconfig; do sleep 1; done"
 	# Get kubeconfig and store it locally.
 	kubectl get secrets $(CLUSTER_NAME)-kubeconfig -o json | jq -r .data.value | base64 --decode > ./kubeconfig
-	timeout --foreground 600 bash -c "while ! kubectl --kubeconfig=./kubeconfig get nodes | grep master; do sleep 1; done"
+	timeout --foreground 600 bash -c "while ! kubectl --kubeconfig=./kubeconfig get nodes | grep control-plane; do sleep 1; done"
 
 	@echo 'run "kubectl --kubeconfig=./kubeconfig ..." to work with the new target cluster'
 

test/e2e/config/azure-dev.yaml

@@ -172,7 +172,7 @@ providers:
         new: "--v=2"
 
 variables:
-  AKS_KUBERNETES_VERSION: "${KUBERNETES_VERSION:-stable-1.19}"
+  AKS_KUBERNETES_VERSION: "${KUBERNETES_VERSION:-stable-1.22}"
   KUBERNETES_VERSION: "${KUBERNETES_VERSION:=stable-1.22}"
   ETCD_VERSION_UPGRADE_TO: "3.5.0-0"
   COREDNS_VERSION_UPGRADE_TO: "v1.8.4"