github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #83661 from jfbai/fix-kubeadm-join

Browse Source 
Add warning when --certificate-key is set and --control-plane is not.
This commit is contained in:
Kubernetes Prow Robot 2019-10-13 08:00:35 -07:00 committed by GitHub
commit f0e1d394f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/kubeadm/app/cmd/join.go
View File

@ -342,6 +342,9 @@ func newJoinData(cmd *cobra.Command, args []string, opt *joinOptions, out io.Wri
// if not joining a control plane, unset the ControlPlane object // if not joining a control plane, unset the ControlPlane object
if !opt.controlPlane { if !opt.controlPlane {
if opt.externalcfg.ControlPlane != nil {
klog.Warningf("[preflight] WARNING: JoinControlPane.controlPlane settings will be ignored when %s flag is not set.", options.ControlPlane)
}
opt.externalcfg.ControlPlane = nil opt.externalcfg.ControlPlane = nil
} }