Skip to content

Commit

Permalink
feat: Switch to official v1.11 CAPZ image (#852)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
maciaszczykm authored Oct 11, 2023
1 parent fd2065f commit 48f67cb
Show file tree
Hide file tree
Showing 26 changed files with 46 additions and 5,476 deletions.
2 changes: 1 addition & 1 deletion bootstrap/helm/cluster-api-cluster/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
name: cluster-api-cluster
description: A Helm chart for Kubernetes
type: application
version: 0.1.45
version: 0.1.46
appVersion: v1.24.16
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ spec:
{{- toYaml . | nindent 4 }}
{{- end }}
loadBalancerSKU: {{ .Values.cluster.azure.loadBalancerSKU }}
{{- with .Values.cluster.azure.oidcIssuerProfile }}
oidcIssuerProfile:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.cluster.azure.aadProfile }}
aadProfile:
{{- toYaml . | nindent 4 }}
Expand Down
5 changes: 4 additions & 1 deletion bootstrap/helm/cluster-api-cluster/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -186,10 +186,13 @@ cluster:
type: SystemAssigned
# SKU of the AKS to be provisioned.
sku:
tier: Paid
tier: Standard
# SKU of the loadBalancer to be provisioned.
# One of: Basic, Standard.
loadBalancerSKU: Standard
# OIDC issuer profile of the cluster.
oidcIssuerProfile:
enabled: true
# Azure Active Directory configuration to integrate with AKS for AAD authentication.
aadProfile: {}
# Profile of the cluster load balancer.
Expand Down
6 changes: 3 additions & 3 deletions bootstrap/helm/cluster-api-provider-azure/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: cluster-api-provider-azure
repository: https://pluralsh.github.io/capi-helm-charts
version: 0.1.8
digest: sha256:a121b432405288d78644e268fab20ac4369a2bfd13084094b9de9e0f65c05ad1
generated: "2023-08-24T17:11:19.117169+02:00"
version: 0.1.15
digest: sha256:8075f30bf9379c8649ec9a5b02594c83623825c52db08d8e67df16a0b5664692
generated: "2023-10-10T11:04:49.657598+02:00"
10 changes: 5 additions & 5 deletions bootstrap/helm/cluster-api-provider-azure/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ apiVersion: v2
name: cluster-api-provider-azure
description: A Helm chart for Kubernetes
type: application
version: 0.1.12
appVersion: v1.10.2
version: 0.1.13
appVersion: v1.11.3
dependencies:
- name: cluster-api-provider-azure
version: 0.1.8
repository: https://pluralsh.github.io/capi-helm-charts
- name: cluster-api-provider-azure
version: 0.1.15
repository: https://pluralsh.github.io/capi-helm-charts
Binary file not shown.
Binary file not shown.
24 changes: 0 additions & 24 deletions bootstrap/helm/cluster-api-provider-azure/scripts/Makefile

This file was deleted.

1,089 changes: 0 additions & 1,089 deletions bootstrap/helm/cluster-api-provider-azure/templates/azurecluster-crd.yaml

This file was deleted.

This file was deleted.

Loading

0 comments on commit 48f67cb

Please sign in to comment.