Skip to content

K
k3s
Unverified Commit 7cbb9995 authored by k8s-ci-robot's avatar k8s-ci-robot Committed by GitHub
Browse files
Options

Merge pull request #70023 from SataQiu/fix-20181019

clean up redundant code for kubeadm join
parents a6e27321 41937c21
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 5 deletions
cmd/kubeadm/app/cmd/join.go
View file @ 7cbb9995
...@@ -447,11 +447,6 @@ func (j *Join) CheckIfReadyForAdditionalControlPlane(initConfiguration *kubeadma ...@@ -447,11 +447,6 @@ func (j *Join) CheckIfReadyForAdditionalControlPlane(initConfiguration *kubeadma
// PrepareForHostingControlPlane makes all preparation activities require for a node hosting a new control plane instance // PrepareForHostingControlPlane makes all preparation activities require for a node hosting a new control plane instance
func (j *Join) PrepareForHostingControlPlane(initConfiguration *kubeadmapi.InitConfiguration) error { func (j *Join) PrepareForHostingControlPlane(initConfiguration *kubeadmapi.InitConfiguration) error {
// Creates the admin kubeconfig file for the admin and for kubeadm itself.
if err := kubeconfigphase.CreateAdminKubeConfigFile(kubeadmconstants.KubernetesDir, initConfiguration); err != nil {
return errors.Wrap(err, "error generating the admin kubeconfig file")
}
// Generate missing certificates (if any) // Generate missing certificates (if any)
if err := certsphase.CreatePKIAssets(initConfiguration); err != nil { if err := certsphase.CreatePKIAssets(initConfiguration); err != nil {
return err return err
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment