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

Merge pull request #79605 from SataQiu/automated-cherry-pick-of-#79498-up-release-1.15 

Automated cherry pick of #79498: kubeadm: fix bug for --cri-socket flag processing logic
k3s-v1.15.3
Kubernetes Prow Robot 2019-07-04 06:00:30 -07:00 committed by GitHub
parent a29b88ba37 8e34534bbf
commit 8d506eacb6
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{