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

reconcile command to combine update and rolling-update #16939

Merged
merged 1 commit into from
Dec 5, 2024
Merged

reconcile command to combine update and rolling-update #16939

merged 1 commit into from
Dec 5, 2024

Conversation

justinsb
Copy link
Member

@justinsb justinsb commented Nov 9, 2024 •
edited
Loading

This is adding the "combined command" now that the control-plane must be upgraded before the nodes.

I'm not clear as to what the best name is (or even whether it should be a separate command, or a flag). Thoughts / suggestions very welcome!

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 9, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from justinsb. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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 size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 9, 2024
@k8s-ci-robot k8s-ci-robot added area/documentation area/provider/aws Issues or PRs related to aws provider area/provider/azure Issues or PRs related to azure provider area/provider/openstack Issues or PRs related to openstack provider size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 9, 2024
@justinsb justinsb force-pushed the anneal branch 2 times, most recently from 4da4266 to 40a29b1 Compare November 10, 2024 22:00
@justinsb
Copy link
Member Author

/retest

@justinsb justinsb mentioned this pull request Nov 12, 2024
Merged
@danports
Copy link
Contributor

Some name suggestions: reconcile cluster, converge cluster?

@justinsb justinsb changed the title WIP: annealing WIP: reconcile command Nov 24, 2024
@justinsb justinsb changed the title WIP: reconcile command WIP: reconcile command to combine update and rolling-update Nov 24, 2024
@danports
Copy link
Contributor

danports commented Dec 4, 2024

Thanks for getting #16932 over the finish line @justinsb! Do you think this PR will land in 1.31 too or does it need some more time to cook?

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 4, 2024
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 5, 2024
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 5, 2024
@justinsb
Copy link
Member Author

justinsb commented Dec 5, 2024

/milestone v1.31

@k8s-ci-robot k8s-ci-robot added this to the v1.31 milestone Dec 5, 2024
@justinsb justinsb changed the title WIP: reconcile command to combine update and rolling-update reconcile command to combine update and rolling-update Dec 5, 2024
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 5, 2024
@justinsb
Introduce --reconcile flag to kOps
7c95eff 
Kubernetes 1.31 now stops nodes joining a cluster if the minor version
of the node is greater than the minor version of the control plane.

The addition of the instance-group-roles flag to update means that we
can now update / rolling-update the control plane first.  However, we
must now issue four commands:

* Update control plane
* Rolling update control plane
* Update nodes
* Rolling update nodes

This adds a flag to automate this process.  It is implemented by
executing those 4 steps in sequence.

Update is also smart enough to not update the nodes if this would
violate the skew policy, but we do this explicitly in the reconcile
command to be clearer and safer.
@justinsb
Copy link
Member Author

justinsb commented Dec 5, 2024

/test pull-kops-e2e-k8s-gce-ipalias

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Dec 5, 2024 •
edited
Loading

@justinsb: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-kops-e2e-k8s-gce-cilium 7c95eff link true /test pull-kops-e2e-k8s-gce-cilium

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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-sigs/prow repository. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot merged commit 7c95eff into kubernetes:master Dec 5, 2024
19 of 23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hakman hakman Awaiting requested review from hakman

@johngmyers johngmyers Awaiting requested review from johngmyers

Assignees
No one assigned
Labels
area/documentation area/provider/aws Issues or PRs related to aws provider area/provider/azure Issues or PRs related to azure provider area/provider/openstack Issues or PRs related to openstack provider cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.31
Development

Successfully merging this pull request may close these issues.
3 participants
@justinsb @k8s-ci-robot @danports