Skip to content

Commit

Permalink
various fixes and updates
Browse files Browse the repository at this point in the history
- updated msi pull controller to 0.1.7
- updated pull binding CRD for the additional workload identity fields
- updated podmonitor to use the az apigroup (we don't have core prometheus CRDs installed)
- updated VAP parameterNotFoundAction to `Allow` to mitigate a potential bug
- updated servicegroup name in pipeline.yaml for acrpull
- serialize image-puller MI federation setup (only one update at a time is supported)

Signed-off-by: Gerd Oberlechner <[email protected]>
Signed-off-by: Steve Kuznetsov <[email protected]>
  • Loading branch information
geoberle authored and stevekuznetsov committed Jan 8, 2025
1 parent 88e4d20 commit 41669b6
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions dev-infrastructure/modules/aks-cluster-base.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,10 @@ resource uami_fedcred 'Microsoft.ManagedIdentity/userAssignedIdentities/federate
}
]

//
// A C R P U L L C O N T R O L L E R
//

resource pullerIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = {
location: location
name: 'image-puller'
Expand All @@ -485,6 +489,7 @@ module acrPullerRoles 'acr/acr-permissions.bicep' = [
}
]

@batchSize(1)
resource puller_fedcred 'Microsoft.ManagedIdentity/userAssignedIdentities/federatedIdentityCredentials@2023-01-31' = [
for i in range(0, length(workloadIdentities)): {
parent: pullerIdentity
Expand All @@ -499,6 +504,7 @@ resource puller_fedcred 'Microsoft.ManagedIdentity/userAssignedIdentities/federa
}
]


// grant aroDevopsMsi the aksClusterAdmin role on the aksCluster so it can
// deploy services to the cluster
resource aroDevopsMSIClusterAdmin 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
Expand Down
4 changes: 2 additions & 2 deletions frontend/deploy/helm/frontend/templates/acrpullbinding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ metadata:
spec:
acr:
environment: PublicCloud
scope: {{ .Values.pullBinding.registry }}
server: {{ .Values.pullBinding.scope }}
server: {{ .Values.pullBinding.registry }}
scope: {{ .Values.pullBinding.scope }}
auth:
workloadIdentity:
serviceAccountRef: frontend
Expand Down

0 comments on commit 41669b6

Please sign in to comment.