contivNet.sh: switch K8S to standalone OVS

Signed-off-by: Cristian Staretu <[email protected]>

Author: unclejack

install/k8s/contiv/contiv_devtest.yaml

@@ -144,12 +144,6 @@ spec:
           securityContext:
             privileged: true
           volumeMounts:
-            - mountPath: /etc/openvswitch
-              name: etc-openvswitch
-              readOnly: false
-            - mountPath: /lib/modules
-              name: lib-modules
-              readOnly: false
             - mountPath: /var/run
               name: var-run
               readOnly: false
@@ -179,12 +173,6 @@ spec:
               readOnly: false
       volumes:
         # Used by contiv-netplugin
-        - name: etc-openvswitch
-          hostPath:
-            path: /etc/openvswitch
-        - name: lib-modules
-          hostPath:
-            path: /lib/modules
         - name: var-run
           hostPath:
             path: /var/run
@@ -278,15 +266,7 @@ spec:
                 configMapKeyRef:
                   name: contiv-config
                   key: contiv_netmode
-          securityContext:
-            privileged: true
           volumeMounts:
-            - mountPath: /etc/openvswitch
-              name: etc-openvswitch
-              readOnly: false
-            - mountPath: /lib/modules
-              name: lib-modules
-              readOnly: false
             - mountPath: /var/run
               name: var-run
               readOnly: false
@@ -310,12 +290,6 @@ spec:
               readOnly: false
       volumes:
         # Used by contiv-netmaster
-        - name: etc-openvswitch
-          hostPath:
-            path: /etc/openvswitch
-        - name: lib-modules
-          hostPath:
-            path: /lib/modules
         - name: var-run
           hostPath:
             path: /var/run
@@ -338,3 +312,62 @@ spec:
           hostPath:
             path: /opt/gopath/src/github.com/contiv/netplugin/scripts/netContain/scripts/
 ---
+# This manifest deploys the contiv-ovs pod.
+kind: DaemonSet
+apiVersion: extensions/v1beta1
+metadata:
+  name: contiv-ovs
+  namespace: kube-system
+  labels:
+    k8s-app: contiv-ovs
+spec:
+  selector:
+    matchLabels:
+      k8s-app: contiv-ovs
+  template:
+    metadata:
+      labels:
+        k8s-app: contiv-ovs
+    spec:
+      hostNetwork: true
+      hostPID: true
+      containers:
+        # Runs ovs containers on each Kubernetes node.
+        - name: contiv-ovsdb-server
+          image: contiv/ovs:latest
+          command: ["/scripts/start-ovsdb-server.sh"]
+          securityContext:
+            privileged: false
+          volumeMounts:
+            - mountPath: /etc/openvswitch
+              name: etc-openvswitch
+              readOnly: false
+            - mountPath: /var/run
+              name: var-run
+              readOnly: false
+        - name: contiv-ovs-vswitchd
+          image: contiv/ovs:latest
+          command: ["/scripts/start-ovs-vswitchd.sh"]
+          securityContext:
+            privileged: true
+          volumeMounts:
+            - mountPath: /etc/openvswitch
+              name: etc-openvswitch
+              readOnly: false
+            - mountPath: /lib/modules
+              name: lib-modules
+              readOnly: true
+            - mountPath: /var/run
+              name: var-run
+              readOnly: false
+      volumes:
+        # Used by contiv-ovs
+        - name: etc-openvswitch
+          hostPath:
+            path: /etc/openvswitch
+        - name: lib-modules
+          hostPath:
+            path: /lib/modules
+        - name: var-run
+          hostPath:
+            path: /var/run

scripts/netContain/scripts/contivNet.sh

@@ -58,12 +58,6 @@ if [ -d /var/contiv/log ]; then
     echo "INFO: Copied contiv log from /var/contiv/log (deprecated) to /var/log/contiv"
 fi
 
-if [ "$CONTIV_ROLE" = "netplugin" ]; then
-    echo "INFO: Initializing OVS"
-    /contiv/scripts/ovsInit.sh
-    echo "INFO: Initialized OVS"
-fi
-
 if [ "$CONTIV_MODE" = "kubernetes" ]; then
     echo "INFO: Setting kubernetes configs"
     mkdir -p /opt/contiv/config