Merge pull request #232 from linkernetworks/hwchiu/VX-257

[BUG] Mount the ovs directory for tcp-network-controller
linkernetworks · Aug 8, 2018 · e682000 · e682000
2 parents 620296b + 23f88ea
commit e682000
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/deploy/helm/apps/charts/network-controller/templates/tcp-daemonset.yaml b/deploy/helm/apps/charts/network-controller/templates/tcp-daemonset.yaml
@@ -25,13 +25,13 @@ spec:
         volumeMounts:
         - mountPath: /var/run/docker.sock
           name: docker-sock
-        - mountPath: /var/run/openvswitch/db.sock
-          name: ovs-sock
+        - mountPath: /var/run/openvswitch/
+          name: ovs-data
       volumes:
       - name: docker-sock
         hostPath:
           path: /run/docker.sock
-      - name: ovs-sock
+      - name: ovs-data #for some operations(dump ports) it needs extra unix socker to handle, so we mount whole ovs directory
         hostPath:
-          path: /run/openvswitch/db.sock
+          path: /run/openvswitch/
       hostNetwork: true
diff --git a/deploy/helm/apps/charts/network-controller/templates/unix-daemonset.yaml b/deploy/helm/apps/charts/network-controller/templates/unix-daemonset.yaml
@@ -39,7 +39,7 @@ spec:
       - name: docker-sock
         hostPath:
           path: /run/docker.sock
-      - name: ovs-sock
+      - name: ovs-sock #since the UNIX version only add-port, the db.sock is enough
         hostPath:
           path: /run/openvswitch/db.sock
       - name: grpc-sock