Skip to content

Commit 48f67cb

Browse files
authored
feat: Switch to official v1.11 CAPZ image (#852)
* Switch to official v1.11 CAPZ image * Bump controller version as well * Bump helm chart version * Remove local CRDs * Fix SKU tier and wait job * Fix typo * Enable OIDC issuer * Update cluster-api-provider-azure * update CAPZ service account name add ASO identity to service account * fix duplicated name * bump cluster-api-provider-azure * bump cluster-api-azure-controller * update aso roles * add aso controller settings without clientId * add and use aso_assigned_identity_client_id output * use signle identity * remove duplicated line * bump CAPZ to v1.11.3 * bump versions
1 parent fd2065f commit 48f67cb

26 files changed

+46
-5476
lines changed

bootstrap/helm/cluster-api-cluster/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ apiVersion: v2
22
name: cluster-api-cluster
33
description: A Helm chart for Kubernetes
44
type: application
5-
version: 0.1.45
5+
version: 0.1.46
66
appVersion: v1.24.16

bootstrap/helm/cluster-api-cluster/templates/azure/control-plane.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ spec:
4242
{{- toYaml . | nindent 4 }}
4343
{{- end }}
4444
loadBalancerSKU: {{ .Values.cluster.azure.loadBalancerSKU }}
45+
{{- with .Values.cluster.azure.oidcIssuerProfile }}
46+
oidcIssuerProfile:
47+
{{- toYaml . | nindent 4 }}
48+
{{- end }}
4549
{{- with .Values.cluster.azure.aadProfile }}
4650
aadProfile:
4751
{{- toYaml . | nindent 4 }}

bootstrap/helm/cluster-api-cluster/values.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,10 +186,13 @@ cluster:
186186
type: SystemAssigned
187187
# SKU of the AKS to be provisioned.
188188
sku:
189-
tier: Paid
189+
tier: Standard
190190
# SKU of the loadBalancer to be provisioned.
191191
# One of: Basic, Standard.
192192
loadBalancerSKU: Standard
193+
# OIDC issuer profile of the cluster.
194+
oidcIssuerProfile:
195+
enabled: true
193196
# Azure Active Directory configuration to integrate with AKS for AAD authentication.
194197
aadProfile: {}
195198
# Profile of the cluster load balancer.
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies:
22
- name: cluster-api-provider-azure
33
repository: https://pluralsh.github.io/capi-helm-charts
4-
version: 0.1.8
5-
digest: sha256:a121b432405288d78644e268fab20ac4369a2bfd13084094b9de9e0f65c05ad1
6-
generated: "2023-08-24T17:11:19.117169+02:00"
4+
version: 0.1.15
5+
digest: sha256:8075f30bf9379c8649ec9a5b02594c83623825c52db08d8e67df16a0b5664692
6+
generated: "2023-10-10T11:04:49.657598+02:00"

bootstrap/helm/cluster-api-provider-azure/Chart.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ apiVersion: v2
22
name: cluster-api-provider-azure
33
description: A Helm chart for Kubernetes
44
type: application
5-
version: 0.1.12
6-
appVersion: v1.10.2
5+
version: 0.1.13
6+
appVersion: v1.11.3
77
dependencies:
8-
- name: cluster-api-provider-azure
9-
version: 0.1.8
10-
repository: https://pluralsh.github.io/capi-helm-charts
8+
- name: cluster-api-provider-azure
9+
version: 0.1.15
10+
repository: https://pluralsh.github.io/capi-helm-charts
Binary file not shown.
Binary file not shown.

bootstrap/helm/cluster-api-provider-azure/scripts/Makefile

Lines changed: 0 additions & 24 deletions
This file was deleted.

bootstrap/helm/cluster-api-provider-azure/templates/azurecluster-crd.yaml

Lines changed: 0 additions & 1089 deletions
This file was deleted.

bootstrap/helm/cluster-api-provider-azure/templates/azureclusteridentity-crd.yaml

Lines changed: 0 additions & 183 deletions
This file was deleted.

0 commit comments

Comments
 (0)