ci to test make some commands

Signed-off-by: John O'Loughlin <[email protected]>

Author: johnoloughlin

Diff for: ci/ci.sh

@@ -45,10 +45,10 @@ kubectl get all --all-namespaces
 sleep 10
 cd $USERSPACEDIR
 
-docker build . -f ./docker/userspacecni/Dockerfile -t userspacecni:latest
+make build
 # gets path for one directopry above, needed for mkdir with docker cp below
 mkdir_var=$(dirname ${USERSPACEDIR})
-kind load docker-image userspacecni
+kind load docker-image localhost:5000/userspacecni
 docker exec -i kind-control-plane bash -c "mkdir -p $mkdir_var"
 docker cp "${USERSPACEDIR}" "kind-control-plane:${USERSPACEDIR}"
 }
@@ -63,6 +63,11 @@ kubectl apply -f ./multus-daemonset.yml
 }
 
 vpp_e2e_test(){
+cd $USERSPACEDIR
+kubectl label nodes kind-control-plane app=userspacecni
+make deploy
+kubectl get nodes
+kubectl get nodes --show-labels
 cd $CI_DIR/vpp_test_setup/
 echo "Setting up vpp host"
 ./vpp_host.sh

Diff for: ci/vpp_test_setup/vpp_host.sh

@@ -10,32 +10,32 @@ kubectl create -n vpp configmap vpp-startup-config --from-file="${USERSPACEDIR}/
 worker="kind-control-plane"
 
 
-rm /opt/cni/bin/userspace
+#rm /opt/cni/bin/userspace
 docker exec -i kind-control-plane bash -c "mkdir -p /var/run/vpp/app"
 
-cat << EOF | kubectl apply -f -
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: userspacecni-$worker
-  namespace: vpp
-spec:
-  nodeSelector:
-    kubernetes.io/hostname: $worker
-  containers:
-  - name: userspacecni-$worker
-    image: userspacecni:latest
-    imagePullPolicy: IfNotPresent
-    volumeMounts:
-    - name: cni
-      mountPath: /opt/cni/bin
-  volumes:
-    - name: cni
-      hostPath:
-        path: /opt/cni/bin
-  restartPolicy: Never
-EOF
+# cat << EOF | kubectl apply -f -
+# ---
+# apiVersion: v1
+# kind: Pod
+# metadata:
+#   name: userspacecni-$worker
+#   namespace: vpp
+# spec:
+#   nodeSelector:
+#     kubernetes.io/hostname: $worker
+#   containers:
+#   - name: userspacecni-$worker
+#     image: userspacecni:latest
+#     imagePullPolicy: IfNotPresent
+#     volumeMounts:
+#     - name: cni
+#       mountPath: /opt/cni/bin
+#   volumes:
+#     - name: cni
+#       hostPath:
+#         path: /opt/cni/bin
+#   restartPolicy: Never
+# EOF
 
 
 echo "sleeping for 20 to allow userspace to deploy first"

Diff for: kubernetes/userspace-daemonset.yml

@@ -2,21 +2,36 @@
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
-  name: userspace-cni
+  name: userspacecni
   namespace: kube-system
 spec:
   selector:
     matchLabels:
-      app: userspace-cni
+      app: userspacecni
   template:
     metadata:
       labels:
-        app: userspace-cni
+        app: userspacecni
     spec:
       containers:
       - name: userspace-cni-plugin
         image: localhost:5000/userspacecni #registory:imagename
         imagePullPolicy: IfNotPresent
+        securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop: [ "ALL" ]
+            runAsNonRoot: true
+            runAsUser: 10000
+            seccompProfile:
+              type: RuntimeDefault
+        resources:
+          requests:
+             cpu: 1m
+             memory: 1Mi
+          limits:
+             cpu: 100m
+             memory: 30Mi
         volumeMounts:
         - name: cnibin
           mountPath: /opt/cni/bin