Skip to content

Conversation

@k8s-infra-cherrypick-robot

This is an automated cherry-pick of #12753

/assign sbueringer

If a user runs `upgrade plan` and the results show there are no
available upgrades, the expectation is they then do not attempt to apply
the plan. But nothing prevents them from doing so.

If a non-upgrade plan is applied, the current apply logic does not
handle the case where the "next version" is empty. To make this more
robust, and to protect against users trying to apply plans with no
available upgrades, this performs a quick validation on the plan
providers to make sure they have a version to upgrade to. If not, the
`upgrade apply` call ends up being a no-op and avoids potentially
confusing error output.

Signed-off-by: Sean McGinnis <[email protected]>
@k8s-ci-robot k8s-ci-robot added this to the v1.11 milestone Sep 15, 2025
@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 labels Sep 15, 2025
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 15, 2025
@sbueringer
Copy link
Member

/area clusterctl
/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added area/clusterctl Issues or PRs related to clusterctl lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed do-not-merge/needs-area PR is missing an area label labels Sep 15, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 0a864b4798841694eff1de7d9ce8263ddea52c01

@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 Sep 15, 2025
@k8s-ci-robot k8s-ci-robot merged commit a71a2b1 into kubernetes-sigs:release-1.11 Sep 15, 2025
21 checks passed
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. area/clusterctl Issues or PRs related to clusterctl 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.

4 participants