Skip to content

Commit d77b90e

Browse files
committed
Remove PKO UAMI, not requried
1 parent 44660a3 commit d77b90e

File tree

4 files changed

+1
-14
lines changed

4 files changed

+1
-14
lines changed

dev-infrastructure/templates/mgmt-cluster.bicep

-5
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,6 @@ module mgmtCluster '../modules/aks-cluster-base.bicep' = {
107107
namespace: 'maestro'
108108
serviceAccountName: 'maestro'
109109
}
110-
package_operator: {
111-
uamiName: 'package-operator'
112-
namespace: 'package-operator-system'
113-
serviceAccountName: 'package-operator'
114-
}
115110
})
116111
aksKeyVaultName: aksKeyVaultName
117112
acrPullResourceGroups: acrPullResourceGroups

pko/Makefile

+1-3
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ deploy:
3232
--set pullBinding.workloadIdentityClientId="$${IMAGE_PULLER_MI_CLIENT_ID}" \
3333
--set pullBinding.workloadIdentityTenantId="$${IMAGE_PULLER_MI_TENANT_ID}" \
3434
--set pullBinding.registry=${ARO_HCP_IMAGE_REGISTRY} \
35-
--set pullBinding.scope='repository:*:pull' \
36-
--set serviceAccount.workloadIdentityClientId="$${PKO_MI_CLIENT_ID}" \
37-
--set serviceAccount.workloadIdentityTenantId="$${PKO_MI_CLIENT_ID}"
35+
--set pullBinding.scope='repository:*:pull'
3836

3937
image:
4038
az acr login --name ${ARO_HCP_IMAGE_ACR} && \

pko/helm/templates/serviceaccount.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,5 @@ kind: ServiceAccount
33
metadata:
44
name: package-operator
55
namespace: package-operator-system
6-
annotations:
7-
azure.workload.identity/client-id: '{{ .Values.serviceAccount.workloadIdentityClientId }}'
8-
azure.workload.identity/tenant-id: '{{ .Values.serviceAccount.workloadIdentityTenantId }}'
96
labels:
107
package-operator.run/cache: "True"

pko/helm/values.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,3 @@ pullBinding:
66
scope: ""
77
workloadIdentityClientId: ""
88
workloadIdentityTenantId: ""
9-
serviceAccount:
10-
workloadIdentityClientId: ""
11-
workloadIdentityTenantId: ""

0 commit comments

Comments
 (0)