Merge branch 'develop' of https://gitlab.com/teraflow-h2020/controller into...

Merge branch 'develop' of https://gitlab.com/teraflow-h2020/controller into feat/microk8s-deployment

manifests/l3_attackmitigatorservice.yaml

@@ -15,15 +15,15 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: l3_attackmitigatorservice
+  name: l3-attackmitigatorservice
 spec:
   selector:
     matchLabels:
-      app: l3_attackmitigatorservice
+      app: l3-attackmitigatorservice
   template:
     metadata:
       labels:
-        app: l3_attackmitigatorservice
+        app: l3-attackmitigatorservice
     spec:
       terminationGracePeriodSeconds: 5
       containers:
@@ -52,11 +52,11 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: l3_attackmitigatorservice
+  name: l3-attackmitigatorservice
 spec:
   type: ClusterIP
   selector:
-    app: l3_attackmitigatorservice
+    app: l3-attackmitigatorservice
   ports:
   - name: grpc
     port: 10002

manifests/l3_centralizedattackdetectorservice.yaml

@@ -15,15 +15,15 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: l3_centralizedattackdetectorservice
+  name: l3-centralizedattackdetectorservice
 spec:
   selector:
     matchLabels:
-      app: l3_centralizedattackdetectorservice
+      app: l3-centralizedattackdetectorservice
   template:
     metadata:
       labels:
-        app: l3_centralizedattackdetectorservice
+        app: l3-centralizedattackdetectorservice
     spec:
       terminationGracePeriodSeconds: 5
       containers:
@@ -52,11 +52,11 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: l3_centralizedattackdetectorservice
+  name: l3-centralizedattackdetectorservice
 spec:
   type: ClusterIP
   selector:
-    app: l3_centralizedattackdetectorservice
+    app: l3-centralizedattackdetectorservice
   ports:
   - name: grpc
     port: 10001

manifests/l3_distributedattackdetectorservice.yaml

@@ -15,15 +15,15 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: l3_distributedattackdetectorservice
+  name: l3-distributedattackdetectorservice
 spec:
   selector:
     matchLabels:
-      app: l3_distributedattackdetectorservice
+      app: l3-distributedattackdetectorservice
   template:
     metadata:
       labels:
-        app: l3_distributedattackdetectorservice
+        app: l3-distributedattackdetectorservice
     spec:
       terminationGracePeriodSeconds: 5
       containers:
@@ -52,11 +52,11 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: l3_distributedattackdetectorservice
+  name: l3-distributedattackdetectorservice
 spec:
   type: ClusterIP
   selector:
-    app: l3_distributedattackdetectorservice
+    app: l3-distributedattackdetectorservice
   ports:
   - name: grpc
     port: 10000

scripts/old/deploy_in_kubernetes.sh

@@ -112,8 +112,10 @@ for COMPONENT in $COMPONENTS; do
     echo "  Deploying '$COMPONENT' component to Kubernetes..."
     DEPLOY_LOG="$TMP_LOGS_FOLDER/deploy_${COMPONENT}.log"
     kubectl --namespace $K8S_NAMESPACE apply -f "$MANIFEST" > "$DEPLOY_LOG"
-    kubectl --namespace $K8S_NAMESPACE scale deployment --replicas=0 ${COMPONENT}service >> "$DEPLOY_LOG"
-    kubectl --namespace $K8S_NAMESPACE scale deployment --replicas=1 ${COMPONENT}service >> "$DEPLOY_LOG"
+
+    COMPONENT_OBJNAME=$(echo "${COMPONENT}" | sed "s/\_/-/")
+    kubectl --namespace $K8S_NAMESPACE scale deployment --replicas=0 ${COMPONENT_OBJNAME}service >> "$DEPLOY_LOG"
+    kubectl --namespace $K8S_NAMESPACE scale deployment --replicas=1 ${COMPONENT_OBJNAME}service >> "$DEPLOY_LOG"
     printf "\n"
 done