Merge pull request #3802 from k8s-infra-cherrypick-robot/cherry-pick-3797-to-release-1.9

[release-1.9] Remove unused multi-tenancy creds

Author: k8s-ci-robot

hack/parse-prow-creds.sh

@@ -29,10 +29,8 @@ if [[ -n "${AZURE_CREDENTIALS:-}" ]]; then
     AZURE_TENANT_ID="$(parse_cred TenantID < "${AZURE_CREDENTIALS}")"
     AZURE_CLIENT_ID="$(parse_cred ClientID < "${AZURE_CREDENTIALS}")"
     AZURE_CLIENT_SECRET="$(parse_cred ClientSecret < "${AZURE_CREDENTIALS}")"
-    AZURE_MULTI_TENANCY_ID="$(parse_cred MultiTenancyClientID < "${AZURE_CREDENTIALS}")"
-    AZURE_MULTI_TENANCY_SECRET="$(parse_cred MultiTenancyClientSecret < "${AZURE_CREDENTIALS}")"
     AZURE_STORAGE_ACCOUNT="$(parse_cred StorageAccountName < "${AZURE_CREDENTIALS}")"
     AZURE_STORAGE_KEY="$(parse_cred StorageAccountKey < "${AZURE_CREDENTIALS}")"
 
-    export AZURE_SUBSCRIPTION_ID AZURE_TENANT_ID AZURE_CLIENT_ID AZURE_CLIENT_SECRET AZURE_MULTI_TENANCY_ID AZURE_MULTI_TENANCY_SECRET AZURE_STORAGE_ACCOUNT AZURE_STORAGE_KEY
+    export AZURE_SUBSCRIPTION_ID AZURE_TENANT_ID AZURE_CLIENT_ID AZURE_CLIENT_SECRET AZURE_STORAGE_ACCOUNT AZURE_STORAGE_KEY
 fi

test/e2e/common.go

@@ -66,7 +66,6 @@ const (
 	AzureVNetCidr                   = "AZURE_PRIVATE_VNET_CIDR"
 	AzureNodeSubnetCidr             = "AZURE_NODE_SUBNET_CIDR"
 	AzureBastionSubnetCidr          = "AZURE_BASTION_SUBNET_CIDR"
-	MultiTenancyIdentityName        = "MULTI_TENANCY_IDENTITY_NAME"
 	ClusterIdentityName             = "CLUSTER_IDENTITY_NAME"
 	ClusterIdentityNamespace        = "CLUSTER_IDENTITY_NAMESPACE"
 	ClusterIdentitySecretName       = "AZURE_CLUSTER_IDENTITY_SECRET_NAME"      //nolint:gosec // Not a secret itself, just its name

test/e2e/config/azure-dev.yaml

@@ -166,7 +166,6 @@ variables:
   CONFORMANCE_IMAGE: "${CONFORMANCE_IMAGE:-}"
   CONFORMANCE_NODES: "${CONFORMANCE_NODES:-1}"
   IP_FAMILY: "IPv4" # this is used by the CAPI quickstart spec
-  MULTI_TENANCY_IDENTITY_NAME: "multi-tenancy-identity"
   CLUSTER_IDENTITY_NAME: "cluster-identity-sp"
   NODE_DRAIN_TIMEOUT: "60s"
   CI_VERSION: ""