diff --git a/cluster/gce/cloud-init/master.yaml b/cluster/gce/cloud-init/master.yaml index 63d2ebcd0..b7f2692fb 100644 --- a/cluster/gce/cloud-init/master.yaml +++ b/cluster/gce/cloud-init/master.yaml @@ -34,6 +34,8 @@ write_files: shim = "/home/containerd/usr/local/bin/containerd-shim" runtime = "/home/containerd/usr/local/sbin/runc" + [plugins.cri] + enable_tls_streaming = true [plugins.cri.cni] bin_dir = "/home/containerd/opt/cni/bin" conf_dir = "/home/containerd/etc/cni/net.d" diff --git a/cluster/gce/cloud-init/node.yaml b/cluster/gce/cloud-init/node.yaml index 61c8143d8..2428fd85f 100644 --- a/cluster/gce/cloud-init/node.yaml +++ b/cluster/gce/cloud-init/node.yaml @@ -32,6 +32,8 @@ write_files: shim = "/home/containerd/usr/local/bin/containerd-shim" runtime = "/home/containerd/usr/local/sbin/runc" + [plugins.cri] + enable_tls_streaming = true [plugins.cri.cni] bin_dir = "/home/kubernetes/bin" conf_dir = "/etc/cni/net.d" diff --git a/contrib/ansible/cri-containerd.yaml b/contrib/ansible/cri-containerd.yaml index c8bf4a3dc..516562b21 100644 --- a/contrib/ansible/cri-containerd.yaml +++ b/contrib/ansible/cri-containerd.yaml @@ -13,6 +13,14 @@ - name: "Create a directory for containerd config" file: path=/etc/containerd state=directory + - name: "Add containerd config file" + blockinfile: + path: /etc/containerd/config.toml + create: yes + block: | + [plugins.cri] + enable_tls_streaming = true + - name: "Start Containerd" systemd: name=containerd daemon_reload=yes state=started enabled=yes diff --git a/docs/config.md b/docs/config.md index 3a4d9e312..560619622 100644 --- a/docs/config.md +++ b/docs/config.md @@ -24,6 +24,9 @@ The explanation and default value of each configuration item are as follows: # systemd_cgroup enables systemd cgroup support. systemd_cgroup = false + # enable_tls_streaming enables the TLS streaming support. + enable_tls_streaming = false + # "plugins.cri.containerd" contains config related to containerd [plugins.cri.containerd] diff --git a/test/e2e_node/init.yaml b/test/e2e_node/init.yaml index 730461eb9..7bbe14d3a 100644 --- a/test/e2e_node/init.yaml +++ b/test/e2e_node/init.yaml @@ -31,6 +31,8 @@ write_files: shim = "/home/containerd/usr/local/bin/containerd-shim" runtime = "/home/containerd/usr/local/sbin/runc" + [plugins.cri] + enable_tls_streaming = true [plugins.cri.cni] bin_dir = "/home/containerd/opt/cni/bin" conf_dir = "/home/containerd/etc/cni/net.d"