diff --git a/contrib/ansible/README.md b/contrib/ansible/README.md index 6c049d578..a75a8759d 100644 --- a/contrib/ansible/README.md +++ b/contrib/ansible/README.md @@ -1,4 +1,4 @@ -# Kubernetes Cluster with Containerd and CRI-Containerd +# Kubernetes Cluster with Containerd

diff --git a/contrib/ansible/cri-containerd.yaml b/contrib/ansible/cri-containerd.yaml index 52aa1a8b5..3eb70c6f6 100644 --- a/contrib/ansible/cri-containerd.yaml +++ b/contrib/ansible/cri-containerd.yaml @@ -8,7 +8,7 @@ - include_tasks: tasks/bootstrap_centos.yaml # Contains tasks bootstrap components for centos systems when: ansible_distribution == "CentOS" - include_tasks: tasks/k8s.yaml # Contains tasks kubernetes component installation - - include_tasks: tasks/binaries.yaml # Contains tasks for pulling containerd and cri-containerd components + - include_tasks: tasks/binaries.yaml # Contains tasks for pulling containerd components - name: "Create a directory for containerd config" file: path=/etc/containerd state=directory @@ -21,22 +21,9 @@ [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 - - name: "Start CRI-Containerd" - systemd: name=cri-containerd daemon_reload=yes state=started enabled=yes - - name: "Load br_netfilter kernel module" modprobe: name: br_netfilter @@ -59,7 +46,7 @@ - name: "Add runtime args in kubelet conf" lineinfile: dest: "/etc/systemd/system/kubelet.service.d/10-kubeadm.conf" - line: "Environment=\"KUBELET_EXTRA_ARGS= --runtime-cgroups=/runtime --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=/run/containerd/containerd.sock\"" insertafter: '\[Service\]' when: check_args.stdout == "" @@ -70,5 +57,5 @@ - name: "Pre-pull pause container image" shell: | /usr/local/bin/ctr pull gcr.io/google_containers/pause:3.0 - /usr/local/bin/crictl --runtime-endpoint /var/run/cri-containerd.sock \ + /usr/local/bin/crictl --runtime-endpoint /run/containerd/containerd.sock \ pull gcr.io/google_containers/pause:3.0 diff --git a/contrib/ansible/tasks/binaries.yaml b/contrib/ansible/tasks/binaries.yaml index 2bcc44495..808c7a72a 100644 --- a/contrib/ansible/tasks/binaries.yaml +++ b/contrib/ansible/tasks/binaries.yaml @@ -1,5 +1,5 @@ --- -- name: "Get Containerd and CRI-Containerd" +- name: "Get Containerd" unarchive: src: "https://storage.googleapis.com/cri-containerd-release/cri-containerd-{{ cri_containerd_release_version }}.linux-amd64.tar.gz" dest: "/" diff --git a/contrib/ansible/vars/vars.yaml b/contrib/ansible/vars/vars.yaml index 8cbe743bd..d9c828a4c 100644 --- a/contrib/ansible/vars/vars.yaml +++ b/contrib/ansible/vars/vars.yaml @@ -1,7 +1,4 @@ --- cri_containerd_release_version: 1.0.0-beta.0 -cri_release_directory: /opt/cri-containerd/ -local_bin_dir: /usr/local/bin/ -local_sbin_dir: /usr/local/sbin/ cni_bin_dir: /opt/cni/bin/ cni_conf_dir: /etc/cni/net.d/ diff --git a/contrib/systemd-units/cri-containerd.service b/contrib/systemd-units/cri-containerd.service deleted file mode 100644 index b82e85e27..000000000 --- a/contrib/systemd-units/cri-containerd.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=Kubernetes containerd CRI shim -Requires=network-online.target -After=containerd.service - -[Service] -Restart=always -RestartSec=5 -LimitNOFILE=1048576 -# Having non-zero Limit*s causes performance problems due to accounting overhead -# in the kernel. We recommend using cgroups to do container-local accounting. -LimitNPROC=infinity -LimitCORE=infinity -ExecStart=/usr/local/bin/cri-containerd - -[Install] -WantedBy=multi-user.target