Skip to content

Commit 269a07c

Browse files
committed
kubeadm-reset: fetch init config only if client is non-nil
1 parent 37f0138 commit 269a07c

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

cmd/kubeadm/app/cmd/reset.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,19 +63,18 @@ func NewCmdReset(in io.Reader, out io.Writer) *cobra.Command {
6363
ignorePreflightErrorsSet, err := validation.ValidateIgnorePreflightErrors(ignorePreflightErrors)
6464
kubeadmutil.CheckErr(err)
6565

66-
if _, err := os.Stat(kubeConfigFile); !os.IsNotExist(err) {
67-
client, err = getClientset(kubeConfigFile, false)
68-
kubeadmutil.CheckErr(err)
66+
var cfg *kubeadmapi.InitConfiguration
67+
client, err = getClientset(kubeConfigFile, false)
68+
if err == nil {
6969
klog.V(1).Infof("[reset] loaded client set from kubeconfig file: %s", kubeConfigFile)
70+
cfg, err = configutil.FetchInitConfigurationFromCluster(client, os.Stdout, "reset", false)
71+
if err != nil {
72+
klog.Warningf("[reset] Unable to fetch the kubeadm-config ConfigMap from cluster: %v", err)
73+
}
7074
} else {
7175
klog.V(1).Infof("[reset] could not get client set from missing kubeconfig file: %s", kubeConfigFile)
7276
}
7377

74-
cfg, err := configutil.FetchInitConfigurationFromCluster(client, os.Stdout, "reset", false)
75-
if err != nil {
76-
klog.Warningf("[reset] Unable to fetch the kubeadm-config ConfigMap from cluster: %v", err)
77-
}
78-
7978
if criSocketPath == "" {
8079
criSocketPath, err = resetDetectCRISocket(cfg)
8180
kubeadmutil.CheckErr(err)

0 commit comments

Comments
 (0)