Merge pull request #5050 from k8s-infra-cherrypick-robot/cherry-pick-…

…5047-to-release-1.16

[release-1.16] set AZURE_CLIENT_ID_USER_ASSIGNED_IDENTITY for create-custom-cloud-provider-config.sh

Makefile

@@ -308,6 +308,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST) $(KUBECTL) $(KIND) ## Create
 	./hack/install-cert-manager.sh
 
 	# Create customized cloud provider configs
+	AZURE_CLIENT_ID_USER_ASSIGNED_IDENTITY="$${AZURE_CLIENT_ID_USER_ASSIGNED_IDENTITY:-$$(cat $(AZURE_IDENTITY_ID_FILEPATH))}" \
 	./hack/create-custom-cloud-provider-config.sh
 
 	# Deploy CAPI

hack/create-custom-cloud-provider-config.sh

@@ -31,7 +31,6 @@ if [[ -n "${CUSTOM_CLOUD_PROVIDER_CONFIG:-}" ]]; then
   CLOUD_PROVIDER_CONFIG="${CUSTOM_CLOUD_PROVIDER_CONFIG:-}"
 fi
 
-echo "curling ${CLOUD_PROVIDER_CONFIG}"
 curl --retry 3 -sL -o tmp_azure_json "${CLOUD_PROVIDER_CONFIG}"
 "${ENVSUBST}" < tmp_azure_json > azure_json
 "${KUBECTL}" delete secret "${CLUSTER_NAME}-control-plane-azure-json" -n default || true