Merge pull request #64911 from bart0sh/PR0019-use-DefaultCRISocket-constant-in-reset

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. kubeadm: use constant instead of hardcoded path **What this PR does / why we need it**: Used DefaultCRISocket constant instead of hardcoded path /var/run/dockershim.sock **Release note**: ```release-note NONE ```

Merge pull request #64911 from bart0sh/PR0019-use-DefaultCRISocket-constant-in-reset
c5967fbb · Kubernetes Submit Queue · GitHub · d10ff1a2 · 00fb7aad · c5967fbb
Unverified Commit c5967fbb authored Jul 05, 2018 by Kubernetes Submit Queue Committed by GitHub Jul 05, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

reset.go cmd/kubeadm/app/cmd/reset.go +1 -1

reset_test.go cmd/kubeadm/app/cmd/reset_test.go +1 -1

No files found.
--- a/cmd/kubeadm/app/cmd/reset.go
+++ b/cmd/kubeadm/app/cmd/reset.go
@@ -76,7 +76,7 @@ func NewCmdReset(in io.Reader, out io.Writer) *cobra.Command {
 	)
 	cmd.PersistentFlags().StringVar(
-		&criSocketPath, "cri-socket", "/var/run/dockershim.sock",
+		&criSocketPath, "cri-socket", kubeadmapiv1alpha3.DefaultCRISocket,
 		"The path to the CRI socket to use with crictl when cleaning up containers.",
 	)

--- a/cmd/kubeadm/app/cmd/reset_test.go
+++ b/cmd/kubeadm/app/cmd/reset_test.go
@@ -58,7 +58,7 @@ func assertDirEmpty(t *testing.T, path string) {
 func TestNewReset(t *testing.T) {
 	var in io.Reader
 	certsDir := kubeadmapiv1alpha3.DefaultCertificatesDir
-	criSocketPath := "/var/run/dockershim.sock"
+	criSocketPath := kubeadmapiv1alpha3.DefaultCRISocket
 	skipPreFlight := false
 	forceReset := true