Merge pull request #3296 from rabi/fix_cilium_crio

Add volume and volumeMount for crio-socket
This commit is contained in:
k8s-ci-robot 2018-09-15 03:23:02 -07:00 committed by GitHub
commit f1403493df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -159,9 +159,15 @@ spec:
mountPath: /host/opt/cni/bin mountPath: /host/opt/cni/bin
- name: etc-cni-netd - name: etc-cni-netd
mountPath: /host/etc/cni/net.d mountPath: /host/etc/cni/net.d
{% if container_manager == 'crio' %}
- name: crio-socket
mountPath: /var/run/crio.sock
readOnly: true
{% else %}
- name: docker-socket - name: docker-socket
mountPath: /var/run/docker.sock mountPath: /var/run/docker.sock
readOnly: true readOnly: true
{% endif %}
- name: etcd-config-path - name: etcd-config-path
mountPath: /var/lib/etcd-config mountPath: /var/lib/etcd-config
readOnly: true readOnly: true
@ -183,10 +189,17 @@ spec:
- name: bpf-maps - name: bpf-maps
hostPath: hostPath:
path: /sys/fs/bpf 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 # To read docker events from the node
- name: docker-socket - name: docker-socket
hostPath: hostPath:
path: /var/run/docker.sock path: /var/run/docker.sock
{% endif %}
# To install cilium cni plugin in the host # To install cilium cni plugin in the host
- name: cni-path - name: cni-path
hostPath: hostPath: