Merge pull request #17790 from deads2k/rebase-06-nodewiring

Automatic merge from submit-queue (batch tested with PRs 17762, 17790, 17772, 17653, 17655).

rebase comments on node wiring

These came out of non-blocking comments on the rebase

Author: openshift-merge-robot

pkg/cmd/server/kubernetes/node/node.go

@@ -33,9 +33,6 @@ const minimumDockerAPIVersionWithPullByID = "1.22"
 // EnsureKubeletAccess performs a number of test operations that the Kubelet requires to properly function.
 // All errors here are fatal.
 func (c *NodeConfig) EnsureKubeletAccess() {
-	if _, err := os.Stat("/var/lib/docker"); os.IsPermission(err) {
-		glog.Fatal("Unable to view the /var/lib/docker directory - are you running as root?")
-	}
 	if c.Containerized {
 		if _, err := os.Stat("/rootfs"); os.IsPermission(err) || os.IsNotExist(err) {
 			glog.Fatal("error: Running in containerized mode, but cannot find the /rootfs directory - be sure to mount the host filesystem at /rootfs (read-only) in the container.")
@@ -82,6 +79,9 @@ func (c *NodeConfig) EnsureDocker(docker *dockerutil.Helper) {
 	if c.KubeletServer.ContainerRuntime != "docker" {
 		return
 	}
+	if _, err := os.Stat("/var/lib/docker"); os.IsPermission(err) {
+		glog.Fatal("Unable to view the /var/lib/docker directory - are you running as root?")
+	}
 
 	var endpoint string
 	if len(os.Getenv("DOCKER_HOST")) > 0 {

pkg/cmd/server/kubernetes/node/node_config_test.go

@@ -42,8 +42,9 @@ func TestKubeletDefaults(t *testing.T) {
 			CloudProvider:           "", // now disabled
 			RootDirectory:           "/var/lib/kubelet",
 			CertDirectory:           "/var/lib/kubelet/pki",
-			RegisterNode:            true,                              // this looks suspicious
+			RegisterNode:            true,
 			RemoteRuntimeEndpoint:   "unix:///var/run/dockershim.sock", // overridden
+			Containerized:           false,                             // overridden based on OPENSHIFT_CONTAINERIZED
 			VolumePluginDir:         "/usr/libexec/kubernetes/kubelet-plugins/volume/exec/",
 			SeccompProfileRoot:      "/var/lib/kubelet/seccomp",
 			MaxContainerCount:       -1,
@@ -147,7 +148,7 @@ func TestKubeletDefaults(t *testing.T) {
 	}
 
 	if goruntime.GOOS == "darwin" {
-		//expectedDefaults.KubeletConfiguration.RemoteRuntimeEndpoint = ""
+		expectedDefaults.KubeletFlags.RemoteRuntimeEndpoint = ""
 	}
 
 	if !reflect.DeepEqual(defaults, expectedDefaults) {