Skip to content

Commit

Permalink
Allow full kustomisation of aad-msi-binding.yaml
Browse files Browse the repository at this point in the history
Currently the name of the AzureIdentity/AzureIdentityBinding objects
created as part of the aad-pod-identity lz addon have hardcoded names.
This made it not possible to create more than one pair for one MSI.

This patch applies kustomise to each field allowing for more
customisation.

It also adds a new 'selector' argument in the case the user doesn't want
the name of the MSI used in this field:

managed_identities = {
  ingress_msi = {
    lz_key = "aks"
    aadpodidentity_selector = "ingress"
    msi_keys = [
      "ingress",
    ]
  }
}

If aadpodidentity_selector is not specified the MSI name is used as
before.
  • Loading branch information
brk3 committed Nov 23, 2021
1 parent 86930a5 commit e125497
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 5 deletions.
11 changes: 7 additions & 4 deletions caf_solution/add-ons/aad-pod-identity/aad-msi-binding.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
# https://github.com/Azure/aad-pod-identity/blob/b3ee1d07209f26c47a96abf3ba20749932763de6/website/content/en/docs/Concepts/azureidentity.md
#
# Note, while the ${} values are not required for kustomize to work, they signify which values are
# eligible for configuration.

apiVersion: aadpodidentity.k8s.io/v1
kind: AzureIdentity
metadata:
name: podmi-caf-rover-platform-level0
name: ${azureidentity_name}
spec:
type: 0
resourceID: ${resource_id}
Expand All @@ -12,8 +15,8 @@ spec:
apiVersion: aadpodidentity.k8s.io/v1
kind: AzureIdentityBinding
metadata:
name: podmi-gitlab-runner-binding
name: ${azureidentitybinding_name}
spec:
azureIdentity: podmi-caf-rover-platform-level0
selector: podmi-caf-rover-platform-level0
azureIdentity: ${azureidentity_name}
selector: ${azureidentity_selector}

17 changes: 16 additions & 1 deletion caf_solution/add-ons/aad-pod-identity/aad_pod_identity.tf
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,18 @@ data "kustomization_overlay" "aad_pod_identity" {

namespace = var.aad_pod_identity.namespace

patches {
patch = <<-EOF
- op: replace
path: /metadata/name
value: ${each.value.name}
EOF

target = {
kind = "AzureIdentity"
}
}

patches {
patch = <<-EOF
- op: replace
Expand Down Expand Up @@ -87,11 +99,13 @@ data "kustomization_overlay" "aad_pod_identity" {
}
}

# You can provide a managed_identities.<key>.aadpodidentity_selector to specify the value here,
# alternatively provide none to have the MSI name used as the selector.
patches {
patch = <<-EOF
- op: replace
path: /spec/selector
value: ${each.value.name}
value: ${each.value.selector}
EOF

target = {
Expand All @@ -112,6 +126,7 @@ locals {
for msi_key in value.msi_keys : {
key = key
msi_key = msi_key
selector = try(value.aadpodidentity_selector, local.remote.managed_identities[value.lz_key][msi_key].name)
client_id = local.remote.managed_identities[value.lz_key][msi_key].client_id
id = local.remote.managed_identities[value.lz_key][msi_key].id
name = local.remote.managed_identities[value.lz_key][msi_key].name
Expand Down

0 comments on commit e125497

Please sign in to comment.