github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 13:07:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #101110 from SataQiu/fix-kubeadm-20210414

Browse Source 
kubeadm: fix inconsistent usage for --experimental-patches in join phases
This commit is contained in:
Kubernetes Prow Robot 2021-04-16 03:22:22 -07:00 committed by GitHub
commit dd6ee99f62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/cmd/phases/join/controlplanejoin.go
View File

@ -43,7 +43,7 @@ func getControlPlaneJoinPhaseFlags(name string) []string {
options.ControlPlane, options.ControlPlane,
options.NodeName, options.NodeName,
} }
if name == "etcd" { if name == "etcd" || name == "all" {
flags = append(flags, options.Patches) flags = append(flags, options.Patches)
} }
if name != "mark-control-plane" { if name != "mark-control-plane" {