From 95dfd3c03913f1a8d86f274974191f661450e87f Mon Sep 17 00:00:00 2001
From: Lantao Liu <lantaol@google.com>
Date: Tue, 31 Oct 2017 04:47:01 +0000
Subject: [PATCH] Add runtime cgroup and put containerd and cri-containerd into
 it.

Signed-off-by: Lantao Liu <lantaol@google.com>
---
 contrib/ansible/cri-containerd.yaml | 25 +++++++++++++++++++++++--
 contrib/ansible/tasks/binaries.yaml |  3 ++-
 contrib/ansible/vars/vars.yaml      |  2 +-
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/contrib/ansible/cri-containerd.yaml b/contrib/ansible/cri-containerd.yaml
index b2b859dfe..95fd8e800 100644
--- a/contrib/ansible/cri-containerd.yaml
+++ b/contrib/ansible/cri-containerd.yaml
@@ -9,7 +9,28 @@
       when: ansible_distribution == "CentOS"
     - include: tasks/k8s.yaml # Contains tasks kubernetes component installation
     - include: tasks/binaries.yaml # Contains tasks for pulling containerd and cri-containerd components
-       
+
+    - 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: |
+          [cgroup]
+            path = "/runtime"
+
+    - name: "Create a directory for cri-containerd config"
+      file: path=/etc/cri-containerd state=directory
+
+    - name: "Add cri-containerd config file"
+      blockinfile:
+        path: /etc/cri-containerd/config.toml
+        create: yes
+        block: |
+          cgroup_path = "/runtime"
+
     - name: "Start Containerd"
       systemd: name=containerd daemon_reload=yes state=started enabled=yes
     
@@ -38,7 +59,7 @@
     - name: "Add runtime args in kubelet conf"
       lineinfile:
         dest: "/etc/systemd/system/kubelet.service.d/10-kubeadm.conf"
-        line: "Environment=\"KUBELET_EXTRA_ARGS= --container-runtime=remote --runtime-request-timeout=15m --container-runtime-endpoint=/var/run/cri-containerd.sock\""
+        line: "Environment=\"KUBELET_EXTRA_ARGS= --runtime-cgroups=/runtime --container-runtime=remote --runtime-request-timeout=15m --container-runtime-endpoint=/var/run/cri-containerd.sock\""
         insertafter: '\[Service\]'
       when: check_args.stdout == ""
     
diff --git a/contrib/ansible/tasks/binaries.yaml b/contrib/ansible/tasks/binaries.yaml
index 3975fd71f..9ef5629ae 100644
--- a/contrib/ansible/tasks/binaries.yaml
+++ b/contrib/ansible/tasks/binaries.yaml
@@ -1,7 +1,8 @@
 ---
 - name: "Get Containerd and CRI-Containerd"
   unarchive:
-    src: "https://storage.googleapis.com/cri-containerd-release/cri-containerd-{{ cri_containerd_release_version }}.tar.gz"
+    # TODO change to cri-containerd-release before official release.
+    src: "https://storage.googleapis.com/cri-containerd-staging/cri-containerd-{{ cri_containerd_release_version }}.tar.gz"
     dest: "/"
     remote_src: yes
 
diff --git a/contrib/ansible/vars/vars.yaml b/contrib/ansible/vars/vars.yaml
index e32e29724..a53c94858 100644
--- a/contrib/ansible/vars/vars.yaml
+++ b/contrib/ansible/vars/vars.yaml
@@ -1,6 +1,6 @@
 ---
 # TODO update official versions once they are available
-cri_containerd_release_version: 1.0.0-alpha.0
+cri_containerd_release_version: 1.0.0-alpha.0-84-ge57cb68
 cri_release_directory: /opt/cri-containerd/
 local_bin_dir: /usr/local/bin/
 local_sbin_dir: /usr/local/sbin/