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

Merge pull request #73316 from rosti/fix-kubeadm-reset 

kubeadm: Fix auto CRI detection in kubeadm reset
pull/564/head
Kubernetes Prow Robot 2019-01-25 10:05:22 -08:00 committed by GitHub
parent f5f5d9a54a 873accd513
commit c6a6c65e32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,7 +67,7 @@ func NewCmdReset(in io.Reader, out io.Writer) *cobra.Command {
kubeadmutil.CheckErr(err) kubeadmutil.CheckErr(err)
} }
if criSocketPath != "" { if criSocketPath == "" {
criSocketPath, err = resetDetectCRISocket(client) criSocketPath, err = resetDetectCRISocket(client)
kubeadmutil.CheckErr(err) kubeadmutil.CheckErr(err)
klog.V(1).Infof("[reset] detected and using CRI socket: %s", criSocketPath) klog.V(1).Infof("[reset] detected and using CRI socket: %s", criSocketPath)