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

[release-1.7] update SDKImageToImage func to handle different image types #3469

Merged
merged 1 commit into from
Apr 21, 2023
Merged

[release-1.7] update SDKImageToImage func to handle different image types #3469

merged 1 commit into from
Apr 21, 2023

Conversation

jamesgoodhouse
Copy link
Contributor

@jamesgoodhouse jamesgoodhouse commented Apr 21, 2023 •
edited by CecileRobertMichon
Loading

This is a manual cherry-pick of #3414 due to issues automatically cherry-picking in #3414 (comment).

/assign CecileRobertMichon

Updates to AzureMachinePool that take into account VM image types other than marketplace. Previous behavior resulted in a create/delete/create loop occurring when attempting to use an image other than a marketplace image.

@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. labels Apr 21, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @jamesgoodhouse. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 21, 2023
@jamesgoodhouse jamesgoodhouse changed the title update SDKImageToImage func to handle different image types [release-1.7] update SDKImageToImage func to handle different image types Apr 21, 2023
@jamesgoodhouse jamesgoodhouse mentioned this pull request Apr 21, 2023
Merged
@jamesgoodhouse
Copy link
Contributor Author

hold off on this PR for the time being. the diff looks different than the original one and I want to make sure i fixed the conflicts properly.

@jamesgoodhouse jamesgoodhouse force-pushed the cherry-pick-3414-to-release-1.7 branch from 8054317 to 9c552b9 Compare April 21, 2023 16:34
@jamesgoodhouse
Copy link
Contributor Author

This should be gtg now. The main conflict seemed to be that release-1.7 still leveraged the to package in the vmss_test.go file, whereas my commit was using the pointer package. I updated my changes to use the to package, which I think was the correct thing to do. Let me know if I should have solved it another way, @CecileRobertMichon.

@k8s-ci-robot k8s-ci-robot added 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 Apr 21, 2023
@CecileRobertMichon
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 21, 2023
CecileRobertMichon
CecileRobertMichon reviewed Apr 21, 2023
View reviewed changes
Copy link
Contributor

@CecileRobertMichon CecileRobertMichon left a comment

Choose a reason for hiding this comment

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

perfect, thanks @jamesgoodhouse!

/assign @mboersma @willie-yao

willie-yao
willie-yao approved these changes Apr 21, 2023
View reviewed changes
Copy link
Contributor

@willie-yao willie-yao left a comment

Choose a reason for hiding this comment

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

/lgtm

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

LGTM label has been added.

Git tree hash: 9fe2a932abd8ea2c528b0557b0a1d8b3fac616db

mboersma
mboersma approved these changes Apr 21, 2023
View reviewed changes
Copy link
Contributor

@mboersma mboersma left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mboersma

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 21, 2023
@k8s-ci-robot k8s-ci-robot merged commit cc7c34b into kubernetes-sigs:release-1.7 Apr 21, 2023
@jamesgoodhouse jamesgoodhouse deleted the cherry-pick-3414-to-release-1.7 branch April 25, 2023 16:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CecileRobertMichon CecileRobertMichon CecileRobertMichon left review comments

@willie-yao willie-yao willie-yao approved these changes

@mboersma mboersma mboersma approved these changes

@jsturtevant jsturtevant Awaiting requested review from jsturtevant

@sonasingh46 sonasingh46 Awaiting requested review from sonasingh46

Assignees

@mboersma mboersma

@CecileRobertMichon CecileRobertMichon

@willie-yao willie-yao

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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
CAPZ Planning
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jamesgoodhouse @k8s-ci-robot @CecileRobertMichon @mboersma @willie-yao