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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kubeadm: component config updates in 1.19 #21663

Merged
merged 2 commits into from
Jul 16, 2020

Conversation

rosti
Copy link
Contributor

@rosti rosti commented Jun 11, 2020

This is a placeholder for now.

/assign @neolit123 @fabriziopandini
/sig cluster-lifecycle

@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. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jun 11, 2020
@k8sio-netlify-preview-bot
Copy link
Collaborator

k8sio-netlify-preview-bot commented Jun 11, 2020

Deploy preview for kubernetes-io-vnext-staging processing.

Building with commit 65e914e

https://app.netlify.com/sites/kubernetes-io-vnext-staging/deploys/5f0f05a9fff5710008bbd0fe

@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jun 11, 2020
@k8s-ci-robot k8s-ci-robot added language/en Issues or PRs related to English language sig/docs Categorizes an issue or PR as relevant to SIG Docs. labels Jun 11, 2020
@savitharaghunathan
Copy link
Member

/milestone 1.19
/assign

@k8s-ci-robot k8s-ci-robot added this to the 1.19 milestone Jun 11, 2020
@rosti rosti force-pushed the kubeadm-cc-updates-1.19 branch from 93ded8c to d18fa51 Compare July 3, 2020 16:30
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jul 3, 2020
{{< note >}}
If `kubeadm upgrade plan` shows any component configs that require manual upgrade, users must provide
a config file with replacement configs to `kubeadm upgrade apply` via the `--config` command line flag.
Failing to do so will cause `kubeadm upgrade apply` to exit with an error and not perform an upgrade.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

My idea here is for this note to also contain a link at the end to a different page describing in detail the workflow in that case. For that matter, however, we should have the alpha commands from the KEP merged as well (possibly in the next release cycle).

Copy link
Member

Choose a reason for hiding this comment

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

My idea here is for this note to also contain a link at the end to a different page describing in detail the workflow in that case.

if the new page is going to be at k/website it's fine because the k8s.io docs are branched.
if it links at k/kubeadm, the repo is not branched, so we better have SHAs in the link.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I am thinking more about using k/website for that. That's why I want the full set of command line additions to merge before doing the separate page.

@rosti rosti changed the title [WIP] kubeadm: component config updates in 1.19 kubeadm: component config updates in 1.19 Jul 3, 2020
@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 Jul 3, 2020
@neolit123
Copy link
Member

neolit123 commented Jul 3, 2020

@rosti i sent a placeholder for the generic "upgrade docs update" here:
#21860

but i think the PRs are going to conflict, do you think you can do the rest of the changes in this PR?
it's about showing the whole upgrade plan / apply output and search + replace for versions.

@fabriziopandini
Copy link
Member

@rosti thanks!
Ready to lgtm as soon as @neolit123 commits are addressed

@rosti
Copy link
Contributor Author

rosti commented Jul 13, 2020

@rosti i sent a placeholder for the generic "upgrade docs update" here:
#21860

but i think the PRs are going to conflict, do you think you can do the rest of the changes in this PR?
it's about showing the whole upgrade plan / apply output and search + replace for versions.

It seems that it only requires version bumps here and there. I can do that in this PR (as a separate commit). Will update later today.

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 13, 2020

To see information about upgrading clusters created using older versions of kubeadm,
please refer to following pages instead:

