set skipPhases in Init and JoinConfiguration #3624
Conversation
k8s-ci-robot
added
cncf-cla: yes
| @@ -117,18 +118,31 @@ func joinWorkers( | |||
|
|
|||
| // runKubeadmJoin executes kubeadm join command | |||
| func runKubeadmJoin(logger log.Logger, node nodes.Node) error { | |||
| // run kubeadm join | |||
| // TODO(bentheelder): this should be using the config file | |||
There was a problem hiding this comment.
@BenTheElder It seemed like this was the last missing piece for this TODO. Please let me know if there's still a gap here where this comment is still valuable.
There was a problem hiding this comment.
yep! thanks for fixing my ancient TODO 😅
| @@ -166,6 +170,14 @@ func (c *ConfigData) Derive() { | |||
| runtimeConfig = append(runtimeConfig, fmt.Sprintf("%s=%s", k, v)) | |||
| } | |||
| c.RuntimeConfigString = strings.Join(runtimeConfig, ",") | |||
|
|
|||
| // skip preflight checks, as these have undesirable side effects | |||
There was a problem hiding this comment.
TODO(bentheelder): write a fairer note here. this old comment kinda reads like they're a useless feature and that's not accurate, it's just not a good match for kind (we pre-pull images ourselves, we intentionally run in environments with swap on, etc. I wouldn't skip these if running kubeadm init directly on a linux host.
There was a problem hiding this comment.
(also the 1.13+ comment is now redundant, we stopped supporting Kubernetes < 1.15 in https://github.com/kubernetes-sigs/kind/releases/tag/v0.16.0)
There was a problem hiding this comment.
we can rewrite those old comments in a follow-up
@BenTheElder Sorry if you were still getting to this, but I took the liberty of making these changes here: #3632
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: BenTheElder, nojnhuh 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 |
k8s-ci-robot
added
the
approved
Fixes #3606.
This PR moves the
--skip-phasesflag from thekubeadm initandkubeadm joincommands to the config file for recent versions of Kubernetes to allow users to patch them from a Cluster config. Older (< 1.23) versions of Kubernetes will still specify the--skip-phasesflag for those commands for compatibility.