Skip to content

K
k3s
Unverified Commit b5b627d5 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

Merge pull request #73636 from bart0sh/PR0059-kubeadm-reset-fix-null-pointer-dereference

kubeadm: fix nil pointer dereference
parents 53a7601e ab655a29
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
cmd/kubeadm/app/cmd/reset.go
View file @ b5b627d5
...@@ -62,10 +62,8 @@ func NewCmdReset(in io.Reader, out io.Writer) *cobra.Command { ...@@ -62,10 +62,8 @@ func NewCmdReset(in io.Reader, out io.Writer) *cobra.Command {
kubeadmutil.CheckErr(err) kubeadmutil.CheckErr(err)
kubeConfigFile = cmdutil.FindExistingKubeConfig(kubeConfigFile) kubeConfigFile = cmdutil.FindExistingKubeConfig(kubeConfigFile)
if _, err := os.Stat(kubeConfigFile); !os.IsNotExist(err) { client, err = getClientset(kubeConfigFile, false)
client, err = getClientset(kubeConfigFile, false) kubeadmutil.CheckErr(err)
kubeadmutil.CheckErr(err)
}
if criSocketPath == "" { if criSocketPath == "" {
criSocketPath, err = resetDetectCRISocket(client) criSocketPath, err = resetDetectCRISocket(client)
......
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