mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 12:15:52 +00:00
Merge pull request #69846 from andrewrynhard/fix-kubeadm-join-taints
kubeadm: Fix node join taints
This commit is contained in:
commit
125cb7b1ad
@ -68,7 +68,7 @@ var (
|
|||||||
`)
|
`)
|
||||||
|
|
||||||
notReadyToJoinControPlaneTemp = template.Must(template.New("join").Parse(dedent.Dedent(`
|
notReadyToJoinControPlaneTemp = template.Must(template.New("join").Parse(dedent.Dedent(`
|
||||||
One or more conditions for hosting a new control plane instance is not satisfied.
|
One or more conditions for hosting a new control plane instance is not satisfied.
|
||||||
|
|
||||||
{{.Error}}
|
{{.Error}}
|
||||||
|
|
||||||
@ -81,7 +81,7 @@ var (
|
|||||||
|
|
||||||
joinControPlaneDoneTemp = template.Must(template.New("join").Parse(dedent.Dedent(`
|
joinControPlaneDoneTemp = template.Must(template.New("join").Parse(dedent.Dedent(`
|
||||||
This node has joined the cluster and a new control plane instance was created:
|
This node has joined the cluster and a new control plane instance was created:
|
||||||
|
|
||||||
* Certificate signing request was sent to apiserver and approval was received.
|
* Certificate signing request was sent to apiserver and approval was received.
|
||||||
* The Kubelet was informed of the new secure connection details.
|
* The Kubelet was informed of the new secure connection details.
|
||||||
* Master label and taint were applied to the new node.
|
* Master label and taint were applied to the new node.
|
||||||
@ -94,7 +94,7 @@ var (
|
|||||||
sudo chown $(id -u):$(id -g) $HOME/.kube/config
|
sudo chown $(id -u):$(id -g) $HOME/.kube/config
|
||||||
|
|
||||||
Run 'kubectl get nodes' to see this node join the cluster.
|
Run 'kubectl get nodes' to see this node join the cluster.
|
||||||
|
|
||||||
`)))
|
`)))
|
||||||
|
|
||||||
joinLongDescription = dedent.Dedent(`
|
joinLongDescription = dedent.Dedent(`
|
||||||
@ -513,10 +513,11 @@ func (j *Join) BootstrapKubelet(tlsBootstrapCfg *clientcmdapi.Config) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Write env file with flags for the kubelet to use. We do not need to write the --register-with-taints for the master,
|
// Write env file with flags for the kubelet to use. We only want to
|
||||||
// as we handle that ourselves in the markmaster phase
|
// register the joining node with the specified taints if the node
|
||||||
// TODO: Maybe we want to do that some time in the future, in order to remove some logic from the markmaster phase?
|
// is not a master. The markmaster phase will register the taints otherwise.
|
||||||
if err := kubeletphase.WriteKubeletDynamicEnvFile(&j.cfg.NodeRegistration, j.cfg.FeatureGates, false, kubeadmconstants.KubeletRunDirectory); err != nil {
|
registerTaintsUsingFlags := !j.cfg.ControlPlane
|
||||||
|
if err := kubeletphase.WriteKubeletDynamicEnvFile(&j.cfg.NodeRegistration, j.cfg.FeatureGates, registerTaintsUsingFlags, kubeadmconstants.KubeletRunDirectory); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user