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

Merge pull request #70023 from SataQiu/fix-20181019

Browse Source 
clean up redundant code for kubeadm join
This commit is contained in:
k8s-ci-robot 2018-10-20 11:17:53 -07:00 committed by GitHub
commit 7cbb999518
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/kubeadm/app/cmd/join.go
View File

@ -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