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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

馃悰 test/e2e/cluster-upgrade: skip worker upgrades if worker count is 0 #5926

Merged
merged 1 commit into from
Jan 12, 2022

Conversation

sbueringer
Copy link
Member

Signed-off-by: Stefan B眉ringer buringerst@vmware.com

What this PR does / why we need it:
Currently, the cluster upgrade test fails when the worker count is 0 (#4896 (comment)). This PR makes sure we skip the upgrade of MachineDeployments and MachinePools in that case.

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 #

Signed-off-by: Stefan B眉ringer buringerst@vmware.com
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jan 12, 2022
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 12, 2022
@sbueringer
Copy link
Member Author

/test pull-cluster-api-verify-main

Copy link
Member

@fabriziopandini fabriziopandini 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 k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 12, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini

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 12, 2022
@k8s-ci-robot k8s-ci-robot merged commit 1e13f44 into kubernetes-sigs:main Jan 12, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.1 milestone Jan 12, 2022
@sbueringer sbueringer deleted the pr-fix-upgrade-test branch January 12, 2022 13:10
@CecileRobertMichon
Copy link
Contributor

Thank you @sbueringer for the super fast fix

@CecileRobertMichon
Copy link
Contributor

@fabriziopandini do we need to backport this to include it in release 1.1 since the beta release tag already exists or will everything in main be included?

@sbueringer
Copy link
Member Author

@fabriziopandini do we need to backport this to include it in release 1.1 since the beta release tag already exists or will everything in main be included?

I think we don't. I expect the release to be cut from current main as there is no release-1.1 branch yet and I think it will be created from main at the time of the release. But let's see what Fabrizio says of course :)

@fabriziopandini
Copy link
Member

fabriziopandini commented Jan 13, 2022

the 1.1 branch does not exist yet, it will be created when we cut the release; it makes sense to cut an rc to allow providers to get this before the release (we should get a couple of PR in before...)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants