Try to upgrade calico to 3.31

Author: zylxjtu

capz/run-capz-e2e.sh

@@ -28,7 +28,7 @@ main() {
     export GMSA="${GMSA:-""}" 
     export HYPERV="${HYPERV:-""}"
     export KPNG="${WINDOWS_KPNG:-""}"
-    export CALICO_VERSION="${CALICO_VERSION:-"v3.29.2"}"
+    export CALICO_VERSION="${CALICO_VERSION:-"v3.31.0"}"
     export TEMPLATE="${TEMPLATE:-"windows-ci.yaml"}"
     export CAPI_VERSION="${CAPI_VERSION:-"v1.7.2"}"
     export HELM_VERSION=v3.15.2
@@ -293,9 +293,6 @@ create_cluster(){
 }
 
 apply_workload_configuraiton(){
-    log "wait for cluster to stabilize"
-    timeout --foreground 300 bash -c "until kubectl get --raw /version --request-timeout 5s > /dev/null 2>&1; do sleep 3; done"
-
     log "installing calico"
     "$TOOLS_BIN_DIR"/helm repo add projectcalico https://docs.tigera.io/calico/charts
     kubectl create ns calico-system
@@ -311,6 +308,8 @@ apply_workload_configuraiton(){
 
     # get the info for the API server
     servername=$(kubectl config view -o json | jq -r '.clusters[0].cluster.server | sub("https://"; "") | split(":") | .[0]')
+    ipaddress=$(dig +short "$servername" | head -1)
+    echo "Server: $servername, IP: $ipaddress"
     port=$(kubectl config view -o json | jq -r '.clusters[0].cluster.server | sub("https://"; "") | split(":") | .[1]')
 
     kubectl apply -f - << EOF
@@ -320,7 +319,7 @@ metadata:
   name: kubernetes-services-endpoint
   namespace: tigera-operator
 data:
-  KUBERNETES_SERVICE_HOST: "${servername}"
+  KUBERNETES_SERVICE_HOST: "${ipaddress}"
   KUBERNETES_SERVICE_PORT: "${port}"
 EOF
 

capz/templates/calico/values.yaml

@@ -13,6 +13,6 @@ installation:
 # Image and registry configuration for the tigera/operator pod.
 tigeraOperator:
   image: tigera/operator
-  registry: mcr.microsoft.com/oss
+  registry: capzcicommunity.azurecr.io
 calicoctl:
-  image: mcr.microsoft.com/oss/calico/ctl
+  image: capzcicommunity.azurecr.io/calico/ctl