github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu 2018-07-20 19:41:44 +00:00
parent 42a98de252
commit b3d6f16383
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/gce/configure.sh
View File

@ -169,6 +169,7 @@ disabled_plugins = ["restart"]
[plugins.cri] [plugins.cri]
stream_server_address = "127.0.0.1" stream_server_address = "127.0.0.1"
stream_server_port = "0"
max_container_log_line_size = ${max_container_log_line} max_container_log_line_size = ${max_container_log_line}
[plugins.cri.cni] [plugins.cri.cni]
bin_dir = "${cni_bin_dir}" bin_dir = "${cni_bin_dir}"

4
docs/config.md
View File

@ -7,10 +7,10 @@ The explanation and default value of each configuration item are as follows:
[plugins.cri] [plugins.cri]
# stream_server_address is the ip address streaming server is listening on. # 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 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 indicates to enable the selinux support.
enable_selinux = false enable_selinux = false

4
pkg/config/config.go
View File

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