Skip to content

Commit 214c107

Browse files
authored
Merge pull request #4784 from nojnhuh/bootstrap-sub
restore manager bootstrap creds for subscription ID
2 parents 39189af + 8c3deed commit 214c107

File tree

3 files changed

+26
-0
lines changed

3 files changed

+26
-0
lines changed

config/capz/credentials.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
apiVersion: v1
2+
kind: Secret
3+
metadata:
4+
name: manager-bootstrap-credentials
5+
namespace: system
6+
type: Opaque
7+
data:
8+
subscription-id: ${AZURE_SUBSCRIPTION_ID_B64:=""}

config/capz/kustomization.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ labels:
1010

1111
resources:
1212
- namespace.yaml
13+
- credentials.yaml
1314
- ../crd
1415
- ../rbac
1516
- ../manager
@@ -19,6 +20,7 @@ resources:
1920
patches:
2021
- path: manager_image_patch.yaml
2122
- path: manager_pull_policy.yaml
23+
- path: manager_credentials_patch.yaml
2224
- path: manager_webhook_patch.yaml
2325
- path: validatingwebhookcainjection_patch.yaml
2426
- path: mutatingwebhookcainjection_patch.yaml
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: controller-manager
5+
namespace: system
6+
spec:
7+
template:
8+
spec:
9+
containers:
10+
- name: manager
11+
env:
12+
- name: AZURE_SUBSCRIPTION_ID
13+
valueFrom:
14+
secretKeyRef:
15+
name: manager-bootstrap-credentials
16+
key: subscription-id

0 commit comments

Comments
 (0)