Merge pull request kubernetes#95786 from Sh4d1/add_missing_kubeadm_patch

k8s-ci-robot · web-flow · commit 254f3e26abd6 · 2020-10-23T02:27:45.000-07:00
fix: add missing patch flag for kubeadm init phase control-plane
diff --git a/cmd/kubeadm/app/cmd/phases/init/controlplane.go b/cmd/kubeadm/app/cmd/phases/init/controlplane.go
@@ -100,6 +100,7 @@ func getControlPlanePhaseFlags(name string) []string {
 		options.CertificatesDir,
 		options.KubernetesVersion,
 		options.ImageRepository,
+		options.Patches,
 	}
 	if name == "all" || name == kubeadmconstants.KubeAPIServer {
 		flags = append(flags,

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,7 @@ func getControlPlanePhaseFlags(name string) []string {`
`100`	`100`	`options.CertificatesDir,`
`101`	`101`	`options.KubernetesVersion,`
`102`	`102`	`options.ImageRepository,`
	`103`	`+ options.Patches,`
`103`	`104`	`}`
`104`	`105`	`if name == "all" \|\| name == kubeadmconstants.KubeAPIServer {`
`105`	`106`	`flags = append(flags,`