From 5cc36c9f05fbd584a38ba9da14157515794eee74 Mon Sep 17 00:00:00 2001 From: Jacob Beacham Date: Wed, 4 Jan 2017 15:40:52 -0800 Subject: [PATCH] Bugfix on kubeadm join with non-token discovery. Without this change, using a non-token discovery mechanism during a join triggers a nil pointer panic (instead of an error message about not being implemented yet). --- cmd/kubeadm/app/cmd/join.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/kubeadm/app/cmd/join.go b/cmd/kubeadm/app/cmd/join.go index 27bd2160e60..9fb8346062a 100644 --- a/cmd/kubeadm/app/cmd/join.go +++ b/cmd/kubeadm/app/cmd/join.go @@ -131,14 +131,14 @@ func (j *Join) Validate() error { // Run executes worked node provisioning and tries to join an existing cluster. func (j *Join) Run(out io.Writer) error { - clusterInfo, err := kubenode.RetrieveTrustedClusterInfo(j.cfg.Discovery.Token) - if err != nil { - return err - } - var cfg *clientcmdapi.Config // TODO: delete this first block when we move Token to the discovery interface if j.cfg.Discovery.Token != nil { + clusterInfo, err := kubenode.RetrieveTrustedClusterInfo(j.cfg.Discovery.Token) + if err != nil { + return err + } + connectionDetails, err := kubenode.EstablishMasterConnection(j.cfg.Discovery.Token, clusterInfo) if err != nil { return err @@ -152,7 +152,7 @@ func (j *Join) Run(out io.Writer) error { return err } } else { - cfg, err = discovery.For(j.cfg.Discovery) + cfg, err := discovery.For(j.cfg.Discovery) if err != nil { return err } @@ -161,7 +161,7 @@ func (j *Join) Run(out io.Writer) error { } } - err = kubeconfigphase.WriteKubeconfigToDisk(path.Join(kubeadmapi.GlobalEnvParams.KubernetesDir, kubeconfigphase.KubeletKubeConfigFileName), cfg) + err := kubeconfigphase.WriteKubeconfigToDisk(path.Join(kubeadmapi.GlobalEnvParams.KubernetesDir, kubeconfigphase.KubeletKubeConfigFileName), cfg) if err != nil { return err }