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

Upstream update to v1.3.2 #76

Merged
merged 2 commits into from
Dec 19, 2022
Merged

Upstream update to v1.3.2 #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8173140
Update upstream cluster-api-provider-azure version from v1.2.1 to v1.3.2
nprokopic Dec 16, 2022
322b252
Update changelog
nprokopic Dec 17, 2022
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
10 changes: 10 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed

- Update upstream cluster-api-provider-azure version from v1.2.1 to v1.3.2 (see highlighted changes below)
- [CAPZ v1.3.0] [Add support for Service Principal with Certificate auth using AAD pod identity](https://github.com/kubernetes-sigs/cluster-api-provider-azure/pull/2258). This looks like a breaking change in theory, since `AzureClusterIdentity` `UserAssignedMSI` type is removed, but in practice it is not, because UserAssignedMSI never worked, see [this comment for more details](https://github.com/kubernetes-sigs/cluster-api-provider-azure/pull/2258/files#r859891486). In any case Giant Swarm workload clusters are not be affected, because all of them are using `ServicePrincipal` type.

### cluster-api-provider-azure upstream release notes
- [v1.3.0](https://github.com/kubernetes-sigs/cluster-api-provider-azure/releases/tag/v1.3.0)
- [v1.3.1](https://github.com/kubernetes-sigs/cluster-api-provider-azure/releases/tag/v1.3.1)
- [v1.3.2](https://github.com/kubernetes-sigs/cluster-api-provider-azure/releases/tag/v1.3.2)

## [1.3.0] - 2022-12-16

### Changed
Expand Down
10 changes: 5 additions & 5 deletions ...ture/patches/versions/v1beta1/azureclusteridentities.infrastructure.cluster.x-k8s.io.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
type: object
type: object
clientID:
description: Both User Assigned MSI and SP can use this field.
description: ClientID is the service principal client ID. Both User Assigned MSI and SP can use this field.
type: string
clientSecret:
description: ClientSecret is a secret reference which should contain either a Service Principal password or certificate secret.
Expand All @@ -70,17 +70,17 @@
type: string
type: object
resourceID:
description: User assigned MSI resource id.
description: ResourceID is the Azure resource ID for the User Assigned MSI resource. Not currently supported.
type: string
tenantID:
description: Service principal primary tenant id.
description: TenantID is the service principal primary tenant id.
type: string
type:
description: UserAssignedMSI or Service Principal
description: Type is the type of Azure Identity used. ServicePrincipal, ServicePrincipalCertificate, or ManualServicePrincipal.
enum:
- ServicePrincipal
- ManualServicePrincipal
- UserAssignedMSI
- ServicePrincipalCertificate
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like a breaking change in theory, but in practice it is not, as UserAssignedMSI never worked, see this comment for more details.

In any case we should not be affected, because all vintage workload clusters are using ServicePrincipal type.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just for reference i did test it in capz 1.6.x and it worked for me using the UA assigned to the MC node

apparently the actual issue with UA Identity was fixed in CAPZ 1.4 kubernetes-sigs/cluster-api-provider-azure#1104

👍

type: string
required:
- clientID
Expand Down
20 changes: 20 additions & 0 deletions ...e/patches/versions/v1beta1/azuremanagedcontrolplanes.infrastructure.cluster.x-k8s.io.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,26 @@
type: string
description: AdditionalTags is an optional set of tags to add to Azure resources managed by the Azure provider, in addition to the ones added by default.
type: object
addonProfiles:
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are still not using CAPZ managed clusters, so not affected by this.

description: AddonProfiles are the profiles of managed cluster add-on.
items:
properties:
config:
additionalProperties:
type: string
description: Config - Key-value pairs for configuring an add-on.
type: object
enabled:
description: Enabled - Whether the add-on is enabled or not.
type: boolean
name:
description: Name- The name of managed cluster add-on.
type: string
required:
- enabled
- name
type: object
type: array
apiServerAccessProfile:
description: APIServerAccessProfile is the access profile for AKS API server.
properties:
Expand Down
3 changes: 3 additions & 0 deletions ...re/patches/versions/v1beta1/azuremanagedmachinepools.infrastructure.cluster.x-k8s.io.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
items:
type: string
type: array
enableUltraSSD:
description: EnableUltraSSD enables the storage type UltraSSD_LRS for the agent pool.
type: boolean
maxPods:
description: MaxPods specifies the kubelet --max-pods configuration for the node pool.
format: int32
Expand Down
2 changes: 1 addition & 1 deletion helm/cluster-api-provider-azure/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: cluster-api-azure-controller
image:
registry: quay.io
name: giantswarm/cluster-api-azure-controller
tag: v1.2.1
tag: v1.3.2

project:
branch: "[[ .Branch ]]"
Expand Down