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

Use "kubeadm join" to join masters to control plane #6661

Merged
merged 1 commit into from
Sep 17, 2020
Merged

Use "kubeadm join" to join masters to control plane #6661

merged 1 commit into from
Sep 17, 2020

Conversation

hafe
Copy link
Contributor

@hafe hafe commented Sep 10, 2020 •
edited
Loading

Remove configuration variable kubeadm_control_plane

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespaces from that line:

/kind api-change
/kind bug

/kind cleanup

/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake

What this PR does / why we need it:

For a background see discussion in #6400

Official kubeadm instructions use "kubeadm join" as the way to join control plane nodes to an existing control plane.

In kubespray instead "kubeadm init" has been used as the default legacy method. "kubeadm join" do exist but has been considered experimental. The mode used is controlled by a variable "kubeadm_control_plane".

This PR removes the legacy "init" mode and uses what is recommended/documented by kubeadm. Consequently the variable kubeadm_control_plane is removed.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

@k8s-ci-robot k8s-ci-robot added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 10, 2020
@k8s-ci-robot
Copy link
Contributor

Hi @hafe. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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/test-infra repository.

@k8s-ci-robot k8s-ci-robot requested review from bozzo and EppO September 10, 2020 18:18
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 10, 2020
@hafe
Use "kubeadm join" to join masters to control plane
a122c6e 
Remove configuration variable kubeadm_control_plane
@hafe
Copy link
Contributor Author

hafe commented Sep 11, 2020

/retest

@k8s-ci-robot
Copy link
Contributor

@hafe: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

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/test-infra repository.

@EppO
Copy link
Contributor

EppO commented Sep 11, 2020

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 11, 2020
@EppO
Copy link
Contributor

EppO commented Sep 11, 2020

like it! thanks for tackling this

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 11, 2020
@Miouge1
Copy link
Contributor

Miouge1 commented Sep 17, 2020

@hafe can you fill in the PR description? It's good to link to the issue discussion for context, but a summary would be useful here.

@hafe
Copy link
Contributor Author

hafe commented Sep 17, 2020

Sure, will do

@woopstar
Copy link
Member

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hafe, woopstar

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 17, 2020
@k8s-ci-robot k8s-ci-robot merged commit 6da385d into kubernetes-sigs:master Sep 17, 2020
erulabs added a commit to kubesail/kubespray that referenced this pull request Sep 19, 2020
@erulabs
Merge branch 'master' of https://github.com/kubernetes-sigs/kubespray
f7cbc45 
* 'master' of https://github.com/kubernetes-sigs/kubespray: (21 commits)
  Make sure node_ip is set if node is in etcd group (kubernetes-sigs#6719)
  Fix order of OS CI cleanup (kubernetes-sigs#6714)
  Remove vagrant.deb from docker image (kubernetes-sigs#6717)
  Move floruyt to approver (kubernetes-sigs#6713)
  Add support for periodic CI (kubernetes-sigs#6715)
  Ignore pause from kubeadm config images list (kubernetes-sigs#6689)
  Ignore error in check mode when disabling swap (kubernetes-sigs#6703)
  flannel image arch specific tag (kubernetes-sigs#6685)
  Added missing permissions for operator. (kubernetes-sigs#6683)
  Add Kubernetes hashes 1.19.2/1.18.9/1.17.12 and set default (kubernetes-sigs#6698)
  Cleanup virsh volumes in Vagrant CI (kubernetes-sigs#6688)
  Use "kubeadm join" to join masters to control plane (kubernetes-sigs#6661)
  Remove workaround with kube_proxy_remove (kubernetes-sigs#6512)
  fix incorrect documentation of use_access_ip (kubernetes-sigs#6674)
  make metallb image repos configurable (kubernetes-sigs#6671) (kubernetes-sigs#6672)
  fix remove node (kubernetes-sigs#6666)
  Allow configuration of nodelabels in local_volume_provisioner (kubernetes-sigs#6620)
  Add support for Calico CNI host-local IPAM plugin (kubernetes-sigs#6580)
  Update third party librairies and tools (kubernetes-sigs#6669)
  Updated KataContainers version to 1.11.3 (kubernetes-sigs#6694)
  ...
@floryut floryut mentioned this pull request Dec 19, 2020
Closed
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Jan 16, 2021
@hafe @LuckySB
Use "kubeadm join" to join masters to control plane (kubernetes-sigs#…
c962925 
…6661)

Remove configuration variable kubeadm_control_plane
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bozzo bozzo Awaiting requested review from bozzo

@EppO EppO Awaiting requested review from EppO

Assignees

@EppO EppO

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. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@hafe @k8s-ci-robot @EppO @Miouge1 @woopstar