summaryrefslogtreecommitdiffstats
path: root/roles/kuryr/templates/cni-daemonset.yaml.j2
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-15 11:25:56 -0800
committerGitHub <noreply@github.com>2018-01-15 11:25:56 -0800
commit5389f549e815c40198801ee5d7f887d44745e44a (patch)
tree3b0f06c181cf0c287e4e370eb54a3efb19b9e64f /roles/kuryr/templates/cni-daemonset.yaml.j2
parent8de2b99d915fadc6579320b7b74354ab33213067 (diff)
parentd515d4542f648194effb5be242d95f2d4834d7de (diff)
downloadopenshift-5389f549e815c40198801ee5d7f887d44745e44a.tar.gz
openshift-5389f549e815c40198801ee5d7f887d44745e44a.tar.bz2
openshift-5389f549e815c40198801ee5d7f887d44745e44a.tar.xz
openshift-5389f549e815c40198801ee5d7f887d44745e44a.zip
Merge pull request #6103 from dulek/dulek/cni-daemon
Automatic merge from submit-queue. Configure Kuryr CNI daemon Kuryr CNI daemon is scalability improvement that moves watching K8s API and VIF plugging into a separate entity called kuryr-daemon. Kuryr-daemon will run in a container and serve requests from kuryr-driver.
Diffstat (limited to 'roles/kuryr/templates/cni-daemonset.yaml.j2')
-rw-r--r--roles/kuryr/templates/cni-daemonset.yaml.j219
1 files changed, 18 insertions, 1 deletions
diff --git a/roles/kuryr/templates/cni-daemonset.yaml.j2 b/roles/kuryr/templates/cni-daemonset.yaml.j2
index 39348ae90..09f4c7dfe 100644
--- a/roles/kuryr/templates/cni-daemonset.yaml.j2
+++ b/roles/kuryr/templates/cni-daemonset.yaml.j2
@@ -26,6 +26,13 @@ spec:
image: kuryr/cni:latest
imagePullPolicy: IfNotPresent
command: [ "cni_ds_init" ]
+ env:
+ - name: CNI_DAEMON
+ value: "True"
+ - name: KUBERNETES_NODE_NAME
+ valueFrom:
+ fieldRef:
+ fieldPath: spec.nodeName
securityContext:
privileged: true
volumeMounts:
@@ -38,6 +45,10 @@ spec:
subPath: kuryr-cni.conf
- name: etc
mountPath: /etc
+ - name: proc
+ mountPath: /host_proc
+ - name: openvswitch
+ mountPath: /var/run/openvswitch
volumes:
- name: bin
hostPath:
@@ -50,4 +61,10 @@ spec:
name: kuryr-config
- name: etc
hostPath:
- path: /etc \ No newline at end of file
+ path: /etc
+ - name: proc
+ hostPath:
+ path: /proc
+ - name: openvswitch
+ hostPath:
+ path: /var/run/openvswitch