mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #101110 from SataQiu/fix-kubeadm-20210414
kubeadm: fix inconsistent usage for --experimental-patches in join phases
This commit is contained in:
commit
dd6ee99f62
@ -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" {
|
||||||
|
Loading…
Reference in New Issue
Block a user