Skip to content
This repository has been archived by the owner on Mar 9, 2022. It is now read-only.

Cherrypick #858 to release/1.11. #860

Merged
merged 1 commit into from
Jul 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cluster/gce/configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
4 changes: 2 additions & 2 deletions docs/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down