Merge pull request #858 from Random-Liu/stream-serve-on-local

Serve streaming on localhost by default to match k8s 1.11 default.
This commit is contained in:
Lantao Liu 2018-07-20 19:12:53 -07:00 committed by GitHub
commit 2be13a8a30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions

View File

@ -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}"

View File

@ -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

View File

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