- [Upgrading kubeadm cluster from 1.17 to 1.18](https://v1-18.docs.kubernetes.io/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade/)
- [Upgrading kubeadm cluster from 1.16 to 1.17](https://v1-17.docs.kubernetes.io/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade/)
- [Upgrading kubeadm cluster from 1.15 to 1.16](https://v1-16.docs.kubernetes.io/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade/)
- [Upgrading kubeadm cluster from 1.14 to 1.15](https://v1-15.docs.kubernetes.io/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-15/)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@neolit123 should we drop the link "from 1.14 to 1.15"?

Copy link
Contributor

Choose a reason for hiding this comment

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

If v1.14 is still supported after the v1.19 release happens, I would expect to leave that link in.

@rosti
Copy link
Contributor Author

rosti commented Jul 13, 2020

Added the generic 1.19 updates to this PR too (as a separate commit).

@rosti rosti requested a review from neolit123 July 13, 2020 16:42
@sftim
Copy link
Contributor

sftim commented Jul 14, 2020

@rosti the PR description reads

This is a placeholder for now.

Is that still accurate?

sftim
sftim previously requested changes Jul 14, 2020
Copy link
Contributor

@sftim sftim left a comment

Choose a reason for hiding this comment

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

@rosti, please rebase this against dev-1.19 to incorporate changes from #21359


To see information about upgrading clusters created using older versions of kubeadm,
please refer to following pages instead:

- [Upgrading kubeadm cluster from 1.17 to 1.18](https://v1-18.docs.kubernetes.io/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade/)
- [Upgrading kubeadm cluster from 1.16 to 1.17](https://v1-17.docs.kubernetes.io/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade/)
- [Upgrading kubeadm cluster from 1.15 to 1.16](https://v1-16.docs.kubernetes.io/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade/)
- [Upgrading kubeadm cluster from 1.14 to 1.15](https://v1-15.docs.kubernetes.io/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-15/)
Copy link
Contributor

Choose a reason for hiding this comment

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

If v1.14 is still supported after the v1.19 release happens, I would expect to leave that link in.

@sftim
Copy link
Contributor

sftim commented Jul 14, 2020

/hold
to make #21663 (review) more visible in PR listings

OK to unhold once this is rebased.

@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 Jul 14, 2020
rosti added 2 commits July 15, 2020 16:32
This briefly adds a description for some side steps in the upgrade
process. Most notably, it mentions the existance of the component config
state table at the end of the `kubeadm upgrade plan` output and the need
to specify a file with upgraded configs to `kubeadm upgrade apply` if
the config state table says so.

Signed-off-by: Rostislav M. Georgiev <rostislavg@vmware.com>
Signed-off-by: Rostislav M. Georgiev <rostislavg@vmware.com>
@rosti rosti force-pushed the kubeadm-cc-updates-1.19 branch from 1367ba3 to 65e914e Compare July 15, 2020 13:33
@rosti
Copy link
Contributor Author

rosti commented Jul 15, 2020

@sftim rebased it.
/hold cancel

@fabriziopandini PTAL

@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 Jul 15, 2020
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.

@rosti thanks for taking care of this work!
/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 15, 2020

To see information about upgrading clusters created using older versions of kubeadm,
please refer to following pages instead:

- [Upgrading kubeadm cluster from 1.17 to 1.18](https://v1-18.docs.kubernetes.io/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade/)
Copy link
Contributor

Choose a reason for hiding this comment

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

@rosti , Would you check the last two links. Are both links required? The links point to the 1.15 snapshot version of the docs.
1.18-1.19
1.17-1.18
1.16-1.17
1.15-1.1.6
1.14-1.15 ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The idea there is to keep as much as possible from the older upgrade docs to allow folks with older clusters to incrementally upgrade to modern Kubernetes versions.
These are good to be kept as long as the 1.15 snapshot is still present. If not, I can send a PR to remove the link.

Copy link
Contributor

Choose a reason for hiding this comment

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

OK.

@kbhawkey
Copy link
Contributor

Hi @rosti . Besides checking on the links to previous upgrade instructions, the page looks good.

@kbhawkey
Copy link
Contributor

Besides the link question,
/lgtm

@kbhawkey
Copy link
Contributor

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini, kbhawkey

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 Jul 16, 2020
@k8s-ci-robot k8s-ci-robot merged commit eb6b1f8 into kubernetes:dev-1.19 Jul 16, 2020
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. language/en Issues or PRs related to English language lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants