github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #74869 from neolit123/fix-reset-fetch

Browse Source 
kubeadm-reset: fetch init config only if client is non-nil
This commit is contained in:
Kubernetes Prow Robot 2019-03-04 00:25:57 -08:00 committed by GitHub
commit 3b4a9e4e71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/kubeadm/app/cmd/reset.go
View File

@ -63,19 +63,18 @@ func NewCmdReset(in io.Reader, out io.Writer) *cobra.Command {
ignorePreflightErrorsSet, err := validation.ValidateIgnorePreflightErrors(ignorePreflightErrors) ignorePreflightErrorsSet, err := validation.ValidateIgnorePreflightErrors(ignorePreflightErrors)
kubeadmutil.CheckErr(err) kubeadmutil.CheckErr(err)
if _, err := os.Stat(kubeConfigFile); !os.IsNotExist(err) { var cfg *kubeadmapi.InitConfiguration
client, err = getClientset(kubeConfigFile, false) client, err = getClientset(kubeConfigFile, false)
kubeadmutil.CheckErr(err) if err == nil {
klog.V(1).Infof("[reset] loaded client set from kubeconfig file: %s", kubeConfigFile) klog.V(1).Infof("[reset] loaded client set from kubeconfig file: %s", kubeConfigFile)
cfg, err = configutil.FetchInitConfigurationFromCluster(client, os.Stdout, "reset", false)
if err != nil {
klog.Warningf("[reset] Unable to fetch the kubeadm-config ConfigMap from cluster: %v", err)
}
} else { } else {
klog.V(1).Infof("[reset] could not get client set from missing kubeconfig file: %s", kubeConfigFile) klog.V(1).Infof("[reset] could not get client set from missing kubeconfig file: %s", kubeConfigFile)
} }
cfg, err := configutil.FetchInitConfigurationFromCluster(client, os.Stdout, "reset", false)
if err != nil {
klog.Warningf("[reset] Unable to fetch the kubeadm-config ConfigMap from cluster: %v", err)
}
if criSocketPath == "" { if criSocketPath == "" {
criSocketPath, err = resetDetectCRISocket(cfg) criSocketPath, err = resetDetectCRISocket(cfg)
kubeadmutil.CheckErr(err) kubeadmutil.CheckErr(err)