Skip to content

Commit

Permalink
fix(bootstrap): allow for disabling azure pod id creation (#840)
Browse files Browse the repository at this point in the history
Signed-off-by: David van der Spek <[email protected]>
  • Loading branch information
davidspek authored Sep 7, 2023
1 parent 14f28a6 commit ce7ab17
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 5 deletions.
2 changes: 1 addition & 1 deletion bootstrap/helm/bootstrap/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ maintainers:
email: [email protected]
- name: David van der Spek
email: [email protected]
version: 0.8.72
version: 0.8.73
dependencies:
- name: external-dns
version: 6.14.1
Expand Down
4 changes: 2 additions & 2 deletions bootstrap/helm/bootstrap/templates/azure.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{ if eq .Values.provider "azure" }}
{{- if and (eq .Values.provider "azure") .Values.azurePodIdentity.enabled }}
apiVersion: "aadpodidentity.k8s.io/v1"
kind: AzureIdentity
metadata:
Expand All @@ -17,4 +17,4 @@ metadata:
spec:
azureIdentity: externaldns
selector: externaldns
{{ end }}
{{- end }}
3 changes: 3 additions & 0 deletions bootstrap/helm/bootstrap/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -220,3 +220,6 @@ metrics-server:
tag: 0.6.2
apiService:
create: true

azurePodIdentity:
enabled: true
37 changes: 37 additions & 0 deletions bootstrap/plural/recipes/azure-cluster-api-migrate-test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: azure-cluster-api-migrate-test
description: Creates an AKS cluster and installs the bootstrap chart
provider: AZURE
primary: false
private: true
dependencies: []
sections:
- name: bootstrap
configuration:
- name: network_name
documentation: Arbitary name for the network to place your cluster in, eg "plural"
type: STRING
validation:
type: REGEX
regex: '[a-z][\-a-z0-9]{0,61}[a-z0-9]'
message: must begin with a lowercase letter, and can only contain lowercase letters, numbers or hyphens after
items:
- type: TERRAFORM
name: azure-bootstrap
- type: HELM
name: bootstrap
- type: HELM
name: azure-identity
- type: HELM
name: plural-certmanager-webhook
- type: HELM
name: cluster-api-core
- type: HELM
name: cluster-api-bootstrap
- type: HELM
name: cluster-api-control-plane
- type: HELM
name: cluster-api-provider-azure
- type: HELM
name: cluster-api-cluster
- type: HELM
name: azure-workload-identity
2 changes: 0 additions & 2 deletions bootstrap/plural/recipes/azure-cluster-api-simple-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ sections:
name: azure-bootstrap
- type: HELM
name: bootstrap
- type: HELM
name: azure-identity
- type: HELM
name: plural-certmanager-webhook
- type: HELM
Expand Down

0 comments on commit ce7ab17

Please sign in to comment.