Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Switch to official v1.11 CAPZ image #852

Merged
merged 23 commits into from
Oct 11, 2023
Merged

feat: Switch to official v1.11 CAPZ image #852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
101caf3
Switch to official v1.11 CAPZ image
maciaszczykm Sep 20, 2023
2aefa43
Bump controller version as well
maciaszczykm Sep 20, 2023
b5abe21
Bump helm chart version
maciaszczykm Sep 27, 2023
b793053
Remove local CRDs
maciaszczykm Sep 27, 2023
f2ae616
Fix SKU tier and wait job
maciaszczykm Sep 27, 2023
e32c31e
Fix typo
maciaszczykm Sep 27, 2023
1ab3309
Merge remote-tracking branch 'origin/main' into marcin/use-official-c…
maciaszczykm Sep 27, 2023
184e1b4
Enable OIDC issuer
maciaszczykm Sep 27, 2023
0557252
Update cluster-api-provider-azure
maciaszczykm Sep 27, 2023
aa75736
update CAPZ service account name
maciaszczykm Sep 27, 2023
895d5ec
fix duplicated name
maciaszczykm Sep 27, 2023
c16182f
bump cluster-api-provider-azure
maciaszczykm Oct 4, 2023
1bd5909
bump cluster-api-azure-controller
maciaszczykm Oct 4, 2023
146b9f7
Merge remote-tracking branch 'origin/main' into marcin/use-official-c…
maciaszczykm Oct 4, 2023
888037b
update aso roles
maciaszczykm Oct 4, 2023
3f22e89
add aso controller settings without clientId
maciaszczykm Oct 5, 2023
56dcdcf
add and use aso_assigned_identity_client_id output
maciaszczykm Oct 5, 2023
2b95918
Merge remote-tracking branch 'origin/main' into marcin/use-official-c…
maciaszczykm Oct 5, 2023
787180c
use signle identity
maciaszczykm Oct 5, 2023
280f163
remove duplicated line
maciaszczykm Oct 5, 2023
8ec01f5
bump CAPZ to v1.11.3
maciaszczykm Oct 10, 2023
26f0663
Merge remote-tracking branch 'origin/main' into marcin/use-official-c…
maciaszczykm Oct 10, 2023
a9d5f93
bump versions
maciaszczykm Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bootstrap/helm/cluster-api-cluster/Chart.yaml
View file
Open in desktop
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
4 changes: 4 additions & 0 deletions bootstrap/helm/cluster-api-cluster/templates/azure/control-plane.yaml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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 added bootstrap/helm/cluster-api-provider-azure/charts/cluster-api-provider-azure-0.1.15.tgz
View file
Open in desktop
Binary file not shown.
Binary file removed bootstrap/helm/cluster-api-provider-azure/charts/cluster-api-provider-azure-0.1.8.tgz
View file
Open in desktop
Binary file not shown.
24 changes: 0 additions & 24 deletions bootstrap/helm/cluster-api-provider-azure/scripts/Makefile
View file
Open in desktop

This file was deleted.

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

This file was deleted.

183 changes: 0 additions & 183 deletions bootstrap/helm/cluster-api-provider-azure/templates/azureclusteridentity-crd.yaml
View file
Open in desktop

This file was deleted.

Loading
Loading