Serve streaming on localhost by default to match k8s 1.11 default.

Signed-off-by: Lantao Liu <lantaol@google.com>
containerd · Jul 20, 2018 · b4d3c05 · b4d3c05
1 parent 42a98de
commit b4d3c05
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/cluster/gce/configure.sh b/cluster/gce/configure.sh
@@ -168,7 +168,6 @@ disabled_plugins = ["restart"]
   runtime = "${CONTAINERD_HOME}/usr/local/sbin/runc"
 
 [plugins.cri]
-  stream_server_address = "127.0.0.1"
   max_container_log_line_size = ${max_container_log_line}
 [plugins.cri.cni]
   bin_dir = "${cni_bin_dir}"

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -152,8 +152,8 @@ func DefaultConfig() PluginConfig {
 			},
 			NoPivot: false,
 		},
-		StreamServerAddress:     "",
-		StreamServerPort:        "10010",
+		StreamServerAddress:     "127.0.0.1",
+		StreamServerPort:        "0",
 		EnableSelinux:           false,
 		EnableTLSStreaming:      false,
 		SandboxImage:            "k8s.gcr.io/pause:3.1",