Merge pull request #2876 from k8s-infra-cherrypick-robot/cherry-pick-2837-to-release-1.6

[release-1.6] [cloud-provider-azure] Support specifying CCM cluster CIDR

Author: k8s-ci-robot

scripts/ci-entrypoint.sh

@@ -188,6 +188,15 @@ export ARTIFACTS="${ARTIFACTS:-${PWD}/_artifacts}"
 # create cluster
 create_cluster
 
+# Get CCM cluster CIDRs from Cluster object if not set
+if [[ -z "${CCM_CLUSTER_CIDR:-}" ]]; then
+    CCM_CLUSTER_CIDR=$(${KUBECTL} get cluster "${CLUSTER_NAME}" -o=jsonpath='{.spec.clusterNetwork.pods.cidrBlocks[0]}')
+    if CIDR1=$(${KUBECTL} get cluster "${CLUSTER_NAME}" -o=jsonpath='{.spec.clusterNetwork.pods.cidrBlocks[1]}' 2> /dev/null); then
+        CCM_CLUSTER_CIDR="${CCM_CLUSTER_CIDR:-}\,${CIDR1}"
+    fi
+fi
+echo "CCM cluster CIDR: ${CCM_CLUSTER_CIDR:-}"
+
 # export the target cluster KUBECONFIG if not already set
 export KUBECONFIG="${KUBECONFIG:-${PWD}/kubeconfig}"
 
@@ -225,7 +234,8 @@ if [[ -n "${TEST_CCM:-}" ]]; then
         --set cloudControllerManager.enableDynamicReloading="${ENABLE_DYNAMIC_RELOADING}" \
         --set cloudControllerManager.cloudConfig="${CLOUD_CONFIG}" \
         --set cloudControllerManager.cloudConfigSecretName="${CONFIG_SECRET_NAME}" \
-        --set cloudControllerManager.logVerbosity="${CCM_LOG_VERBOSITY}"
+        --set cloudControllerManager.logVerbosity="${CCM_LOG_VERBOSITY}" \
+        --set-string cloudControllerManager.clusterCIDR="${CCM_CLUSTER_CIDR}"
 
     echo "Waiting for all kube-system pods to be ready"
     "${KUBECTL}" wait --for=condition=Ready pod -n kube-system --all --timeout=10m