diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha2/defaults.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha2/defaults.go index 48b32c0b986..73225f6c6c5 100644 --- 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" diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha2/defaults_unix.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha2/defaults_unix.go index 7dbc7f21aea..0c5ee1035a7 100644 --- 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 DefaultCACertPath = "/etc/kubernetes/pki/ca.crt" +const ( + // 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" +) diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha2/defaults_windows.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha2/defaults_windows.go index bbbb4627238..779dd5290c3 100644 --- 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 DefaultCACertPath = "C:/etc/kubernetes/pki/ca.crt" +const ( + // 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" +) diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha3/defaults.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha3/defaults.go index e7921a3544c..da1ff468458 100644 --- 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" diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha3/defaults_unix.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha3/defaults_unix.go index 8aab5c6ed9d..8a8962872fd 100644 --- 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 DefaultCACertPath = "/etc/kubernetes/pki/ca.crt" - -// DefaultSocketUrlScheme defines default socket url prefix -const DefaultUrlScheme = "unix" +const ( + // DefaultCACertPath defines default location of CA certificate on Linux + DefaultCACertPath = "/etc/kubernetes/pki/ca.crt" + // DefaultSocketUrlScheme defines default socket url prefix + DefaultUrlScheme = "unix" + // DefaultCRISocket defines the default cri socket + DefaultCRISocket = "/var/run/dockershim.sock" +) diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha3/defaults_windows.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha3/defaults_windows.go index 76562023489..d5cc345403e 100644 --- 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 DefaultCACertPath = "C:/etc/kubernetes/pki/ca.crt" - -// DefaultSocketUrlScheme defines default socket url prefix -const DefaultUrlScheme = "tcp" +const ( + // DefaultCACertPath defines default location of CA certificate on Windows + DefaultCACertPath = "C:/etc/kubernetes/pki/ca.crt" + // DefaultSocketUrlScheme defines default socket url prefix + DefaultUrlScheme = "tcp" + // DefaultCRISocket defines the default cri socket + DefaultCRISocket = "tcp://localhost:2375" +)