kubeadm: use the new v1beta3 instead of v1beta2 #28360

neolit123 · 2021-06-09T22:32:13Z

In 1.22 kubeadm is adding a new API version - v1beta3.
Adapt links and examples to use v1beta3 instead of v1beta2.
v1beta2 is not deprecated yet, but v1beta3 is preferred
at this point.

xref kubernetes/kubeadm#1796
~~v1beta3 is already available; no required PRs are needed before this k/website change merges.~~

the PR also includes changes specific to v1beta3 in a few pages, documenting new features.

note: also includes some whitespace cleanup by my text editor.

k8sio-netlify-preview-bot · 2021-06-09T22:32:17Z

👷 Deploy Preview for kubernetes-io-vnext-staging processing.

🔨 Explore the source changes: 3437d01

🔍 Inspect the deploy log: https://app.netlify.com/sites/kubernetes-io-vnext-staging/deploys/60e4b4648ca30d00077413f5

neolit123 · 2021-06-09T22:32:42Z

/kind feature
/sig cluster-lifecycle
/cc @tengqm @pacoxu

neolit123 · 2021-06-09T22:37:36Z

content/en/docs/setup/production-environment/tools/kubeadm/troubleshooting-kubeadm.md

-## The NodeRegistration.Taints field is omitted when marshalling kubeadm configuration
-
-*Note: This [issue](https://github.com/kubernetes/kubeadm/issues/1358) only applies to tools that marshal kubeadm types (e.g. to a YAML configuration file). It will be fixed in kubeadm API v1beta2.*
-
-By default, kubeadm applies the `node-role.kubernetes.io/master:NoSchedule` taint to control-plane nodes.
-If you prefer kubeadm to not taint the control-plane node, and set `InitConfiguration.NodeRegistration.Taints` to an empty slice,
-the field will be omitted when marshalling. When the field is omitted, kubeadm applies the default taint.
-
-There are at least two workarounds:
-
-1. Use the `node-role.kubernetes.io/master:PreferNoSchedule` taint instead of an empty slice. [Pods will get scheduled on masters](/docs/concepts/scheduling-eviction/taint-and-toleration/), unless other nodes have capacity.
-
-2. Remove the taint after kubeadm init exits:
-```bash
-kubectl taint nodes NODE_NAME node-role.kubernetes.io/master:NoSchedule-
-```
-


removing this entry since it affects the v1beta1 API which is being removed in 1.22.
newer APIs are not affected.

kbhawkey · 2021-06-09T23:48:07Z

content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_config_print.md

@@ -17,7 +17,7 @@ Print configuration


 This command prints configurations for subcommands provided.
-For details, see: https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2
+For details, see: https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3


Hi @neolit123 .
Some of the files in this PR are auto-generated.
Do you expect the changes to be generated from the source code?

that was an oversight. the source code should produce the "v1beta3" change.
updated.

In 1.22 kubeadm is adding a new API version - v1beta3. Adapt links and examples to use v1beta3 instead of v1beta2. v1beta2 is not deprecated yet, but v1beta3 is preferred at this point.

pacoxu · 2021-06-10T08:01:45Z

/lgtm
for the version change here.

There may be some TODO for kubernetes/kubeadm#1796

P0: remove DNS.Type: remove kube-dns related
P0: remove useHyperkubeImage

k8s-ci-robot · 2021-06-10T08:01:52Z

LGTM label has been added.

Git tree hash: f134ae661f8b71f0e60622f458ef7512422348f6

neolit123 · 2021-06-10T12:47:42Z

We did the dns type and hyperkube cleanups when we removed the features from k/k master. Are you seeing something that we missed?

pacoxu

ok, Currently no. I will go through it later.

/assign @jimangel

tengqm · 2021-06-16T02:17:22Z

/lgtm

PI-Victor · 2021-06-16T14:48:24Z

@neolit123 are all the code changes that enable this docs change merged at this point?

/assign
/hold

neolit123 · 2021-07-01T23:52:36Z

this PR now includes two more commits relevant to kubeadm's API v1beta3 and v1.22.

kubeadm/control-plane-flags: update the page to include general details …

- Re-purpose the page to include more general details about
customizing components.
- Add details about using patches via the config API (v1.22 feature).

kubeadm/init-join.md: add note about using "skipPhases" from config

Since 1.22 it will be possible to skip phases using the configuration
file. Add note about that in the relevant sections of the kubeadm
init and join reference pages.

pacoxu · 2021-07-02T06:24:04Z

content/en/docs/setup/production-environment/tools/kubeadm/control-plane-flags.md


 - `apiServer`
 - `controllerManager`
 - `scheduler`
+- `etcd`

 The `extraArgs` field consist of `key: value` pairs. To override a flag for a control plane component:

 1.  Add the appropriate fields to your configuration.
 2.  Add the flags to override to the field.


to override to the field
to
to override the field

reworded this block and list to clarify the concepts of structures / field.

content/en/docs/setup/production-environment/tools/kubeadm/control-plane-flags.md

pacoxu · 2021-07-02T06:29:07Z

content/en/docs/setup/production-environment/tools/kubeadm/control-plane-flags.md


+{{< note >}}
+Duplicate flags (keys), or passing the same flag `--foo` multiple times, is currently not supported.


or passing the same flag `--foo` multiple times

Does this dup with duplicate flags(keys)? 🤔

it's just a clarification for the first part of the sentence.

pacoxu · 2021-07-02T06:37:42Z

Overall LGTM. Only some small nit for some existing part 😓.

pacoxu · 2021-07-05T02:19:49Z

/lgtm
ping @jimangel for approval

k8s-ci-robot · 2021-07-05T02:19:55Z

LGTM label has been added.

Git tree hash: 5a9dd6753daf06385b65597e76b7f638dca5e1af

content/en/docs/setup/production-environment/tools/kubeadm/control-plane-flags.md

- Re-purpose the page to include more general details about customizing components. - Add details about using patches via the config API (v1.22 feature).

Since 1.22 it will be possible to skip phases using the configuration file. Add note about that in the relevant sections of the kubeadm init and join reference pages.

neolit123 · 2021-07-06T19:52:15Z

@PI-Victor updated, thanks for the review.

PI-Victor · 2021-07-06T21:45:07Z

/lgtm
/approve

thanks for taking the time for the PR, since this enhancement is not 'At Risk', we can go ahead an wrap it up.

k8s-ci-robot · 2021-07-06T21:45:13Z

LGTM label has been added.

Git tree hash: 3bb199404ccce9b1a2704c1d856918e84f7134c5

k8s-ci-robot · 2021-07-06T21:45:22Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pacoxu, PI-Victor

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:

~~content/en/OWNERS~~ [PI-Victor]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

neolit123 · 2021-07-08T16:25:40Z

if this is good to go, please lift the hold.
@tengqm wants to do a follow up with some link updates.
#28862

PI-Victor · 2021-07-08T16:42:12Z

damn, my bad!

/hold cancel

k8s-ci-robot added this to the 1.22 milestone Jun 9, 2021

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 9, 2021

k8s-ci-robot requested review from kbhawkey and rajeshdeshpande02 June 9, 2021 22:32

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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 9, 2021

k8s-ci-robot requested review from pacoxu and tengqm June 9, 2021 22:32

k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. labels Jun 9, 2021

neolit123 mentioned this pull request Jun 9, 2021

v1beta3 config kubernetes/kubeadm#1796

Closed

16 tasks

neolit123 force-pushed the 1.22-add-v1beta3 branch from 86cd339 to 241f2a3 Compare June 9, 2021 22:37

neolit123 commented Jun 9, 2021

View reviewed changes

kbhawkey reviewed Jun 9, 2021

View reviewed changes

kubeadm: use the new v1beta3 instead of v1beta2

fa3efa1

In 1.22 kubeadm is adding a new API version - v1beta3. Adapt links and examples to use v1beta3 instead of v1beta2. v1beta2 is not deprecated yet, but v1beta3 is preferred at this point.

neolit123 force-pushed the 1.22-add-v1beta3 branch from 241f2a3 to fa3efa1 Compare June 9, 2021 23:51

k8s-ci-robot assigned pacoxu Jun 10, 2021

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 10, 2021

pacoxu approved these changes Jun 15, 2021

View reviewed changes

k8s-ci-robot assigned jimangel Jun 15, 2021

k8s-ci-robot assigned tengqm Jun 16, 2021

k8s-ci-robot assigned PI-Victor Jun 16, 2021

k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed 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. labels Jul 1, 2021

pacoxu reviewed Jul 2, 2021

View reviewed changes

content/en/docs/setup/production-environment/tools/kubeadm/control-plane-flags.md Outdated Show resolved Hide resolved

pacoxu reviewed Jul 2, 2021

View reviewed changes

neolit123 force-pushed the 1.22-add-v1beta3 branch from 6b81fce to 0a52d89 Compare July 2, 2021 14:31

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

PI-Victor suggested changes Jul 5, 2021

View reviewed changes

neolit123 added 2 commits July 6, 2021 22:51

kubeadm/control-plane-flags: update the page to include general details

f288fc6

- Re-purpose the page to include more general details about customizing components. - Add details about using patches via the config API (v1.22 feature).

kubeadm/init-join.md: add note about using "skipPhases" from config

3437d01

Since 1.22 it will be possible to skip phases using the configuration file. Add note about that in the relevant sections of the kubeadm init and join reference pages.

neolit123 force-pushed the 1.22-add-v1beta3 branch from 0a52d89 to 3437d01 Compare July 6, 2021 19:52

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 6, 2021

neolit123 mentioned this pull request Jul 6, 2021

kubeadm: graduate the kubeadm configuration kubernetes/enhancements#970

Open

1 task

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

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 6, 2021

tengqm mentioned this pull request Jul 8, 2021

Redirect pointers to kubeadm config #28862

Closed

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 8, 2021

k8s-ci-robot merged commit 4c6a904 into kubernetes:dev-1.22 Jul 8, 2021

llamerada-jp mentioned this pull request Aug 6, 2021

Update kubeadm.k8s.io/v1beta2 to v1beta3 in configurations of kind topolvm/topolvm#340

Closed

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

kubeadm: use the new v1beta3 instead of v1beta2 #28360

kubeadm: use the new v1beta3 instead of v1beta2 #28360

neolit123 commented Jun 9, 2021 •

edited

Loading

k8sio-netlify-preview-bot commented Jun 9, 2021 •

edited by netlify bot

Loading

neolit123 commented Jun 9, 2021

neolit123 Jun 9, 2021

kbhawkey Jun 9, 2021

neolit123 Jun 9, 2021

pacoxu commented Jun 10, 2021

k8s-ci-robot commented Jun 10, 2021

neolit123 commented Jun 10, 2021 via email

pacoxu left a comment

tengqm commented Jun 16, 2021

PI-Victor commented Jun 16, 2021

neolit123 commented Jul 1, 2021

pacoxu Jul 2, 2021

neolit123 Jul 2, 2021 •

edited

Loading

pacoxu Jul 2, 2021

neolit123 Jul 2, 2021

pacoxu commented Jul 2, 2021

pacoxu commented Jul 5, 2021

k8s-ci-robot commented Jul 5, 2021

neolit123 commented Jul 6, 2021

PI-Victor commented Jul 6, 2021

k8s-ci-robot commented Jul 6, 2021

k8s-ci-robot commented Jul 6, 2021

neolit123 commented Jul 8, 2021

PI-Victor commented Jul 8, 2021


		{{< note >}}
		Duplicate flags (keys), or passing the same flag `--foo` multiple times, is currently not supported.

kubeadm: use the new v1beta3 instead of v1beta2 #28360

kubeadm: use the new v1beta3 instead of v1beta2 #28360

Conversation

neolit123 commented Jun 9, 2021 • edited Loading

k8sio-netlify-preview-bot commented Jun 9, 2021 • edited by netlify bot Loading

neolit123 commented Jun 9, 2021

neolit123 Jun 9, 2021

Choose a reason for hiding this comment

kbhawkey Jun 9, 2021

Choose a reason for hiding this comment

neolit123 Jun 9, 2021

Choose a reason for hiding this comment

pacoxu commented Jun 10, 2021

k8s-ci-robot commented Jun 10, 2021

neolit123 commented Jun 10, 2021 via email

pacoxu left a comment

Choose a reason for hiding this comment

tengqm commented Jun 16, 2021

PI-Victor commented Jun 16, 2021

neolit123 commented Jul 1, 2021

pacoxu Jul 2, 2021

Choose a reason for hiding this comment

neolit123 Jul 2, 2021 • edited Loading

Choose a reason for hiding this comment

pacoxu Jul 2, 2021

Choose a reason for hiding this comment

neolit123 Jul 2, 2021

Choose a reason for hiding this comment

pacoxu commented Jul 2, 2021

pacoxu commented Jul 5, 2021

k8s-ci-robot commented Jul 5, 2021

neolit123 commented Jul 6, 2021

PI-Victor commented Jul 6, 2021

k8s-ci-robot commented Jul 6, 2021

k8s-ci-robot commented Jul 6, 2021

neolit123 commented Jul 8, 2021

PI-Victor commented Jul 8, 2021

neolit123 commented Jun 9, 2021 •

edited

Loading

k8sio-netlify-preview-bot commented Jun 9, 2021 •

edited by netlify bot

Loading

neolit123 Jul 2, 2021 •

edited

Loading