From db752fa7121240e8b9b1f21accfb7e75c04af32e Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Fri, 20 Jul 2018 19:41:44 +0000 Subject: [PATCH] Serve streaming on localhost by default to match k8s 1.11 default. Signed-off-by: Lantao Liu --- cluster/gce/configure.sh | 1 + docs/config.md | 4 ++-- pkg/config/config.go | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cluster/gce/configure.sh b/cluster/gce/configure.sh index 0188e1eec..2dfd35e44 100755 --- 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 index 4eb2815b7..8fa77b55b 100644 --- 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 index 46c9b21ab..6919ce6b8 100644 --- 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",