github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #74751 from fabriziopandini/cleanup-join-phases-flags 

cleanup-join-phases-flags
pull/564/head
Kubernetes Prow Robot 2019-02-28 17:52:30 -08:00 committed by GitHub
parent 1c71f6b078 d102dac411
commit 9fd7a4c2dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,10 +44,12 @@ func getControlPlaneJoinPhaseFlags() []string {
options.CfgPath, options.CfgPath,
options.ControlPlane, options.ControlPlane,
options.NodeName, options.NodeName,
options.FileDiscovery,
options.TokenDiscovery, options.TokenDiscovery,
options.TokenDiscoveryCAHash, options.TokenDiscoveryCAHash,
options.TokenDiscoverySkipCAHash, options.TokenDiscoverySkipCAHash,
options.KubeconfigPath, options.TLSBootstrapToken,
options.TokenStr,
} }
} }

13
cmd/kubeadm/app/cmd/phases/join/controlplaneprepare.go
View File

@ -43,7 +43,9 @@ func NewControlPlanePreparePhase() workflow.Phase {
{ {
Name: "all", Name: "all",
Short: "Prepares the machine for serving a control plane.", Short: "Prepares the machine for serving a control plane.",
InheritFlags: getControlPlanePreparePhaseFlags(), InheritFlags: append(getControlPlanePreparePhaseFlags(),
options.CertificateKey,
),
RunAllSiblings: true, RunAllSiblings: true,
}, },
newControlPlanePrepareDownloadCertsSubphase(), newControlPlanePrepareDownloadCertsSubphase(),
@ -61,10 +63,12 @@ func getControlPlanePreparePhaseFlags() []string {
options.CfgPath, options.CfgPath,
options.ControlPlane, options.ControlPlane,
options.NodeName, options.NodeName,
options.FileDiscovery,
options.TokenDiscovery, options.TokenDiscovery,
options.TokenDiscoveryCAHash, options.TokenDiscoveryCAHash,
options.TokenDiscoverySkipCAHash, options.TokenDiscoverySkipCAHash,
options.CertificateKey, options.TLSBootstrapToken,
options.TokenStr,
} }
} }
@ -74,10 +78,9 @@ func newControlPlanePrepareDownloadCertsSubphase() workflow.Phase {
Short: fmt.Sprintf("Download certificates from %s", kubeadmconstants.KubeadmCertsSecret), Short: fmt.Sprintf("Download certificates from %s", kubeadmconstants.KubeadmCertsSecret),
Long: cmdutil.MacroCommandLongDescription, Long: cmdutil.MacroCommandLongDescription,
Run: runControlPlanePrepareDownloadCertsPhaseLocal, Run: runControlPlanePrepareDownloadCertsPhaseLocal,
InheritFlags: []string{ InheritFlags: append(getControlPlanePreparePhaseFlags(),
options.CfgPath,
options.CertificateKey, options.CertificateKey,
}, ),
} }
} }

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

@ -64,10 +64,11 @@ func NewKubeletStartPhase() workflow.Phase {
options.CfgPath, options.CfgPath,
options.NodeCRISocket, options.NodeCRISocket,
options.NodeName, options.NodeName,
options.TLSBootstrapToken, options.FileDiscovery,
options.TokenDiscovery, options.TokenDiscovery,
options.TokenDiscoveryCAHash, options.TokenDiscoveryCAHash,
options.TokenDiscoverySkipCAHash, options.TokenDiscoverySkipCAHash,
options.TLSBootstrapToken,
options.TokenStr, options.TokenStr,
}, },
} }

1
cmd/kubeadm/app/cmd/phases/join/preflight.go
View File

@ -73,6 +73,7 @@ func NewPreflightPhase() workflow.Phase {
options.TokenDiscovery, options.TokenDiscovery,
options.TokenDiscoveryCAHash, options.TokenDiscoveryCAHash,
options.TokenDiscoverySkipCAHash, options.TokenDiscoverySkipCAHash,
options.CertificateKey,
}, },
} }
} }