Merge pull request #860 from Random-Liu/cherrypick-#858

Cherrypick #858 to release/1.11.
containerd · Jul 24, 2018 · d00d37b · d00d37b
2 parents d22dfea + db752fa
commit d00d37b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/cluster/gce/configure.sh b/cluster/gce/configure.sh
@@ -169,6 +169,7 @@ disabled_plugins = ["restart"]
 
 [plugins.cri]
   stream_server_address = "127.0.0.1"
+  stream_server_port = "0"
   max_container_log_line_size = ${max_container_log_line}
 [plugins.cri.cni]
   bin_dir = "${cni_bin_dir}"

diff --git a/docs/config.md b/docs/config.md
@@ -7,10 +7,10 @@ The explanation and default value of each configuration item are as follows:
 [plugins.cri]
 
   # stream_server_address is the ip address streaming server is listening on.
-  stream_server_address = ""
+  stream_server_address = "127.0.0.1"
 
   # stream_server_port is the port streaming server is listening on.
-  stream_server_port = "10010"
+  stream_server_port = "0"
 
   # enable_selinux indicates to enable the selinux support.
   enable_selinux = false

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",