Merge pull request #717 from Random-Liu/enable-tls-streaming

Enable TLS streaming in all the setup.
containerd · Apr 3, 2018 · 2bc72b6 · 2bc72b6
2 parents 6e13a4d + ad7bffc
commit 2bc72b6
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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"