Skip to content

Commit cbc99a5

Browse files
authored
Merge pull request #5047 from nojnhuh/revert-custom-cloud-config
set AZURE_CLIENT_ID_USER_ASSIGNED_IDENTITY for create-custom-cloud-provider-config.sh
2 parents 55c6e76 + 403ef86 commit cbc99a5

File tree

2 files changed

+1
-1
lines changed

2 files changed

+1
-1
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST) $(KUBECTL) $(KIND) ## Create
308308
./hack/install-cert-manager.sh
309309

310310
# Create customized cloud provider configs
311+
AZURE_CLIENT_ID_USER_ASSIGNED_IDENTITY="$${AZURE_CLIENT_ID_USER_ASSIGNED_IDENTITY:-$$(cat $(AZURE_IDENTITY_ID_FILEPATH))}" \
311312
./hack/create-custom-cloud-provider-config.sh
312313

313314
# Deploy CAPI

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ if [[ -n "${CUSTOM_CLOUD_PROVIDER_CONFIG:-}" ]]; then
3131
CLOUD_PROVIDER_CONFIG="${CUSTOM_CLOUD_PROVIDER_CONFIG:-}"
3232
fi
3333

34-
echo "curling ${CLOUD_PROVIDER_CONFIG}"
3534
curl --retry 3 -sL -o tmp_azure_json "${CLOUD_PROVIDER_CONFIG}"
3635
"${ENVSUBST}" < tmp_azure_json > azure_json
3736
"${KUBECTL}" delete secret "${CLUSTER_NAME}-control-plane-azure-json" -n default || true

0 commit comments

Comments
 (0)