Skip to content

K
k3s
Commit dfd0f9d1 authored by Brad Davidson's avatar Brad Davidson
Browse files
Options

Correctly report and propagate kubeconfig write failures

As seen in issues such as #15 #155 #518 #570 there are situations where k3s will fail to write the kubeconfig file, but reports that it wrote it anyway as the success message is printed unconditionally. Also, secondary actions like setting file mode and creating a symlink are also attempted even if the file was not created. This change skips attempting additional actions, and propagates the failure back upwards. Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent 4eb88a2f
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
pkg/server/server.go
View file @ dfd0f9d1
......@@ -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,
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)
return err
}
if config.ControlConfig.KubeConfigMode != "" {
......@@ -303,7 +306,6 @@ func writeKubeConfig(certs string, config *Config) error {
}
}
logrus.Infof("Wrote kubeconfig %s", kubeConfig)
if def {
logrus.Infof("Run: %s kubectl", filepath.Base(os.Args[0]))
}
......
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