github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #776 from Random-Liu/disable-streaming

Browse Source 
Disable TLS streaming to work with new kubelet streaming proxy.
This commit is contained in:
Lantao Liu 2018-06-01 00:48:44 -07:00 committed by GitHub
commit 0a5c05bcd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/configure.sh
View File

@ -165,8 +165,6 @@ disabled_plugins = ["restart"]
shim = "${CONTAINERD_HOME}/usr/local/bin/containerd-shim" shim = "${CONTAINERD_HOME}/usr/local/bin/containerd-shim"
runtime = "${CONTAINERD_HOME}/usr/local/sbin/runc" runtime = "${CONTAINERD_HOME}/usr/local/sbin/runc"
[plugins.cri]
enable_tls_streaming = true
[plugins.cri.cni] [plugins.cri.cni]
bin_dir = "${cni_bin_dir}" bin_dir = "${cni_bin_dir}"
conf_dir = "/etc/cni/net.d" conf_dir = "/etc/cni/net.d"

8
contrib/ansible/cri-containerd.yaml
View File

@ -13,14 +13,6 @@
- name: "Create a directory for containerd config" - name: "Create a directory for containerd config"
file: path=/etc/containerd state=directory 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" - name: "Start Containerd"
systemd: name=containerd daemon_reload=yes state=started enabled=yes systemd: name=containerd daemon_reload=yes state=started enabled=yes