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

🐛 Make MachinePools and MachineDeployments optional in ApplyClusterTemplateAndWait #9960

Merged
merged 1 commit into from
Jan 8, 2024
Merged

🐛 Make MachinePools and MachineDeployments optional in ApplyClusterTemplateAndWait #9960

merged 1 commit into from
Jan 8, 2024

Conversation

sbueringer
Copy link
Member

@sbueringer sbueringer commented Jan 5, 2024 •
edited
Loading

Signed-off-by: Stefan Büringer [email protected]

What this PR does / why we need it:
Tried to run an upgrade test without MachinePools and it didn't work anymore. I assume this affects plenty of other tests across core CAPI and providers.

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 #

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-area PR is missing an area label size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 5, 2024
@sbueringer sbueringer changed the title Make MachinePools and MachineDeployments optional in ApplyClusterTemplateAndWait 🐛 Make MachinePools and MachineDeployments optional in ApplyClusterTemplateAndWait Jan 5, 2024
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-full-main

@sbueringer
Copy link
Member Author

/cherry-pick release-1.6

@k8s-infra-cherrypick-robot
Copy link

@sbueringer: once the present PR merges, I will cherry-pick it on top of release-1.6 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.6

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.

@sbueringer sbueringer added the area/e2e-testing Issues or PRs related to e2e testing label Jan 5, 2024
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/needs-area PR is missing an area label label Jan 5, 2024
@sbueringer sbueringer mentioned this pull request Jan 5, 2024
Merged
@sbueringer
Copy link
Member Author

/assign @chrischdi @fabriziopandini @killianmuldoon @vincepri

@sbueringer
Copy link
Member Author

/hold

want to successfully verify with CAPV first before merging

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 8, 2024
@sbueringer
Copy link
Member Author

/hold cancel

Works!

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 8, 2024
chrischdi
chrischdi reviewed Jan 8, 2024
View reviewed changes
Copy link
Member

@chrischdi chrischdi 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 Jan 8, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: d9c476138624188ef798201a7e03dc9fdbf86555

@sbueringer
Copy link
Member Author

/approve

given lgtm above

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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 Jan 8, 2024
@k8s-ci-robot k8s-ci-robot merged commit 572a971 into kubernetes-sigs:main Jan 8, 2024
38 of 40 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.7 milestone Jan 8, 2024
@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Jan 8, 2024
Merged
@k8s-infra-cherrypick-robot
Copy link

@sbueringer: new pull request created: #9962

In response to this:

/cherry-pick release-1.6

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.

@sbueringer sbueringer deleted the pr-fix-upgrade-test branch January 8, 2024 13:19
adityabhatia pushed a commit to adityabhatia/cluster-api that referenced this pull request Jan 9, 2024
@k8s-ci-robot @adityabhatia
Merge pull request kubernetes-sigs#9960 from sbueringer/pr-fix-upgrad…
2cf1bbc 
…e-test

🐛 Make MachinePools and MachineDeployments optional in ApplyClusterTemplateAndWait
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chrischdi chrischdi chrischdi left review comments

@elmiko elmiko Awaiting requested review from elmiko

@richardcase richardcase Awaiting requested review from richardcase

Assignees

@chrischdi chrischdi

@vincepri vincepri

@fabriziopandini fabriziopandini

@killianmuldoon killianmuldoon

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/e2e-testing Issues or PRs related to e2e testing 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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.7
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@sbueringer @k8s-infra-cherrypick-robot @k8s-ci-robot @chrischdi @vincepri @fabriziopandini @killianmuldoon