Skip to content

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

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

kubeadm: Fix auto CRI detection in kubeadm reset
parents f5f5d9a5 873accd5
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
cmd/kubeadm/app/cmd/reset.go
View file @ c6a6c65e
...@@ -67,7 +67,7 @@ func NewCmdReset(in io.Reader, out io.Writer) *cobra.Command { ...@@ -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)
......
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