diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2022-01-12 02:09:46 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2022-01-12 02:09:46 +0100 |
| commit | 9410736d374ca68d5013f5f952dbce8d6b4fac66 (patch) | |
| tree | 72fcb0c2b70ce0afc9db7c537e382232758a497d /roles/kubernetes/standalone/base/templates/kubelet.service.override.j2 | |
| parent | Merge branch 'topic/no-more-kubic' (diff) | |
| parent | containerd: change package selection to same method as for docker (diff) | |
Merge branch 'topic/cri-dockerd'
Diffstat (limited to 'roles/kubernetes/standalone/base/templates/kubelet.service.override.j2')
| -rw-r--r-- | roles/kubernetes/standalone/base/templates/kubelet.service.override.j2 | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/roles/kubernetes/standalone/base/templates/kubelet.service.override.j2 b/roles/kubernetes/standalone/base/templates/kubelet.service.override.j2 index 00f2c360..d4637c72 100644 --- a/roles/kubernetes/standalone/base/templates/kubelet.service.override.j2 +++ b/roles/kubernetes/standalone/base/templates/kubelet.service.override.j2 @@ -1,11 +1,6 @@ [Service] ExecStart= ExecStart=/usr/bin/kubelet \ -{% if kubernetes_container_runtime != 'docker' %} --container-runtime=remote \ --container-runtime-endpoint={{ kubernetes_cri_socket }} \ -{% else %} - --container-runtime=docker \ - --network-plugin=cni \ -{% endif %} --config=/etc/kubernetes/kubelet.yml |