Update entrypoint scripts and document to align with new CLI

install/k8s/contiv/contiv_devtest.yaml

@@ -14,7 +14,9 @@ data:
   # The location of your cluster store. This is set to the
   # avdertise-client value below from the contiv-etcd service.
   # Change it to an external etcd/consul instance if required.
-  contiv_etcd: "http://__NETMASTER_IP__:6666"
+  # this is not required for dev test, etcd or consul endpoints
+  # will be passed in in testing
+  # contiv_etcd: "http://__NETMASTER_IP__:6666"
   # The CNI network configuration to install on each node.
   contiv_cni_config: |-
     {
@@ -113,11 +115,12 @@ spec:
               valueFrom:
                  fieldRef:
                     fieldPath: status.podIP
-            - name: CONTIV_NETPLUGIN_ETCD_ENDPOINTS
-              valueFrom:
-                configMapKeyRef:
-                  name: contiv-config
-                  key: contiv_etcd
+            # set in testing codes
+            # - name: CONTIV_NETPLUGIN_ETCD_ENDPOINTS
+            #   valueFrom:
+            #     configMapKeyRef:
+            #       name: contiv-config
+            #       key: contiv_etcd
             - name: CONTIV_CNI_CONFIG
               valueFrom:
                 configMapKeyRef:
@@ -171,9 +174,9 @@ spec:
             - mountPath: /contiv/bin
               name: contiv-bin-dir
               readOnly: false
-            # - mountPath: /contiv/scripts/
-            #   name: contiv-scripts-dir
-            #   readOnly: false
+            - mountPath: /contiv/scripts/
+              name: contiv-scripts-dir
+              readOnly: false
       volumes:
         # Used by contiv-netplugin
         - name: etc-openvswitch
@@ -207,9 +210,9 @@ spec:
         - name: contiv-bin-dir
           hostPath:
             path: /opt/gopath/bin
-        # - name: contiv-scripts-dir
-        #   hostPath:
-        #     path: /opt/gopath/src/github.com/contiv/netplugin/scripts/netContain/scripts/
+        - name: contiv-scripts-dir
+          hostPath:
+            path: /opt/gopath/src/github.com/contiv/netplugin/scripts/netContain/scripts/
 ---
 
 # This manifest deploys the Contiv API Server on Kubernetes.
@@ -254,11 +257,12 @@ spec:
                 configMapKeyRef:
                   name: contiv-config
                   key: contiv_mode
-            - name: CONTIV_NETMASTER_ETCD_ENDPOINTS
-              valueFrom:
-                configMapKeyRef:
-                  name: contiv-config
-                  key: contiv_etcd
+            # set in testing codes
+            # - name: CONTIV_NETMASTER_ETCD_ENDPOINTS
+            #   valueFrom:
+            #     configMapKeyRef:
+            #       name: contiv-config
+            #       key: contiv_etcd
             - name: CONTIV_K8S_CONFIG
               valueFrom:
                 configMapKeyRef:
@@ -301,9 +305,9 @@ spec:
             - mountPath: /contiv/bin
               name: contiv-bin-dir
               readOnly: false
-            # - mountPath: /contiv/scripts/
-            #   name: contiv-scripts-dir
-            #   readOnly: false
+            - mountPath: /contiv/scripts/
+              name: contiv-scripts-dir
+              readOnly: false
       volumes:
         # Used by contiv-netmaster
         - name: etc-openvswitch
@@ -330,7 +334,7 @@ spec:
         - name: contiv-bin-dir
           hostPath:
             path: /opt/gopath/bin
-        # - name: contiv-scripts-dir
-        #   hostPath:
-        #     path: /opt/gopath/src/github.com/contiv/netplugin/scripts/netContain/scripts/
+        - name: contiv-scripts-dir
+          hostPath:
+            path: /opt/gopath/src/github.com/contiv/netplugin/scripts/netContain/scripts/
 ---

install/v2plugin/README.md

@@ -58,7 +58,7 @@ CONTIV_NETMASTER_ETCD_ENDPOINTS=http://127.0.0.1:2379 CONTIV_NETMASTER_FORWARD_M
 ```
 ### docker hub
 Developer release of v2plugin from contiv repo is also pushed to docker hub
-Please update mode, forward modemode, net mode according to your deployment.
+Please update mode, forward mode, net mode according to your deployment.
 
 ```
 docker plugin install contiv/v2plugin:<version-tag> CONTIV_ROLE=netmaster CONTIV_NETPLUGIN_ETCD_ENDPOINTS=http://127.0.0.1:2379 CONTIV_NETPLUGIN_VLAN_UPLINKS=<VLAN-uplinks> \
@@ -73,7 +73,7 @@ make demo-v2plugin
 
 ## Contiv plugin-roles
 Contiv plugin runs both netplugin and netmaster by default. Contiv v2plugin can be run with only netplugin by setting the plugin_role to worker.
-Please update mode, forward modemode, net mode according to your deployment.
+Please update mode, forward mode, net mode according to your deployment.
 ```
 docker plugin install contiv/v2plugin:<version-tag> CONTIV_ROLE=netmaster CONTIV_NETPLUGIN_ETCD_ENDPOINTS=http://127.0.0.1:2379 CONTIV_NETPLUGIN_VLAN_UPLINKS=<VLAN-uplinks> \
 CONTIV_NETPLUGIN_FORWARD_MODE=bridge CONTIV_NETPLUGIN_MODE=docker CONTIV_NETPLUGIN_NET_MODE=vlan \

install/v2plugin/startcontiv.sh

@@ -33,19 +33,14 @@ exec 2<&-  # Close stderr
 exec 1<>$BOOTUP_LOGFILE  # stdout read and write to logfile instead of console
 exec 2>&1  # redirect stderr to where stdout is (logfile)
 
-mkdir -p "$CONTIV_LOG_DIR"
-mkdir -p /var/run/openvswitch
-mkdir -p /etc/openvswitch
+mkdir -p "$CONTIV_LOG_DIR" /var/run/openvswitch /etc/openvswitch
 
 # setting up ovs
 # TODO: this is the same code in ovsInit.sh, needs to reduce the duplication
-modprobe openvswitch || (echo "CRITICAL: Failed to load kernel module openvswitch" && exit 1 )
-echo "INFO: Loaded kernel module openvswitch"
-
 set -uo pipefail
 
-mkdir -p /var/run/openvswitch
-mkdir -p /var/log/contiv/
+modprobe openvswitch || (echo "CRITICAL: Failed to load kernel module openvswitch" && exit 1 )
+echo "INFO: Loaded kernel module openvswitch"
 
 if [ -d "/etc/openvswitch" ]; then
     if [ -f "/etc/openvswitch/conf.db" ]; then
@@ -66,11 +61,11 @@ ovsdb-server --remote=punix:/var/run/openvswitch/db.sock \
              --private-key=db:Open_vSwitch,SSL,private_key \
              --certificate=db:Open_vSwitch,SSL,certificate \
              --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert \
-             --log-file=/var/log/contiv/ovs-db.log -vsyslog:info -vfile:info \
+             --log-file=$CONTIV_LOG_DIR/ovs-db.log -vsyslog:info -vfile:info \
              --pidfile --detach /etc/openvswitch/conf.db
 
 echo "INFO: Starting ovs-vswitchd"
-ovs-vswitchd -v --pidfile --detach --log-file=/var/log/contiv/ovs-vswitchd.log \
+ovs-vswitchd -v --pidfile --detach --log-file=$CONTIV_LOG_DIR/ovs-vswitchd.log \
     -vconsole:err -vsyslog:info -vfile:info &
 
 retry=0
@@ -97,7 +92,7 @@ if [ "$CONTIV_ROLE" = "netmaster" ]; then
     while  true ; do
         echo "INFO: Starting contiv netmaster"
         set -x
-        /contiv/bin/netmaster "$@" &> "$CONTIV_LOG_DIR/netmaster.log"
+        /contiv/bin/netmaster "$@" &>> "$CONTIV_LOG_DIR/netmaster.log"
         set +x
         echo "ERROR: Contiv netmaster has exited, restarting in 5s"
         sleep 5
@@ -107,7 +102,7 @@ fi
 while true ; do
     echo "INFO: Starting contiv netplugin"
     set -x
-    /contiv/bin/netplugin "$@" &> "$CONTIV_LOG_DIR/netplugin.log"
+    /contiv/bin/netplugin "$@" &>> "$CONTIV_LOG_DIR/netplugin.log"
     set +x
     echo "ERROR: Contiv netplugin has exited, restarting in 5s"
     sleep 5

scripts/netContain/scripts/contivNet.sh

@@ -50,15 +50,12 @@ echo "INFO: Running contiv in mode $CONTIV_MODE"
 
 set -uo pipefail
 
-mkdir -p /opt/contiv/
+mkdir -p /opt/contiv/ /var/log/contiv
 
 if [ -d /var/contiv/log ]; then
     # /var/contiv/log/ is deprecated, move all data to /var/log/contiv
-    mkdir -p /var/log
-    mv /var/contiv/log /var/log/contiv
-    echo "INFO: Moved contiv log from /var/contiv/log (deprecated) to /var/log/contiv"
-else
-    mkdir -p /var/log/contiv
+    cp -a /var/contiv/log/* /var/log/contiv/
+    echo "INFO: Copied contiv log from /var/contiv/log (deprecated) to /var/log/contiv"
 fi
 
 if [ "$CONTIV_ROLE" = "netplugin" ]; then

scripts/netContain/scripts/ovsInit.sh

@@ -1,13 +1,11 @@
 #!/bin/bash
 #Start OVS in the Contiv container
 
-set -eu
+set -euo pipefail
 
 modprobe openvswitch || (echo "CRITICAL: Failed to load kernel module openvswitch" && exit 1 )
 echo "INFO: Loaded kernel module openvswitch"
 
-set -o pipefail
-
 mkdir -p /var/run/openvswitch
 mkdir -p /var/log/contiv/
 

test/systemtests/kubeadm_test.go

@@ -314,7 +314,7 @@ func (k *kubePod) podExecBG(podName, args string, ns ...string) error {
 	// Since the command is to run in BG in the pod and not on the node,
 	// RunCommandBackground is not required here
 
-	podCmd := `kubectl -n ` + namespace + ` exec ` + podName + ` -- nohup bash -c '\''` + args + ` &'\''`
+	podCmd := `kubectl -n ` + namespace + ` exec ` + podName + ` -- nohup sh -c '\''` + args + ` &'\''`
 	logrus.Debugf("Pod Exec BG: Running command -- %s", podCmd)
 	return k8sMaster.tbnode.RunCommand(podCmd)
 }
@@ -500,7 +500,8 @@ func (k *kubePod) startNetplugin(args string) error {
 	}
 
 	logrus.Infof("Starting netplugin on %s", k.node.Name())
-	startNetpluginCmd := "unset CONTIV_NETPLUGIN_ETCD_ENDPOINTS && " + k.node.suite.basicInfo.BinPath + `/netplugin --vlan-if=` + k.node.suite.hostInfo.HostDataInterfaces + k.commonArgs() + args + ` > ` + netpluginLogLocation + ` 2>&1`
+	startNetpluginCmd := (k.node.suite.basicInfo.BinPath + `/netplugin --vlan-if=` +
+		k.node.suite.hostInfo.HostDataInterfaces + k.commonArgs() + args + ` > ` + netpluginLogLocation + ` 2>&1`)
 
 	return k.podExecBG(podName, startNetpluginCmd, "kube-system")
 }
@@ -554,8 +555,8 @@ func (k *kubePod) startNetmaster(args string) error {
 	if k.node.suite.basicInfo.AciMode == "on" {
 		infraType = " --infra aci "
 	}
-	// unset CONTIV_NETMASTER_ETCD_ENDPOINTS to be able to use other endpoint
-	netmasterStartCmd := "unset CONTIV_NETMASTER_ETCD_ENDPOINTS && " + k.node.suite.basicInfo.BinPath + `/netmaster` + infraType + k.commonArgs() + args + ` > ` + netmasterLogLocation + ` 2>&1`
+	netmasterStartCmd := (k.node.suite.basicInfo.BinPath + `/netmaster` +
+		infraType + k.commonArgs() + args + ` > ` + netmasterLogLocation + ` 2>&1`)
 
 	return k.podExecBG(podName, netmasterStartCmd, "kube-system")
 }