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

🐛 Allow the defaulting of InstanceMetadataOptions to go through for AWSMachineTemplates #4256

Merged
merged 2 commits into from
May 9, 2023
Merged

🐛 Allow the defaulting of InstanceMetadataOptions to go through for AWSMachineTemplates #4256

merged 2 commits into from
May 9, 2023

Conversation

yastij
Copy link
Member

@yastij yastij commented May 8, 2023 •
edited by Skarlso
Loading

What this PR does / why we need it: In #4037 we introduced InstanceMetadataOptions, but we didn't deal with upgrading from 2.0.x to >= 2.1.0.

In the 2.0.x we didn't have InstanceMetadataOptions, so when upgrading to 2.1.0 or more, defaulting kicks in, but gets rejected. This is because of missing changes to ValidateUpdate, to detect this and allow defaulted changes. This PR fixes that.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

@richardcase @Skarlso @Ankitasw - we should probably recommend using 2.1.1

Checklist:

  • squashed commits
  • includes documentation
  • adds unit tests
  • adds or updates e2e tests

Release note:

Allow the defaulting of InstanceMetadataOptions to go through for AWSMachineTemplates

@k8s-ci-robot k8s-ci-robot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-priority size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 8, 2023
@yastij
Copy link
Member Author

yastij commented May 8, 2023

/priority critical-urgent

@k8s-ci-robot k8s-ci-robot added priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. and removed needs-priority labels May 8, 2023
@yastij
allow the defaulting of InstanceMetadataOptions to go through for AWS…
f8f8d7b 
…MachineTemplates

Signed-off-by: Yassine TIJANI <ytijani@vmware.com>
@yastij yastij force-pushed the allow-defaulting-template branch from cda5427 to f8f8d7b Compare May 8, 2023 17:37
@Skarlso
Copy link
Contributor

Skarlso commented May 8, 2023

Please add release notes @yastij .

@Skarlso
Copy link
Contributor

Skarlso commented May 9, 2023

/test

@k8s-ci-robot
Copy link
Contributor

@Skarlso: The /test command needs one or more targets.
The following commands are available to trigger required jobs:

  • /test pull-cluster-api-provider-aws-build
  • /test pull-cluster-api-provider-aws-test
  • /test pull-cluster-api-provider-aws-verify

The following commands are available to trigger optional jobs:

  • /test pull-cluster-api-provider-aws-apidiff-main
  • /test pull-cluster-api-provider-aws-e2e
  • /test pull-cluster-api-provider-aws-e2e-blocking
  • /test pull-cluster-api-provider-aws-e2e-clusterclass
  • /test pull-cluster-api-provider-aws-e2e-conformance
  • /test pull-cluster-api-provider-aws-e2e-conformance-with-ci-artifacts
  • /test pull-cluster-api-provider-aws-e2e-eks
  • /test pull-cluster-api-provider-aws-e2e-eks-gc
  • /test pull-cluster-api-provider-aws-e2e-eks-testing

Use /test all to run the following jobs that were automatically triggered:

  • pull-cluster-api-provider-aws-apidiff-main
  • pull-cluster-api-provider-aws-build
  • pull-cluster-api-provider-aws-test
  • pull-cluster-api-provider-aws-verify

In response to this:

/test

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@Skarlso
Copy link
Contributor

Skarlso commented May 9, 2023

/test pull-cluster-api-provider-aws-e2e

@Skarlso
Copy link
Contributor

Skarlso commented May 9, 2023

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 9, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Skarlso

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels May 9, 2023
@k8s-ci-robot k8s-ci-robot merged commit e767f37 into kubernetes-sigs:main May 9, 2023
@Skarlso
Copy link
Contributor

Skarlso commented May 9, 2023

/cherry-pick release-2.1

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request May 9, 2023
Merged
@k8s-infra-cherrypick-robot
Copy link

@Skarlso: new pull request created: #4258

In response to this:

/cherry-pick release-2.1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Skarlso Skarlso Skarlso left review comments

@Ankitasw Ankitasw Awaiting requested review from Ankitasw

@luthermonson luthermonson Awaiting requested review from luthermonson

Assignees

@Skarlso Skarlso

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@yastij @Skarlso @k8s-ci-robot @k8s-infra-cherrypick-robot