Merge pull request #67447 from pivotal-k8s/windows-cri-socket

Automatic merge from submit-queue (batch tested with PRs 67447, 67719). 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>. Set DefaultCRISocket on Windows **What this PR does / why we need it**: Updates the default location for the CRI socket on Windows to a TCP URI. This is documented by Docker [here](https://docs.docker.com/docker-for-windows/faqs/#how-do-i-connect-to-the-remote-docker-engine-api). **Release note**: ```release-note kubeadm: --cri-socket now defaults to tcp://localhost:2375 when running on Windows ```

Merge pull request #67447 from pivotal-k8s/windows-cri-socket
bb70b951 · Kubernetes Submit Queue · GitHub · d661a83b · 75c62e6f · bb70b951
Unverified Commit bb70b951 authored Aug 27, 2018 by Kubernetes Submit Queue Committed by GitHub Aug 27, 2018
6 changed files
--- a/cmd/kubeadm/app/apis/kubeadm/v1alpha2/defaults.go
+++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha2/defaults.go
@@ -47,8 +47,6 @@ const (
 	DefaultImageRepository = "k8s.gcr.io"
 	// DefaultManifestsDir defines default manifests directory
 	DefaultManifestsDir = "/etc/kubernetes/manifests"
-	// DefaultCRISocket defines the default cri socket
-	DefaultCRISocket = "/var/run/dockershim.sock"
 	// DefaultClusterName defines the default cluster name
 	DefaultClusterName = "kubernetes"

--- a/cmd/kubeadm/app/apis/kubeadm/v1alpha2/defaults_unix.go
+++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha2/defaults_unix.go
@@ -18,5 +18,9 @@ limitations under the License.
 package v1alpha2
-// DefaultCACertPath defines default location of CA certificate on Linux
+const (
-const DefaultCACertPath = "/etc/kubernetes/pki/ca.crt"
+	// DefaultCACertPath defines default location of CA certificate on Linux
+	DefaultCACertPath = "/etc/kubernetes/pki/ca.crt"
+	// DefaultCRISocket defines the default cri socket
+	DefaultCRISocket = "/var/run/dockershim.sock"
+)
--- a/cmd/kubeadm/app/apis/kubeadm/v1alpha2/defaults_windows.go
+++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha2/defaults_windows.go
@@ -18,5 +18,9 @@ limitations under the License.
 package v1alpha2
-// DefaultCACertPath defines default location of CA certificate on Windows
+const (
-const DefaultCACertPath = "C:/etc/kubernetes/pki/ca.crt"
+	// DefaultCACertPath defines default location of CA certificate on Windows
+	DefaultCACertPath = "C:/etc/kubernetes/pki/ca.crt"
+	// DefaultCRISocket defines the default cri socket
+	DefaultCRISocket = "tcp://localhost:2375"
+)
--- a/cmd/kubeadm/app/apis/kubeadm/v1alpha3/defaults.go
+++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha3/defaults.go
@@ -42,8 +42,6 @@ const (
 	DefaultImageRepository = "k8s.gcr.io"
 	// DefaultManifestsDir defines default manifests directory
 	DefaultManifestsDir = "/etc/kubernetes/manifests"
-	// DefaultCRISocket defines the default cri socket
-	DefaultCRISocket = "/var/run/dockershim.sock"
 	// DefaultClusterName defines the default cluster name
 	DefaultClusterName = "kubernetes"

--- a/cmd/kubeadm/app/apis/kubeadm/v1alpha3/defaults_unix.go
+++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha3/defaults_unix.go
@@ -18,8 +18,11 @@ limitations under the License.
 package v1alpha3
-// DefaultCACertPath defines default location of CA certificate on Linux
+const (
-const DefaultCACertPath = "/etc/kubernetes/pki/ca.crt"
+	// DefaultCACertPath defines default location of CA certificate on Linux
+	DefaultCACertPath = "/etc/kubernetes/pki/ca.crt"
-// DefaultSocketUrlScheme defines default socket url prefix
+	// DefaultSocketUrlScheme defines default socket url prefix
-const DefaultUrlScheme = "unix"
+	DefaultUrlScheme = "unix"
+	// DefaultCRISocket defines the default cri socket
+	DefaultCRISocket = "/var/run/dockershim.sock"
+)
--- a/cmd/kubeadm/app/apis/kubeadm/v1alpha3/defaults_windows.go
+++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha3/defaults_windows.go
@@ -18,8 +18,11 @@ limitations under the License.
 package v1alpha3
-// DefaultCACertPath defines default location of CA certificate on Windows
+const (
-const DefaultCACertPath = "C:/etc/kubernetes/pki/ca.crt"
+	// DefaultCACertPath defines default location of CA certificate on Windows
+	DefaultCACertPath = "C:/etc/kubernetes/pki/ca.crt"
-// DefaultSocketUrlScheme defines default socket url prefix
+	// DefaultSocketUrlScheme defines default socket url prefix
-const DefaultUrlScheme = "tcp"
+	DefaultUrlScheme = "tcp"
+	// DefaultCRISocket defines the default cri socket
+	DefaultCRISocket = "tcp://localhost:2375"
+)