diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2020-03-17 17:38:43 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2020-03-17 17:38:43 +0100 |
| commit | 7c6ee0b6344b7d7d874d5755d449ed4503c02721 (patch) | |
| tree | b03104b7840dae142ae806c553f599006840dba3 | |
| parent | kubernetes role, cleanup and harmonization (diff) | |
kubernetes: some more harmonization
| -rw-r--r-- | roles/kubernetes/base/tasks/cri_containerd.yml | 6 | ||||
| -rw-r--r-- | roles/kubernetes/base/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/kubernetes/standalone/templates/kubelet.service.override.j2 | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/roles/kubernetes/base/tasks/cri_containerd.yml b/roles/kubernetes/base/tasks/cri_containerd.yml index aa34e6fe..ff904ffc 100644 --- a/roles/kubernetes/base/tasks/cri_containerd.yml +++ b/roles/kubernetes/base/tasks/cri_containerd.yml @@ -1,4 +1,10 @@ --- +- name: make sure the kubernetes_cri_socket variable is configured correctly + assert: + msg: "The variable kubernetes_cri_socket is not configured to use containerd as container runtime." + that: + - kubernetes_cri_socket == "unix:///run/containerd/containerd.sock" + - name: install containerd include_role: name: containerd diff --git a/roles/kubernetes/base/tasks/main.yml b/roles/kubernetes/base/tasks/main.yml index 17251b82..28d6a62e 100644 --- a/roles/kubernetes/base/tasks/main.yml +++ b/roles/kubernetes/base/tasks/main.yml @@ -54,8 +54,8 @@ create: yes marker: "### {mark} ANSIBLE MANAGED BLOCK for crictl ###" content: | - {% if kubernetes_container_runtime == 'containerd' %} - alias crictl="crictl --runtime-endpoint unix:///run/containerd/containerd.sock" + {% if kubernetes_cri_socket is defined %} + alias crictl="crictl --runtime-endpoint {{ kubernetes_cri_socket }}" {% endif %} {% if item == 'zsh' %} ## TODO: see https://github.com/kubernetes-sigs/cri-tools/issues/435 diff --git a/roles/kubernetes/standalone/templates/kubelet.service.override.j2 b/roles/kubernetes/standalone/templates/kubelet.service.override.j2 index 75061e73..3eb8b63d 100644 --- a/roles/kubernetes/standalone/templates/kubelet.service.override.j2 +++ b/roles/kubernetes/standalone/templates/kubelet.service.override.j2 @@ -2,9 +2,9 @@ ExecStart= ExecStart=/usr/bin/kubelet \ --config=/etc/kubernetes/kubelet.yml \ -{% if kubernetes_container_runtime == 'containerd' %} +{% if kubernetes_cri_socket is defined %} --container-runtime=remote \ - --container-runtime-endpoint=unix:///run/containerd/containerd.sock \ + --container-runtime-endpoint={{ kubernetes_cri_socket }} \ {% endif %} --network-plugin=cni \ --cloud-provider= |