Skip to content

Commit ce7ab17

Browse files
authored
fix(bootstrap): allow for disabling azure pod id creation (#840)
Signed-off-by: David van der Spek <[email protected]>
1 parent 14f28a6 commit ce7ab17

File tree

5 files changed

+43
-5
lines changed

5 files changed

+43
-5
lines changed

bootstrap/helm/bootstrap/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ maintainers:
1010
1111
- name: David van der Spek
1212
13-
version: 0.8.72
13+
version: 0.8.73
1414
dependencies:
1515
- name: external-dns
1616
version: 6.14.1

bootstrap/helm/bootstrap/templates/azure.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{ if eq .Values.provider "azure" }}
1+
{{- if and (eq .Values.provider "azure") .Values.azurePodIdentity.enabled }}
22
apiVersion: "aadpodidentity.k8s.io/v1"
33
kind: AzureIdentity
44
metadata:
@@ -17,4 +17,4 @@ metadata:
1717
spec:
1818
azureIdentity: externaldns
1919
selector: externaldns
20-
{{ end }}
20+
{{- end }}

bootstrap/helm/bootstrap/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,3 +220,6 @@ metrics-server:
220220
tag: 0.6.2
221221
apiService:
222222
create: true
223+
224+
azurePodIdentity:
225+
enabled: true
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: azure-cluster-api-migrate-test
2+
description: Creates an AKS cluster and installs the bootstrap chart
3+
provider: AZURE
4+
primary: false
5+
private: true
6+
dependencies: []
7+
sections:
8+
- name: bootstrap
9+
configuration:
10+
- name: network_name
11+
documentation: Arbitary name for the network to place your cluster in, eg "plural"
12+
type: STRING
13+
validation:
14+
type: REGEX
15+
regex: '[a-z][\-a-z0-9]{0,61}[a-z0-9]'
16+
message: must begin with a lowercase letter, and can only contain lowercase letters, numbers or hyphens after
17+
items:
18+
- type: TERRAFORM
19+
name: azure-bootstrap
20+
- type: HELM
21+
name: bootstrap
22+
- type: HELM
23+
name: azure-identity
24+
- type: HELM
25+
name: plural-certmanager-webhook
26+
- type: HELM
27+
name: cluster-api-core
28+
- type: HELM
29+
name: cluster-api-bootstrap
30+
- type: HELM
31+
name: cluster-api-control-plane
32+
- type: HELM
33+
name: cluster-api-provider-azure
34+
- type: HELM
35+
name: cluster-api-cluster
36+
- type: HELM
37+
name: azure-workload-identity

bootstrap/plural/recipes/azure-cluster-api-simple-test.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ sections:
1919
name: azure-bootstrap
2020
- type: HELM
2121
name: bootstrap
22-
- type: HELM
23-
name: azure-identity
2422
- type: HELM
2523
name: plural-certmanager-webhook
2624
- type: HELM

0 commit comments

Comments
 (0)