github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #79498 from SataQiu/fix-kubeadm-20190628

Browse Source 
kubeadm: fix bug for --cri-socket flag processing logic
This commit is contained in:
Kubernetes Prow Robot 2019-07-01 06:09:20 -07:00 committed by GitHub
commit 7db459a11b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,6 +118,9 @@ func newResetData(cmd *cobra.Command, options *resetOptions, in io.Reader, out i
return nil, err
}
klog.V(1).Infof("[reset] Detected and using CRI socket: %s", criSocketPath)
} else {
criSocketPath = options.criSocketPath
klog.V(1).Infof("[reset] Using specified CRI socket: %s", criSocketPath)
}
return &resetData{