From 1df0b67ec12c9ee62eff90e27f81b87a276716c9 Mon Sep 17 00:00:00 2001
From: rabi <ramishra@redhat.com>
Date: Wed, 12 Sep 2018 21:05:28 +0530
Subject: [PATCH] Add volume and volumeMount for crio-socket
This commit fixes #3295
---
.../cilium/templates/cilium-ds.yml.j2 | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/roles/network_plugin/cilium/templates/cilium-ds.yml.j2 b/roles/network_plugin/cilium/templates/cilium-ds.yml.j2
index 7fff7ac0e..5fa75f98f 100755
--- a/roles/network_plugin/cilium/templates/cilium-ds.yml.j2
+++ b/roles/network_plugin/cilium/templates/cilium-ds.yml.j2
@@ -159,9 +159,15 @@ spec:
mountPath: /host/opt/cni/bin
- name: etc-cni-netd
mountPath: /host/etc/cni/net.d
+{% if container_manager == 'crio' %}
+ - name: crio-socket
+ mountPath: /var/run/crio.sock
+ readOnly: true
+{% else %}
- name: docker-socket
mountPath: /var/run/docker.sock
readOnly: true
+{% endif %}
- name: etcd-config-path
mountPath: /var/lib/etcd-config
readOnly: true
@@ -183,10 +189,17 @@ spec:
- name: bpf-maps
hostPath:
path: /sys/fs/bpf
+{% if container_manager == 'crio' %}
+ # To read crio events from the node
+ - name: crio-socket
+ hostPath:
+ path: /var/run/crio/crio.sock
+{% else %}
# To read docker events from the node
- name: docker-socket
hostPath:
path: /var/run/docker.sock
+{% endif %}
# To install cilium cni plugin in the host
- name: cni-path
hostPath:
--
GitLab