back-compat just for CI_RG and USER_IDENTITY

Signed-off-by: Jack Francis <[email protected]>

scripts/kind-with-registry.sh

@@ -82,17 +82,7 @@ function checkAZWIENVPreReqsAndCreateFiles() {
   fi
   # Back-compat logic to deal with previous implementation of this script
   if [ -n "${SERVICE_ACCOUNT_SIGNING_PUB}" ] && [ -n "${SERVICE_ACCOUNT_SIGNING_KEY}" ]; then
-    mkdir -p "$(dirname "${SERVICE_ACCOUNT_SIGNING_PUB_FILEPATH}")"
-    mkdir -p "$(dirname "${SERVICE_ACCOUNT_SIGNING_KEY_FILEPATH}")"
-    echo "${SERVICE_ACCOUNT_SIGNING_PUB}" > "${SERVICE_ACCOUNT_SIGNING_PUB_FILEPATH}"
-    echo  "${SERVICE_ACCOUNT_SIGNING_KEY}" > "${SERVICE_ACCOUNT_SIGNING_KEY_FILEPATH}"
-    export SERVICE_ACCOUNT_ISSUER="${SERVICE_ACCOUNT_ISSUER:-https://oidcissuercapzci.blob.core.windows.net/oidc-capzci/}"
-    export USER_IDENTITY="cloud-provider-user-identity"
-    export CI_RG="capz-ci"
-    AZURE_IDENTITY_ID=$(az identity show -n "${USER_IDENTITY}" -g "${CI_RG}" --query clientId -o tsv)
-    echo "${AZURE_IDENTITY_ID}" > "${AZURE_IDENTITY_ID_FILEPATH}"
     touch "${USE_BACK_COMPAT_IDENTITY}"
-    return
   fi
   if [ -z "${SERVICE_ACCOUNT_ISSUER}" ]; then
     # check if user is logged into azure cli

templates/test/dev/custom-builds/kustomization.yaml

@@ -52,7 +52,6 @@ patches:
 - path: ../../../test/ci/patches/windows-machine-deployment-replicas.yaml
 - path: ../../../test/ci/patches/metrics-server-enabled-cluster.yaml
 - path: ../../../test/ci/patches/controller-manager-featuregates.yaml
-- path: patches/azure-cluster-identity-user-assigned.yaml
 configMapGenerator:
 - behavior: merge
   files: