Skip to content

K
k3s
Commit 7a8de82d authored by Ed Bartosh's avatar Ed Bartosh
Browse files
Options

kubeadm: fix kubeadm reset logic

If /etc/kubeadm/amdin.conf doesn't exist kubeadm reset fails with the error: failed to load admin kubeconfig: open /root/.kube/config: no such file or directory Fixed by properly checking if file exists before using it.
parent 30c7df5c
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 6 deletions
cmd/kubeadm/app/cmd/reset.go
View file @ 7a8de82d
......@@ -62,8 +62,10 @@ func NewCmdReset(in io.Reader, out io.Writer) *cobra.Command {
kubeadmutil.CheckErr(err)
kubeConfigFile = cmdutil.FindExistingKubeConfig(kubeConfigFile)
client, err = getClientset(kubeConfigFile, false)
kubeadmutil.CheckErr(err)
if _, err := os.Stat(kubeConfigFile); !os.IsNotExist(err) {
client, err = getClientset(kubeConfigFile, false)
kubeadmutil.CheckErr(err)
}
if criSocketPath == "" {
criSocketPath, err = resetDetectCRISocket(client)
......@@ -298,10 +300,12 @@ func resetConfigDir(configPathDir, pkiPathDir string) {
}
func resetDetectCRISocket(client clientset.Interface) (string, error) {
// first try to connect to the cluster for the CRI socket
cfg, err := configutil.FetchInitConfigurationFromCluster(client, os.Stdout, "reset", false)
if err == nil {
return cfg.NodeRegistration.CRISocket, nil
if client != nil {
// first try to connect to the cluster for the CRI socket
cfg, err := configutil.FetchInitConfigurationFromCluster(client, os.Stdout, "reset", false)
if err == nil {
return cfg.NodeRegistration.CRISocket, nil
}
}
// if this fails, try to detect it
......
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