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

k8s-ci-robot · web-flow · commit c6a6c65e32eb · 2019-01-25T10:05:22.000-08:00
kubeadm: Fix auto CRI detection in kubeadm reset
diff --git a/cmd/kubeadm/app/cmd/reset.go b/cmd/kubeadm/app/cmd/reset.go
@@ -67,7 +67,7 @@ func NewCmdReset(in io.Reader, out io.Writer) *cobra.Command {
 				kubeadmutil.CheckErr(err)
 			}
 
-			if criSocketPath != "" {
+			if criSocketPath == "" {
 				criSocketPath, err = resetDetectCRISocket(client)
 				kubeadmutil.CheckErr(err)
 				klog.V(1).Infof("[reset] detected and using CRI socket: %s", criSocketPath)

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ func NewCmdReset(in io.Reader, out io.Writer) *cobra.Command {`
`67`	`67`	`kubeadmutil.CheckErr(err)`
`68`	`68`	`}`
`69`	`69`
`70`		`- if criSocketPath != "" {`
	`70`	`+ if criSocketPath == "" {`
`71`	`71`	`criSocketPath, err = resetDetectCRISocket(client)`
`72`	`72`	`kubeadmutil.CheckErr(err)`
`73`	`73`	`klog.V(1).Infof("[reset] detected and using CRI socket: %s", criSocketPath)`