Skip to content

Commit 4ed93b9

Browse files
CecileRobertMichonk8s-infra-cherrypick-robot
authored andcommitted
Remove unused multi-tenancy creds
1 parent 95b2974 commit 4ed93b9

File tree

3 files changed

+1
-5
lines changed

3 files changed

+1
-5
lines changed

hack/parse-prow-creds.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,8 @@ if [[ -n "${AZURE_CREDENTIALS:-}" ]]; then
2929
AZURE_TENANT_ID="$(parse_cred TenantID < "${AZURE_CREDENTIALS}")"
3030
AZURE_CLIENT_ID="$(parse_cred ClientID < "${AZURE_CREDENTIALS}")"
3131
AZURE_CLIENT_SECRET="$(parse_cred ClientSecret < "${AZURE_CREDENTIALS}")"
32-
AZURE_MULTI_TENANCY_ID="$(parse_cred MultiTenancyClientID < "${AZURE_CREDENTIALS}")"
33-
AZURE_MULTI_TENANCY_SECRET="$(parse_cred MultiTenancyClientSecret < "${AZURE_CREDENTIALS}")"
3432
AZURE_STORAGE_ACCOUNT="$(parse_cred StorageAccountName < "${AZURE_CREDENTIALS}")"
3533
AZURE_STORAGE_KEY="$(parse_cred StorageAccountKey < "${AZURE_CREDENTIALS}")"
3634

37-
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
35+
export AZURE_SUBSCRIPTION_ID AZURE_TENANT_ID AZURE_CLIENT_ID AZURE_CLIENT_SECRET AZURE_STORAGE_ACCOUNT AZURE_STORAGE_KEY
3836
fi

test/e2e/common.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ const (
6666
AzureVNetCidr = "AZURE_PRIVATE_VNET_CIDR"
6767
AzureNodeSubnetCidr = "AZURE_NODE_SUBNET_CIDR"
6868
AzureBastionSubnetCidr = "AZURE_BASTION_SUBNET_CIDR"
69-
MultiTenancyIdentityName = "MULTI_TENANCY_IDENTITY_NAME"
7069
ClusterIdentityName = "CLUSTER_IDENTITY_NAME"
7170
ClusterIdentityNamespace = "CLUSTER_IDENTITY_NAMESPACE"
7271
ClusterIdentitySecretName = "AZURE_CLUSTER_IDENTITY_SECRET_NAME" //nolint:gosec // Not a secret itself, just its name

test/e2e/config/azure-dev.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ variables:
166166
CONFORMANCE_IMAGE: "${CONFORMANCE_IMAGE:-}"
167167
CONFORMANCE_NODES: "${CONFORMANCE_NODES:-1}"
168168
IP_FAMILY: "IPv4" # this is used by the CAPI quickstart spec
169-
MULTI_TENANCY_IDENTITY_NAME: "multi-tenancy-identity"
170169
CLUSTER_IDENTITY_NAME: "cluster-identity-sp"
171170
NODE_DRAIN_TIMEOUT: "60s"
172171
CI_VERSION: ""

0 commit comments

Comments
 (0)