Skip to content

Commit 520f124

Browse files
author
Power Cloud Robot
authored
Merge pull request ppc64le-cloud#61 from Rajalakshmi-Girish/deprecate-docker
Remove Docker runtime support
2 parents 598de45 + bcb6040 commit 520f124

File tree

8 files changed

+0
-96
lines changed

8 files changed

+0
-96
lines changed

examples/docker-cluster/extra-vars-k8s-stable.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

examples/docker-cluster/hosts.yml

Lines changed: 0 additions & 5 deletions
This file was deleted.

group_vars/all

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ runc_version: 1.1.7
2121
runtime: containerd
2222
containerd_version: 1.7.2
2323
pause_container_image: registry.k8s.io/pause:3.9
24-
# Docker runtime is deprecated after k8s v1.20 - https://kubernetes.io/blog/2020/12/02/dont-panic-kubernetes-and-docker/
25-
# This repo also supports installation with docker runtime as per the compatibility with k8s.
2624

2725
cgroup_driver: systemd
2826
# By default it will set to the default interface MTU value, set the MTU here to override it

k8s-node-remote.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

roles/runtime/files/docker/dropin.conf

Lines changed: 0 additions & 2 deletions
This file was deleted.

roles/runtime/tasks/docker.yaml

Lines changed: 0 additions & 63 deletions
This file was deleted.

roles/runtime/tasks/main.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@
6262
dest: /usr/bin/runc
6363
mode: '0755'
6464

65-
- name: Install and Configure Runtime - Docker
66-
import_tasks: docker.yaml
67-
when: runtime == "docker"
68-
6965
- name: Install and Configure Runtime - Containerd
7066
import_tasks: containerd.yaml
7167
when: runtime == "containerd"
Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
{% set containerd_sock = 'unix:///run/containerd/containerd.sock' %}
22
{% set crio_sock = 'unix:///run/crio/crio.sock' %}
3-
{% set dockershim_sock = 'unix:///var/run/dockershim.sock' %}
43
{% if 'containerd' == runtime %}
54
runtime-endpoint: {{ containerd_sock }}
65
image-endpoint: {{ containerd_sock }}
76
{% elif 'crio' == runtime %}
87
runtime-endpoint: {{ crio_sock }}
98
image-endpoint: {{ crio_sock }}
10-
{% else %}
11-
runtime-endpoint: {{ dockershim_sock }}
12-
image-endpoint: {{ dockershim_sock }}
139
{% endif %}
1410
timeout: 2
1511
debug: false

0 commit comments

Comments
 (0)