From 8c3deed58141dcbcc21dfdaafc03a6a5d76d397f Mon Sep 17 00:00:00 2001 From: Jon Huhn Date: Fri, 26 Apr 2024 20:44:29 +0000 Subject: [PATCH] restore manager bootstrap creds for subscription ID --- config/capz/credentials.yaml | 8 ++++++++ config/capz/kustomization.yaml | 2 ++ config/capz/manager_credentials_patch.yaml | 16 ++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 config/capz/credentials.yaml create mode 100644 config/capz/manager_credentials_patch.yaml diff --git a/config/capz/credentials.yaml b/config/capz/credentials.yaml new file mode 100644 index 00000000000..e889135f3c7 --- /dev/null +++ b/config/capz/credentials.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: Secret +metadata: + name: manager-bootstrap-credentials + namespace: system +type: Opaque +data: + subscription-id: ${AZURE_SUBSCRIPTION_ID_B64:=""} diff --git a/config/capz/kustomization.yaml b/config/capz/kustomization.yaml index 6f419d67c76..d2845607c03 100644 --- a/config/capz/kustomization.yaml +++ b/config/capz/kustomization.yaml @@ -10,6 +10,7 @@ labels: resources: - namespace.yaml +- credentials.yaml - ../crd - ../rbac - ../manager @@ -19,6 +20,7 @@ resources: patches: - path: manager_image_patch.yaml - path: manager_pull_policy.yaml +- path: manager_credentials_patch.yaml - path: manager_webhook_patch.yaml - path: validatingwebhookcainjection_patch.yaml - path: mutatingwebhookcainjection_patch.yaml diff --git a/config/capz/manager_credentials_patch.yaml b/config/capz/manager_credentials_patch.yaml new file mode 100644 index 00000000000..915c3fc8563 --- /dev/null +++ b/config/capz/manager_credentials_patch.yaml @@ -0,0 +1,16 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: controller-manager + namespace: system +spec: + template: + spec: + containers: + - name: manager + env: + - name: AZURE_SUBSCRIPTION_ID + valueFrom: + secretKeyRef: + name: manager-bootstrap-credentials + key: subscription-id