diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2021-05-15 23:44:29 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2021-05-15 23:44:29 +0200 |
| commit | 14824c28b863f0028822f3ab92f8b9199cda7322 (patch) | |
| tree | bf6c0415146ccfe3498f2e2c16812ef2304cf9e0 /roles/kubernetes/standalone | |
| parent | Merge branch 'topic/k8s-containerd' (diff) | |
k8s: cleanup CRI socket handling
Diffstat (limited to 'roles/kubernetes/standalone')
| -rw-r--r-- | roles/kubernetes/standalone/base/templates/kubelet.service.override.j2 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/roles/kubernetes/standalone/base/templates/kubelet.service.override.j2 b/roles/kubernetes/standalone/base/templates/kubelet.service.override.j2 index d7105856..00f2c360 100644 --- a/roles/kubernetes/standalone/base/templates/kubelet.service.override.j2 +++ b/roles/kubernetes/standalone/base/templates/kubelet.service.override.j2 @@ -1,9 +1,11 @@ [Service] ExecStart= ExecStart=/usr/bin/kubelet \ - --config=/etc/kubernetes/kubelet.yml \ -{% if kubernetes_cri_socket %} +{% if kubernetes_container_runtime != 'docker' %} --container-runtime=remote \ --container-runtime-endpoint={{ kubernetes_cri_socket }} \ -{% endif %} +{% else %} + --container-runtime=docker \ --network-plugin=cni \ +{% endif %} + --config=/etc/kubernetes/kubelet.yml |