Readme, Manifests and Deploy scripts:

- updated old gitlab.com URLs by new labs.etsi.org URLs.
- updated Context to use secrets generated by CockroachDB and NATS

README.md

 # TeraFlowSDN Controller
 
-[Teraflow H2020 project](https://teraflow-h2020.eu/) - Secured autonomic traffic management for a Tera of SDN Flows
+[ETSI OpenSource Group for TeraFlowSDN](https://tfs.etsi.org/)
+Former, [Teraflow H2020 project](https://teraflow-h2020.eu/) - Secured autonomic traffic management for a Tera of SDN Flows
 
-Branch "master" : [![pipeline status](https://gitlab.com/teraflow-h2020/controller/badges/master/pipeline.svg)](https://gitlab.com/teraflow-h2020/controller/-/commits/master) [![coverage report](https://gitlab.com/teraflow-h2020/controller/badges/master/coverage.svg)](https://gitlab.com/teraflow-h2020/controller/-/commits/master)
+Branch "master" : [![pipeline status](https://labs.etsi.org/rep/tfs/controller/badges/master/pipeline.svg)](https://labs.etsi.org/rep/tfs/controller/-/commits/master) [![coverage report](https://labs.etsi.org/rep/tfs/controller/badges/master/coverage.svg)](https://labs.etsi.org/rep/tfs/controller/-/commits/master)
 
-Branch "develop" : [![pipeline status](https://gitlab.com/teraflow-h2020/controller/badges/develop/pipeline.svg)](https://gitlab.com/teraflow-h2020/controller/-/commits/develop) [![coverage report](https://gitlab.com/teraflow-h2020/controller/badges/develop/coverage.svg)](https://gitlab.com/teraflow-h2020/controller/-/commits/develop)
+Branch "develop" : [![pipeline status](https://labs.etsi.org/rep/tfs/controller/badges/develop/pipeline.svg)](https://labs.etsi.org/rep/tfs/controller/-/commits/develop) [![coverage report](https://labs.etsi.org/rep/tfs/controller/badges/develop/coverage.svg)](https://labs.etsi.org/rep/tfs/controller/-/commits/develop)
 
 # Installation Instructions
-For devel and upcoming release 2.0, we have prepared the following tutorial: [TeraFlowSDN tutorial](https://gitlab.com/teraflow-h2020/controller/-/tree/develop/tutorial).
+For devel and upcoming release 2.0, check the Wiki pages: [TeraFlowSDN Wiki](https://labs.etsi.org/rep/tfs/controller/-/wikis/home).

deploy/component.sh

@@ -41,7 +41,7 @@ export TFS_GRAFANA_PASSWORD=${TFS_GRAFANA_PASSWORD:-"admin123+"}
 ########################################################################################################################
 
 # Constants
-GITLAB_REPO_URL="registry.gitlab.com/teraflow-h2020/controller"
+GITLAB_REPO_URL="labs.etsi.org:5050/tfs/controller"
 TMP_FOLDER="./tmp"
 
 # Create a tmp folder for files modified during the deployment

deploy/crdb.sh

@@ -141,13 +141,13 @@ function crdb_deploy_single() {
 
     echo "Create secret with CockroachDB data"
     kubectl create secret generic ${CRDB_SECRET_NAME} --namespace ${CRDB_SECRET_NAMESPACE} --type='Opaque' \
-        --from-literal=namespace=${CRDB_NAMESPACE} \
-        --from-literal=sql_port=${CRDB_SQL_PORT} \
-        --from-literal=gui_port=${CRDB_GUI_PORT} \
-        --from-literal=database=${CRDB_DATABASE} \
-        --from-literal=username=${CRDB_USERNAME} \
-        --from-literal=password="'"${CRDB_PASSWORD}"'" \
-        --from-literal=sslmode=require
+        --from-literal=CRDB_NAMESPACE=${CRDB_NAMESPACE} \
+        --from-literal=CRDB_SQL_PORT=${CRDB_SQL_PORT} \
+        --from-literal=CRDB_GUI_PORT=${CRDB_GUI_PORT} \
+        --from-literal=CRDB_DATABASE=${CRDB_DATABASE} \
+        --from-literal=CRDB_USERNAME=${CRDB_USERNAME} \
+        --from-literal=CRDB_PASSWORD="'"${CRDB_PASSWORD}"'" \
+        --from-literal=CRDB_SSLMODE=require
 
     kubectl get all --all-namespaces
 }
@@ -310,13 +310,13 @@ function crdb_deploy_cluster() {
 
     echo "Create secret with CockroachDB data"
     kubectl create secret generic ${CRDB_SECRET_NAME} --namespace ${CRDB_SECRET_NAMESPACE} --type='Opaque' \
-        --from-literal=namespace=${CRDB_NAMESPACE} \
-        --from-literal=sql_port=${CRDB_SQL_PORT} \
-        --from-literal=gui_port=${CRDB_GUI_PORT} \
-        --from-literal=database=${CRDB_DATABASE} \
-        --from-literal=username=${CRDB_USERNAME} \
-        --from-literal=password="'"${CRDB_PASSWORD}"'" \
-        --from-literal=sslmode=require
+        --from-literal=CRDB_NAMESPACE=${CRDB_NAMESPACE} \
+        --from-literal=CRDB_SQL_PORT=${CRDB_SQL_PORT} \
+        --from-literal=CRDB_GUI_PORT=${CRDB_GUI_PORT} \
+        --from-literal=CRDB_DATABASE=${CRDB_DATABASE} \
+        --from-literal=CRDB_USERNAME=${CRDB_USERNAME} \
+        --from-literal=CRDB_PASSWORD="'"${CRDB_PASSWORD}"'" \
+        --from-literal=CRDB_SSLMODE=require
 
     kubectl get all --all-namespaces
 }

deploy/mock_blockchain.sh

@@ -34,7 +34,7 @@ COMPONENT="mock_blockchain"
 ########################################################################################################################
 
 # Constants
-GITLAB_REPO_URL="registry.gitlab.com/teraflow-h2020/controller"
+GITLAB_REPO_URL="labs.etsi.org:5050/tfs/controller"
 TMP_FOLDER="./tmp"
 
 # Create a tmp folder for files modified during the deployment

deploy/nats.sh

@@ -109,9 +109,9 @@ function nats_deploy_single() {
 
     echo "Create secret with NATS data"
     kubectl create secret generic ${NATS_SECRET_NAME} --namespace ${NATS_SECRET_NAMESPACE} --type='Opaque' \
-        --from-literal=namespace=${NATS_NAMESPACE} \
-        --from-literal=client_port=${NATS_CLIENT_PORT} \
-        --from-literal=gui_port=${NATS_GUI_PORT}
+        --from-literal=NATS_NAMESPACE=${NATS_NAMESPACE} \
+        --from-literal=NATS_CLIENT_PORT=${NATS_CLIENT_PORT} \
+        --from-literal=NATS_GUI_PORT=${NATS_GUI_PORT}
 
     kubectl get all --all-namespaces
 }

deploy/tfs.sh

@@ -47,7 +47,7 @@ export TFS_SKIP_BUILD=${TFS_SKIP_BUILD:-""}
 ########################################################################################################################
 
 # Constants
-GITLAB_REPO_URL="registry.gitlab.com/teraflow-h2020/controller"
+GITLAB_REPO_URL="labs.etsi.org:5050/tfs/controller"
 TMP_FOLDER="./tmp"
 
 # Create a tmp folder for files modified during the deployment

manifests/computeservice.yaml

@@ -28,7 +28,7 @@ spec:
       terminationGracePeriodSeconds: 5
       containers:
       - name: server
-        image: registry.gitlab.com/teraflow-h2020/controller/compute:latest
+        image: labs.etsi.org:5050/tfs/controller/compute:latest
         imagePullPolicy: Always
         ports:
         - containerPort: 8080

manifests/contextservice.yaml

@@ -29,20 +29,21 @@ spec:
       terminationGracePeriodSeconds: 5
       containers:
       - name: server
-        image: registry.gitlab.com/teraflow-h2020/controller/context:latest
+        image: labs.etsi.org:5050/tfs/controller/context:latest
         imagePullPolicy: Always
         ports:
         - containerPort: 1010
         - containerPort: 9192
         env:
-        - name: CRDB_URI
-          value: "cockroachdb://tfs:tfs123@cockroachdb-public.crdb.svc.cluster.local:26257/tfs?sslmode=require"
         - name: MB_BACKEND
-          value: "inmemory"
-        #- name: NATS_URI
-        #  value: "nats://tfs:tfs123@nats-public.nats.svc.cluster.local:4222"
+          value: "nats"
         - name: LOG_LEVEL
           value: "DEBUG"
+        envFrom:
+        - secretRef:
+            name: crdb-data
+        - secretRef:
+            name: nats-data
         readinessProbe:
           exec:
             command: ["/bin/grpc_health_probe", "-addr=:1010"]

manifests/dbscanservingservice.yaml

@@ -28,7 +28,7 @@ spec:
       terminationGracePeriodSeconds: 5
       containers:
       - name: server
-        image: registry.gitlab.com/teraflow-h2020/controller/dbscanserving:latest
+        image: labs.etsi.org:5050/tfs/controller/dbscanserving:latest
         imagePullPolicy: Always
         ports:
         - containerPort: 10006

manifests/deviceservice.yaml

@@ -29,7 +29,7 @@ spec:
       terminationGracePeriodSeconds: 5
       containers:
       - name: server
-        image: registry.gitlab.com/teraflow-h2020/controller/device:latest
+        image: labs.etsi.org:5050/tfs/controller/device:latest
         imagePullPolicy: Always
         ports:
         - containerPort: 2020

manifests/dltservice.yaml

@@ -28,7 +28,7 @@ spec:
       terminationGracePeriodSeconds: 5
       containers:
       - name: connector
-        image: registry.gitlab.com/teraflow-h2020/controller/dlt-connector:latest
+        image: labs.etsi.org:5050/tfs/controller/dlt-connector:latest
         imagePullPolicy: Always
         ports:
         - containerPort: 8080
@@ -55,7 +55,7 @@ spec:
             cpu: 500m
             memory: 512Mi
       - name: gateway
-        image: registry.gitlab.com/teraflow-h2020/controller/dlt-gateway:latest
+        image: labs.etsi.org:5050/tfs/controller/dlt-gateway:latest
         imagePullPolicy: Always
         ports:
         - containerPort: 50051

manifests/interdomainservice.yaml

@@ -28,7 +28,7 @@ spec:
       terminationGracePeriodSeconds: 5
       containers:
       - name: server
-        image: registry.gitlab.com/teraflow-h2020/controller/interdomain:latest
+        image: labs.etsi.org:5050/tfs/controller/interdomain:latest
         imagePullPolicy: Always
         ports:
         - containerPort: 10010

manifests/l3_attackmitigatorservice.yaml

@@ -28,7 +28,7 @@ spec:
       terminationGracePeriodSeconds: 5
       containers:
       - name: server
-        image: registry.gitlab.com/teraflow-h2020/controller/l3_attackmitigator:latest
+        image: labs.etsi.org:5050/tfs/controller/l3_attackmitigator:latest
         imagePullPolicy: Always
         ports:
         - containerPort: 10002

manifests/l3_centralizedattackdetectorservice.yaml

@@ -28,7 +28,7 @@ spec:
       terminationGracePeriodSeconds: 5
       containers:
       - name: server
-        image: registry.gitlab.com/teraflow-h2020/controller/l3_centralizedattackdetector:latest
+        image: labs.etsi.org:5050/tfs/controller/l3_centralizedattackdetector:latest
         imagePullPolicy: Always
         ports:
         - containerPort: 10001

manifests/l3_distributedattackdetectorservice.yaml

@@ -28,7 +28,7 @@ spec:
       terminationGracePeriodSeconds: 5
       containers:
       - name: server
-        image: registry.gitlab.com/teraflow-h2020/controller/l3_distributedattackdetector:latest
+        image: labs.etsi.org:5050/tfs/controller/l3_distributedattackdetector:latest
         imagePullPolicy: Always
         ports:
         - containerPort: 10000

manifests/load_generatorservice.yaml

@@ -29,7 +29,7 @@ spec:
       terminationGracePeriodSeconds: 5
       containers:
       - name: server
-        image: registry.gitlab.com/teraflow-h2020/controller/load_generator:latest
+        image: labs.etsi.org:5050/tfs/controller/load_generator:latest
         imagePullPolicy: Always
         ports:
         - containerPort: 50052

manifests/mock_blockchain.yaml

@@ -28,7 +28,7 @@ spec:
       terminationGracePeriodSeconds: 5
       containers:
       - name: server
-        image: registry.gitlab.com/teraflow-h2020/controller/mock_blockchain:latest
+        image: labs.etsi.org:5050/tfs/controller/mock_blockchain:latest
         imagePullPolicy: Always
         ports:
         - containerPort: 50051

manifests/monitoringservice.yaml

@@ -66,7 +66,7 @@ spec:
       restartPolicy: Always
       containers:
       - name: server
-        image: registry.gitlab.com/teraflow-h2020/controller/monitoring:latest
+        image: labs.etsi.org:5050/tfs/controller/monitoring:latest
         imagePullPolicy: Always
         ports:
         - name: grpc

manifests/opticalattackmitigatorservice.yaml

@@ -28,7 +28,7 @@ spec:
       terminationGracePeriodSeconds: 5
       containers:
       - name: server
-        image: registry.gitlab.com/teraflow-h2020/controller/opticalattackmitigator:latest
+        image: labs.etsi.org:5050/tfs/controller/opticalattackmitigator:latest
         imagePullPolicy: Always
         ports:
         - containerPort: 10007

manifests/opticalcentralizedattackdetectorservice.yaml

@@ -28,7 +28,7 @@ spec:
       terminationGracePeriodSeconds: 5
       containers:
       - name: server
-        image: registry.gitlab.com/teraflow-h2020/controller/opticalcentralizedattackdetector:latest
+        image: labs.etsi.org:5050/tfs/controller/opticalcentralizedattackdetector:latest
         imagePullPolicy: Always
         ports:
         - containerPort: 10005