Merge pull request kubevirt#252 from kubevirt/deploy_bridge_cni_with_…

…cnv_prefix bridge cni: always deploy cnv- prefixed binaries
RamLavi · Nov 1, 2019 · 0e10828 · 0e10828
2 parents ebfe5a7 + b3a6017
commit 0e10828
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/data/linux-bridge/002-linux-bridge.yaml b/data/linux-bridge/002-linux-bridge.yaml
@@ -37,6 +37,11 @@ spec:
             - |
               cp -rf /usr/src/containernetworking/plugins/bin/*bridge /opt/cni/bin/
               cp -rf /usr/src/containernetworking/plugins/bin/*tuning /opt/cni/bin/
+              # Some projects (e.g. openshift/console) use cnv- prefix to distinguish between
+              # binaries shipped by OpenShift and those shipped by KubeVirt (D/S matters).
+              # Following two lines make sure we will provide both names when needed.
+              find /opt/cni/bin/cnv-bridge || ln -s /opt/cni/bin/bridge /opt/cni/bin/cnv-bridge
+              find /opt/cni/bin/cnv-tuning || ln -s /opt/cni/bin/tuning /opt/cni/bin/cnv-tuning
               echo "Entering sleep... (success)"
               sleep infinity
           resources: