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

k8s-ci-robot · web-flow · commit f0e1d394f135 · 2019-10-13T08:00:35.000-07:00
Add warning when --certificate-key is set and --control-plane is not.
diff --git a/cmd/kubeadm/app/cmd/join.go b/cmd/kubeadm/app/cmd/join.go
@@ -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 !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
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -342,6 +342,9 @@ func newJoinData(cmd cobra.Command, args []string, opt joinOptions, out io.Wri`
`342`	`342`
`343`	`343`	`// if not joining a control plane, unset the ControlPlane object`
`344`	`344`	`if !opt.controlPlane {`
	`345`	`+ if opt.externalcfg.ControlPlane != nil {`
	`346`	`+ klog.Warningf("[preflight] WARNING: JoinControlPane.controlPlane settings will be ignored when %s flag is not set.", options.ControlPlane)`
	`347`	`+ }`
`345`	`348`	`opt.externalcfg.ControlPlane = nil`
`346`	`349`	`}`
`347`	`350`