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.

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.4.5 #77

Merged
merged 2 commits into from
Dec 19, 2022
Merged

Upstream update to v1.4.5 #77

merged 2 commits into from
Dec 19, 2022

Conversation

nprokopic
Copy link
Contributor

@nprokopic nprokopic commented Dec 17, 2022

Towards https://github.com/giantswarm/giantswarm/issues/24551

This PR is currently on top of upstream-update-v1.3.2 branch.

TODO:

Changes

  • Update upstream cluster-api-provider-azure version from v1.3.2 to v1.4.5 (see highlighted changes below)

Highlighted upstream changes that can be relevant for vintage workload clusters

  • N/A

Highlighted upstream changes

(with specified upstream cluster-api-provider-azure versions)

Upstream release notes

enum:
- ServicePrincipal
- UserAssignedMSI
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 reverts theoretical breaking change from previous minor version.

@@ -36,6 +36,21 @@
properties:
dnsName:
type: string
ipTags:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

IP tags are optional, so vintage workload clusters are not affected.

@@ -137,6 +137,52 @@
image:
description: Image is used to provide details of an image to use during VM creation. If image details are omitted the image will default the Azure Marketplace "capi" offer, which is based on Ubuntu.
properties:
computeGallery:
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 replaces now deprecated SharedGallery. Giant Swarm vintage workload clusters are not using these fields, so they are not affected with this change.

@@ -18,6 +18,13 @@
acceleratedNetworking:
description: AcceleratedNetworking enables or disables Azure accelerated networking. If omitted, it will be set based on whether the requested VMSize supports accelerated networking. If AcceleratedNetworking is set to true with a VMSize that does not support it, Azure will return an error.
type: boolean
additionalCapabilities:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

New optional property. Giant Swarm vintage Azure clusters are using AzureMachine only as a very basic control plane CR, so they are not affected by this change.

@@ -38,6 +38,13 @@
acceleratedNetworking:
description: AcceleratedNetworking enables or disables Azure accelerated networking. If omitted, it will be set based on whether the requested VMSize supports accelerated networking. If AcceleratedNetworking is set to true with a VMSize that does not support it, Azure will return an error.
type: boolean
additionalCapabilities:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

New optional property. Giant Swarm vintage Azure clusters are not using AzureMachineTemplate CRs, so they are not affected by this change.

@@ -99,6 +99,11 @@ spec:
readOnly: true
serviceAccountName: capz-manager
terminationGracePeriodSeconds: 10
tolerations:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

These tolerations should be fine.

@@ -9,7 +9,7 @@ transformers:
- webhook-prefix.yaml

images:
- name: us.gcr.io/k8s-artifacts-prod/cluster-api-azure/cluster-api-azure-controller
- name: registry.k8s.io/cluster-api-azure/cluster-api-azure-controller
Copy link
Contributor Author

Choose a reason for hiding this comment

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

New container image registry used by upstream projects.

@nprokopic nprokopic marked this pull request as ready for review December 18, 2022 16:12
@nprokopic nprokopic requested review from a team December 18, 2022 16:12
@nprokopic nprokopic mentioned this pull request Dec 18, 2022
2 tasks
@nprokopic nprokopic self-assigned this Dec 18, 2022
Copy link

@bavarianbidi bavarianbidi left a comment

Choose a reason for hiding this comment

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

lgtm for CAPI (Clippy)

Copy link
Contributor

@primeroz primeroz left a comment

Choose a reason for hiding this comment

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

LGTM

Base automatically changed from upstream-update-v1.3.2 to main December 19, 2022 10:21
@nprokopic nprokopic merged commit ea3c792 into main Dec 19, 2022
@nprokopic nprokopic deleted the upstream-update-v1.4.5 branch December 19, 2022 11:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants