summaryrefslogtreecommitdiff
path: root/roles/kubernetes/base
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2019-10-11 00:46:13 +0200
committerChristian Pointner <equinox@spreadspace.org>2019-10-11 00:46:13 +0200
commit901486a82273b55308576e33bcc56f88b29b855f (patch)
tree6cd5a7f0ab20cdb7c437aa07909a2c25892a141f /roles/kubernetes/base
parentadded role for containerd and improve kubernetes/base (diff)
added kubernetes/standalone role
Diffstat (limited to 'roles/kubernetes/base')
-rw-r--r--roles/kubernetes/base/tasks/main.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/roles/kubernetes/base/tasks/main.yml b/roles/kubernetes/base/tasks/main.yml
index 375bb63e..731be48b 100644
--- a/roles/kubernetes/base/tasks/main.yml
+++ b/roles/kubernetes/base/tasks/main.yml
@@ -45,7 +45,6 @@
selection: hold
- name: configure crictl to use containerd
- when: kubernetes_container_runtime == 'containerd'
loop:
- zsh
- bash
@@ -54,7 +53,9 @@
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"
+ {% endif %}
{% if item == 'zsh' %}
## TODO: see https://github.com/kubernetes-sigs/cri-tools/issues/435
autoload -U +X bashcompinit && bashcompinit