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

Merge pull request #39450 from pipejakob/file-disc 

Automatic merge from submit-queue (batch tested with PRs 36229, 39450)

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).

CC @mikedanese 

**Release note**:
```release-note
NONE
```
pull/6/head
Kubernetes Submit Queue 2017-01-04 17:36:08 -08:00 committed by GitHub
parent f4a8713088 5cc36c9f05
commit 84df067967
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,14 +131,14 @@ func (j *Join) Validate() error {
// Run executes worked node provisioning and tries to join an existing cluster. // Run executes worked node provisioning and tries to join an existing cluster.
func (j *Join) Run(out io.Writer) error { func (j *Join) Run(out io.Writer) error {
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) clusterInfo, err := kubenode.RetrieveTrustedClusterInfo(j.cfg.Discovery.Token)
if err != nil { if err != nil {
return err 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 {
connectionDetails, err := kubenode.EstablishMasterConnection(j.cfg.Discovery.Token, clusterInfo) connectionDetails, err := kubenode.EstablishMasterConnection(j.cfg.Discovery.Token, clusterInfo)
if err != nil { if err != nil {
return err return err
@ -152,7 +152,7 @@ func (j *Join) Run(out io.Writer) error {
return err return err
} }
} else { } else {
cfg, err = discovery.For(j.cfg.Discovery) cfg, err := discovery.For(j.cfg.Discovery)
if err != nil { if err != nil {
return err 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 { if err != nil {
return err return err
} }