use workload identity as default in all flavors

Signed-off-by: Ashutosh Kumar <[email protected]>
kubernetes-sigs · May 13, 2023 · b31fe6f · b31fe6f
1 parent 887a686
commit b31fe6f
Show file tree

Hide file tree

Showing 36 changed files with 33 additions and 144 deletions.
diff --git a/templates/azure-cluster-identity/azure-cluster-identity.yaml b/templates/azure-cluster-identity/azure-cluster-identity.yaml
@@ -6,8 +6,7 @@ metadata:
   labels:
     clusterctl.cluster.x-k8s.io/move-hierarchy: "true"
 spec:
-  type: ServicePrincipal
+  type: WorkloadIdentity
   allowedNamespaces: {}
   tenantID: "${AZURE_TENANT_ID}"
   clientID: "${AZURE_CLIENT_ID}"
-  clientSecret: {"name":"${AZURE_CLUSTER_IDENTITY_SECRET_NAME}","namespace":"${AZURE_CLUSTER_IDENTITY_SECRET_NAMESPACE}"}
diff --git a/templates/azure-cluster-identity/secret.yaml b/templates/azure-cluster-identity/secret.yaml
diff --git a/templates/cluster-template-aad.yaml b/templates/cluster-template-aad.yaml
diff --git a/templates/cluster-template-aks.yaml b/templates/cluster-template-aks.yaml
diff --git a/templates/cluster-template-azure-bastion.yaml b/templates/cluster-template-azure-bastion.yaml
diff --git a/templates/cluster-template-clusterclass.yaml b/templates/cluster-template-clusterclass.yaml
diff --git a/templates/cluster-template-dual-stack.yaml b/templates/cluster-template-dual-stack.yaml
diff --git a/templates/cluster-template-edgezone.yaml b/templates/cluster-template-edgezone.yaml
diff --git a/templates/cluster-template-ephemeral.yaml b/templates/cluster-template-ephemeral.yaml
diff --git a/templates/cluster-template-flatcar.yaml b/templates/cluster-template-flatcar.yaml
diff --git a/templates/cluster-template-ipv6.yaml b/templates/cluster-template-ipv6.yaml
diff --git a/templates/cluster-template-machinepool-windows.yaml b/templates/cluster-template-machinepool-windows.yaml
diff --git a/templates/cluster-template-machinepool.yaml b/templates/cluster-template-machinepool.yaml
diff --git a/templates/cluster-template-nvidia-gpu.yaml b/templates/cluster-template-nvidia-gpu.yaml
diff --git a/templates/cluster-template-private.yaml b/templates/cluster-template-private.yaml
diff --git a/templates/cluster-template-windows.yaml b/templates/cluster-template-windows.yaml
diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml
@@ -207,8 +207,5 @@ metadata:
 spec:
   allowedNamespaces: {}
   clientID: ${AZURE_CLIENT_ID}
-  clientSecret:
-    name: ${AZURE_CLUSTER_IDENTITY_SECRET_NAME}
-    namespace: ${AZURE_CLUSTER_IDENTITY_SECRET_NAMESPACE}
   tenantID: ${AZURE_TENANT_ID}
-  type: ServicePrincipal
+  type: WorkloadIdentity
diff --git a/templates/test/ci/cluster-template-prow-aks.yaml b/templates/test/ci/cluster-template-prow-aks.yaml
diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml
diff --git a/templates/test/ci/cluster-template-prow-clusterclass-ci-default.yaml b/templates/test/ci/cluster-template-prow-clusterclass-ci-default.yaml
diff --git a/templates/test/ci/cluster-template-prow-custom-vnet.yaml b/templates/test/ci/cluster-template-prow-custom-vnet.yaml
diff --git a/templates/test/ci/cluster-template-prow-dual-stack.yaml b/templates/test/ci/cluster-template-prow-dual-stack.yaml
diff --git a/templates/test/ci/cluster-template-prow-edgezone.yaml b/templates/test/ci/cluster-template-prow-edgezone.yaml
diff --git a/templates/test/ci/cluster-template-prow-flatcar.yaml b/templates/test/ci/cluster-template-prow-flatcar.yaml
diff --git a/templates/test/ci/cluster-template-prow-intree-cloud-provider-machine-pool.yaml b/templates/test/ci/cluster-template-prow-intree-cloud-provider-machine-pool.yaml
diff --git a/templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml b/templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml
diff --git a/templates/test/ci/cluster-template-prow-ipv6.yaml b/templates/test/ci/cluster-template-prow-ipv6.yaml
diff --git a/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml b/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml
diff --git a/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml b/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml
diff --git a/templates/test/ci/cluster-template-prow-machine-pool.yaml b/templates/test/ci/cluster-template-prow-machine-pool.yaml
diff --git a/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml b/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml
diff --git a/templates/test/ci/cluster-template-prow-workload-identity.yaml b/templates/test/ci/cluster-template-prow-workload-identity.yaml
diff --git a/templates/test/ci/cluster-template-prow.yaml b/templates/test/ci/cluster-template-prow.yaml
diff --git a/templates/test/ci/prow-private/patches/user-assigned.yaml b/templates/test/ci/prow-private/patches/user-assigned.yaml
@@ -1,8 +1,6 @@
 - op: replace
   path: /spec/type
   value: UserAssignedMSI
-- op: remove
-  path: /spec/clientSecret
 - op: add
   path: /spec/resourceID
   value: /subscriptions/${AZURE_SUBSCRIPTION_ID}/resourceGroups/${CI_RG:=capz-ci}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/${USER_IDENTITY:=cloud-provider-user-identity}