From 6f43d493f96be62d7c686e5bb27cfb78cfa0f2f5 Mon Sep 17 00:00:00 2001
From: Lantao Liu <lantaol@google.com>
Date: Fri, 18 May 2018 19:02:03 -0700
Subject: [PATCH] Disable TLS streaming to work with new kubelet streaming
 proxy.

Signed-off-by: Lantao Liu <lantaol@google.com>
---
 cluster/gce/configure.sh            | 2 --
 contrib/ansible/cri-containerd.yaml | 8 --------
 2 files changed, 10 deletions(-)

diff --git a/cluster/gce/configure.sh b/cluster/gce/configure.sh
index 809dafa68..f1a6ca4de 100755
--- a/cluster/gce/configure.sh
+++ b/cluster/gce/configure.sh
@@ -162,8 +162,6 @@ cat > ${config_path} <<EOF
   shim = "${CONTAINERD_HOME}/usr/local/bin/containerd-shim"
   runtime = "${CONTAINERD_HOME}/usr/local/sbin/runc"
 
-[plugins.cri]
-  enable_tls_streaming = true
 [plugins.cri.cni]
   bin_dir = "${cni_bin_dir}"
   conf_dir = "/etc/cni/net.d"
diff --git a/contrib/ansible/cri-containerd.yaml b/contrib/ansible/cri-containerd.yaml
index 85b3fc111..f7ac56423 100644
--- a/contrib/ansible/cri-containerd.yaml
+++ b/contrib/ansible/cri-containerd.yaml
@@ -13,14 +13,6 @@
     - 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