Specify the CNI mount in the host via a variable

Signed-off-by: Miguel Duarte Barroso <[email protected]>
kubevirt · Feb 24, 2020 · ce36296 · ce36296
1 parent a393c66
commit ce36296
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-CNI_MOUNT_PATH ?= /host/opt/cni/bin
+CNI_MOUNT_PATH ?= /opt/cni/bin
 
 IMAGE_REGISTRY ?= quay.io/kubevirt
 IMAGE_NAME ?= macvtap-cni

diff --git a/templates/macvtap.yaml.in b/templates/macvtap.yaml.in
@@ -30,15 +30,15 @@ spec:
         image: {{ .ImageRegistry }}/{{ .ImageName }}:{{ .ImageTag }}
         securityContext:
           privileged: true
-        command: ['cp', '/macvtap-cni', '{{ .CniMountPath }}/macvtap']
+        command: ['cp', '/macvtap-cni', '/host/opt/cni/bin/macvtap']
         volumeMounts:
           - name: cni
-            mountPath: {{ .CniMountPath }}
+            mountPath: /host/opt/cni/bin
             mountPropagation: Bidirectional
       volumes:
         - name: deviceplugin
           hostPath:
             path: /var/lib/kubelet/device-plugins
         - name: cni
           hostPath:
-            path: /opt/cni/bin
+            path: {{ .CniMountPath }}