Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2064 from brandond/write_kubeconfig_claim

Browse Source 
Correctly report and propagate kubeconfig write failures
This commit is contained in:
Brad Davidson 2020-07-27 16:28:45 -07:00 committed by GitHub
commit 361e218fef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/server/server.go
View File

@ -282,8 +282,11 @@ func writeKubeConfig(certs string, config *Config) error {
} }
if err = clientaccess.WriteClientKubeConfig(kubeConfig, url, config.ControlConfig.Runtime.ServerCA, config.ControlConfig.Runtime.ClientAdminCert, if err = clientaccess.WriteClientKubeConfig(kubeConfig, url, config.ControlConfig.Runtime.ServerCA, config.ControlConfig.Runtime.ClientAdminCert,
config.ControlConfig.Runtime.ClientAdminKey); err != nil { config.ControlConfig.Runtime.ClientAdminKey); err == nil {
logrus.Infof("Wrote kubeconfig %s", kubeConfig)
} else {
logrus.Errorf("Failed to generate kubeconfig: %v", err) logrus.Errorf("Failed to generate kubeconfig: %v", err)
return err
} }
if config.ControlConfig.KubeConfigMode != "" { if config.ControlConfig.KubeConfigMode != "" {
@ -303,7 +306,6 @@ func writeKubeConfig(certs string, config *Config) error {
} }
} }
logrus.Infof("Wrote kubeconfig %s", kubeConfig)
if def { if def {
logrus.Infof("Run: %s kubectl", filepath.Base(os.Args[0])) logrus.Infof("Run: %s kubectl", filepath.Base(os.Args[0]))
} }