Skip to content

Commit d1e00de

Browse files
committed
revert self-hosted template
Signed-off-by: Jack Francis <[email protected]>
1 parent fdccb6a commit d1e00de

File tree

3 files changed

+19
-3
lines changed

3 files changed

+19
-3
lines changed
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
3+
kind: AzureClusterIdentity
4+
metadata:
5+
name: "${CLUSTER_IDENTITY_NAME}"
6+
labels:
7+
clusterctl.cluster.x-k8s.io/move-hierarchy: "true"
8+
spec:
9+
type: ServicePrincipal
10+
allowedNamespaces: {}
11+
tenantID: "${AZURE_TENANT_ID}"
12+
clientID: "${AZURE_CLIENT_ID}"
13+
clientSecret: {"name":"${AZURE_CLUSTER_IDENTITY_SECRET_NAME}","namespace":"${AZURE_CLUSTER_IDENTITY_SECRET_NAMESPACE}"}

test/e2e/data/infrastructure-azure/v1beta1/cluster-template.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,12 @@ metadata:
268268
name: ${CLUSTER_IDENTITY_NAME}
269269
spec:
270270
allowedNamespaces: {}
271-
clientID: ${AZURE_CLIENT_ID_USER_ASSIGNED_IDENTITY}
271+
clientID: ${AZURE_CLIENT_ID}
272+
clientSecret:
273+
name: ${AZURE_CLUSTER_IDENTITY_SECRET_NAME}
274+
namespace: ${AZURE_CLUSTER_IDENTITY_SECRET_NAMESPACE}
272275
tenantID: ${AZURE_TENANT_ID}
273-
type: WorkloadIdentity
276+
type: ServicePrincipal
274277
---
275278
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
276279
kind: AzureMachineTemplate

test/e2e/data/infrastructure-azure/v1beta1/cluster-template/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Kustomization
33
resources:
44
- ../bases/cluster-with-kcp.yaml
55
- ../bases/md.yaml
6-
- ../../../../../../templates/azure-cluster-identity/azure-cluster-identity.yaml
6+
- ../../../../../../templates/azure-cluster-identity/azure-cluster-identity-sp.yaml
77
- ../../../../../../templates/addons/cluster-api-helm/calico.yaml
88
- ../../../../../../templates/addons/cluster-api-helm/azuredisk-csi-driver.yaml
99
- ../../../../../../templates/addons/cluster-api-helm/cloud-provider-azure.yaml

0 commit comments

Comments
 (0)