diff --git a/hack/parse-prow-creds.sh b/hack/parse-prow-creds.sh index e2c0528cf93..b60356cb9ad 100755 --- a/hack/parse-prow-creds.sh +++ b/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 diff --git a/test/e2e/common.go b/test/e2e/common.go index 4221a6d5711..7143ceac1f4 100644 --- a/test/e2e/common.go +++ b/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 diff --git a/test/e2e/config/azure-dev.yaml b/test/e2e/config/azure-dev.yaml index 4617b2faab1..58a8548c9d5 100644 --- a/test/e2e/config/azure-dev.yaml +++ b/test/e2e/config/azure-dev.yaml @@ -170,7 +170,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: ""