github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

kubeadm: fix nil pointer dereference
pull/564/head
Kubernetes Prow Robot 2019-02-01 09:03:56 -08:00 committed by GitHub
parent 53a7601e6a ab655a29b8
commit b5b627d522
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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)