From 7fcf140701843f071c690b8952302e114de3d586 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Thu, 26 Jan 2023 15:39:39 +0000
Subject: [PATCH] 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 | 9 +++---
deploy/component.sh | 2 +-
deploy/crdb.sh | 28 +++++++++----------
deploy/mock_blockchain.sh | 2 +-
deploy/nats.sh | 6 ++--
deploy/tfs.sh | 2 +-
manifests/computeservice.yaml | 2 +-
manifests/contextservice.yaml | 13 +++++----
manifests/dbscanservingservice.yaml | 2 +-
manifests/deviceservice.yaml | 2 +-
manifests/dltservice.yaml | 4 +--
manifests/interdomainservice.yaml | 2 +-
manifests/l3_attackmitigatorservice.yaml | 2 +-
.../l3_centralizedattackdetectorservice.yaml | 2 +-
.../l3_distributedattackdetectorservice.yaml | 2 +-
manifests/load_generatorservice.yaml | 2 +-
manifests/mock_blockchain.yaml | 2 +-
manifests/monitoringservice.yaml | 2 +-
manifests/opticalattackmitigatorservice.yaml | 2 +-
...ticalcentralizedattackdetectorservice.yaml | 2 +-
manifests/pathcompservice.yaml | 4 +--
manifests/serviceservice.yaml | 2 +-
manifests/sliceservice.yaml | 2 +-
manifests/webuiservice.yaml | 2 +-
scripts/old/deploy_in_kubernetes.sh | 2 +-
.../src/main/resources/application.yml | 4 +--
.../target/kubernetes/kubernetes.yml | 2 +-
.../backend/nats/NatsBackend.py | 9 +++++-
src/context/service/database/Engine.py | 11 +++++++-
src/policy/src/main/resources/application.yml | 4 +--
src/policy/target/kubernetes/kubernetes.yml | 2 +-
src/tests/oeccpsc22/deploy_in_kubernetes.sh | 2 +-
32 files changed, 77 insertions(+), 59 deletions(-)
diff --git a/README.md b/README.md
index 0336b9f6c..67f6895ce 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,11 @@
# 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" : [](https://gitlab.com/teraflow-h2020/controller/-/commits/master) [](https://gitlab.com/teraflow-h2020/controller/-/commits/master)
+Branch "master" : [](https://labs.etsi.org/rep/tfs/controller/-/commits/master) [](https://labs.etsi.org/rep/tfs/controller/-/commits/master)
-Branch "develop" : [](https://gitlab.com/teraflow-h2020/controller/-/commits/develop) [](https://gitlab.com/teraflow-h2020/controller/-/commits/develop)
+Branch "develop" : [](https://labs.etsi.org/rep/tfs/controller/-/commits/develop) [](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).
diff --git a/deploy/component.sh b/deploy/component.sh
index f3cbddd8f..443bee601 100755
--- a/deploy/component.sh
+++ b/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
diff --git a/deploy/crdb.sh b/deploy/crdb.sh
index c3cae9d40..ecec39101 100755
--- a/deploy/crdb.sh
+++ b/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
}
diff --git a/deploy/mock_blockchain.sh b/deploy/mock_blockchain.sh
index 066820fc0..f741f069f 100755
--- a/deploy/mock_blockchain.sh
+++ b/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
diff --git a/deploy/nats.sh b/deploy/nats.sh
index affae0b08..757b0984f 100755
--- a/deploy/nats.sh
+++ b/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
}
diff --git a/deploy/tfs.sh b/deploy/tfs.sh
index e017ce352..efa4875c6 100755
--- a/deploy/tfs.sh
+++ b/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
diff --git a/manifests/computeservice.yaml b/manifests/computeservice.yaml
index 0c8d0a672..89a4a39e5 100644
--- a/manifests/computeservice.yaml
+++ b/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
diff --git a/manifests/contextservice.yaml b/manifests/contextservice.yaml
index f5844d81b..3bb1a01d9 100644
--- a/manifests/contextservice.yaml
+++ b/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"]
diff --git a/manifests/dbscanservingservice.yaml b/manifests/dbscanservingservice.yaml
index 9553ed556..e1f73a237 100644
--- a/manifests/dbscanservingservice.yaml
+++ b/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
diff --git a/manifests/deviceservice.yaml b/manifests/deviceservice.yaml
index 960096b93..5c72263eb 100644
--- a/manifests/deviceservice.yaml
+++ b/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
diff --git a/manifests/dltservice.yaml b/manifests/dltservice.yaml
index 0f6b5bb9d..c067960b7 100644
--- a/manifests/dltservice.yaml
+++ b/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
diff --git a/manifests/interdomainservice.yaml b/manifests/interdomainservice.yaml
index b275035f6..b21434361 100644
--- a/manifests/interdomainservice.yaml
+++ b/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
diff --git a/manifests/l3_attackmitigatorservice.yaml b/manifests/l3_attackmitigatorservice.yaml
index 2240776eb..592143089 100644
--- a/manifests/l3_attackmitigatorservice.yaml
+++ b/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
diff --git a/manifests/l3_centralizedattackdetectorservice.yaml b/manifests/l3_centralizedattackdetectorservice.yaml
index fa7ee9dcc..8672cab95 100644
--- a/manifests/l3_centralizedattackdetectorservice.yaml
+++ b/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
diff --git a/manifests/l3_distributedattackdetectorservice.yaml b/manifests/l3_distributedattackdetectorservice.yaml
index 6b28f68dd..8765b7171 100644
--- a/manifests/l3_distributedattackdetectorservice.yaml
+++ b/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
diff --git a/manifests/load_generatorservice.yaml b/manifests/load_generatorservice.yaml
index 88b1fa397..4d7b32d1b 100644
--- a/manifests/load_generatorservice.yaml
+++ b/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
diff --git a/manifests/mock_blockchain.yaml b/manifests/mock_blockchain.yaml
index bf9abac70..17b32a47e 100644
--- a/manifests/mock_blockchain.yaml
+++ b/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
diff --git a/manifests/monitoringservice.yaml b/manifests/monitoringservice.yaml
index aed8d1c51..b5f3042ba 100644
--- a/manifests/monitoringservice.yaml
+++ b/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
diff --git a/manifests/opticalattackmitigatorservice.yaml b/manifests/opticalattackmitigatorservice.yaml
index afe2e4069..0252eec21 100644
--- a/manifests/opticalattackmitigatorservice.yaml
+++ b/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
diff --git a/manifests/opticalcentralizedattackdetectorservice.yaml b/manifests/opticalcentralizedattackdetectorservice.yaml
index 664bcb543..4a49f8b13 100644
--- a/manifests/opticalcentralizedattackdetectorservice.yaml
+++ b/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
diff --git a/manifests/pathcompservice.yaml b/manifests/pathcompservice.yaml
index e9b890e76..4f7a65c45 100644
--- a/manifests/pathcompservice.yaml
+++ b/manifests/pathcompservice.yaml
@@ -29,7 +29,7 @@ spec:
terminationGracePeriodSeconds: 5
containers:
- name: frontend
- image: registry.gitlab.com/teraflow-h2020/controller/pathcomp-frontend:latest
+ image: labs.etsi.org:5050/tfs/controller/pathcomp-frontend:latest
imagePullPolicy: Always
ports:
- containerPort: 10020
@@ -51,7 +51,7 @@ spec:
cpu: 500m
memory: 512Mi
- name: backend
- image: registry.gitlab.com/teraflow-h2020/controller/pathcomp-backend:latest
+ image: labs.etsi.org:5050/tfs/controller/pathcomp-backend:latest
imagePullPolicy: Always
#readinessProbe:
# httpGet:
diff --git a/manifests/serviceservice.yaml b/manifests/serviceservice.yaml
index b24bf13f0..561b204cb 100644
--- a/manifests/serviceservice.yaml
+++ b/manifests/serviceservice.yaml
@@ -29,7 +29,7 @@ spec:
terminationGracePeriodSeconds: 5
containers:
- name: server
- image: registry.gitlab.com/teraflow-h2020/controller/service:latest
+ image: labs.etsi.org:5050/tfs/controller/service:latest
imagePullPolicy: Always
ports:
- containerPort: 3030
diff --git a/manifests/sliceservice.yaml b/manifests/sliceservice.yaml
index 375344a97..ca7641de3 100644
--- a/manifests/sliceservice.yaml
+++ b/manifests/sliceservice.yaml
@@ -29,7 +29,7 @@ spec:
terminationGracePeriodSeconds: 5
containers:
- name: server
- image: registry.gitlab.com/teraflow-h2020/controller/slice:latest
+ image: labs.etsi.org:5050/tfs/controller/slice:latest
imagePullPolicy: Always
ports:
- containerPort: 4040
diff --git a/manifests/webuiservice.yaml b/manifests/webuiservice.yaml
index dd8004ad8..3828ee419 100644
--- a/manifests/webuiservice.yaml
+++ b/manifests/webuiservice.yaml
@@ -32,7 +32,7 @@ spec:
- 0
containers:
- name: server
- image: registry.gitlab.com/teraflow-h2020/controller/webui:latest
+ image: labs.etsi.org:5050/tfs/controller/webui:latest
imagePullPolicy: Always
ports:
- containerPort: 8004
diff --git a/scripts/old/deploy_in_kubernetes.sh b/scripts/old/deploy_in_kubernetes.sh
index 89f45a548..c85354137 100755
--- a/scripts/old/deploy_in_kubernetes.sh
+++ b/scripts/old/deploy_in_kubernetes.sh
@@ -43,7 +43,7 @@ export EXTRA_MANIFESTS=${EXTRA_MANIFESTS:-""}
########################################################################################################################
# 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
diff --git a/src/automation/src/main/resources/application.yml b/src/automation/src/main/resources/application.yml
index bc89d4348..62cf8fc8e 100644
--- a/src/automation/src/main/resources/application.yml
+++ b/src/automation/src/main/resources/application.yml
@@ -33,9 +33,9 @@ quarkus:
port: 8080
container-image:
- group: teraflow-h2020
+ group: tfs
name: controller/automation
- registry: registry.gitlab.com
+ registry: labs.etsi.org:5050
kubernetes:
name: automationservice
diff --git a/src/automation/target/kubernetes/kubernetes.yml b/src/automation/target/kubernetes/kubernetes.yml
index 8bc14b935..f4f1c7dae 100644
--- a/src/automation/target/kubernetes/kubernetes.yml
+++ b/src/automation/target/kubernetes/kubernetes.yml
@@ -52,7 +52,7 @@ spec:
value: contextservice
- name: DEVICE_SERVICE_HOST
value: deviceservice
- image: registry.gitlab.com/teraflow-h2020/controller/automation:0.2.0
+ image: labs.etsi.org:5050/tfs/controller/automation:0.2.0
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
diff --git a/src/common/message_broker/backend/nats/NatsBackend.py b/src/common/message_broker/backend/nats/NatsBackend.py
index 197bc8633..6c644a0a8 100644
--- a/src/common/message_broker/backend/nats/NatsBackend.py
+++ b/src/common/message_broker/backend/nats/NatsBackend.py
@@ -20,10 +20,17 @@ from .._Backend import _Backend
from .NatsBackendThread import NatsBackendThread
DEFAULT_NATS_URI = 'nats://127.0.0.1:4222'
+#NATS_URI_TEMPLATE = 'nats://{:s}:{:s}@nats.{:s}.svc.cluster.local:{:s}' # with authentication
+NATS_URI_TEMPLATE = 'nats://nats.{:s}.svc.cluster.local:{:s}'
class NatsBackend(_Backend):
def __init__(self, **settings) -> None: # pylint: disable=super-init-not-called
- nats_uri = get_setting('NATS_URI', settings=settings, default=DEFAULT_NATS_URI)
+ nats_namespace = get_setting('NATS_NAMESPACE', settings=settings)
+ nats_client_port = get_setting('NATS_CLIENT_PORT', settings=settings)
+ if nats_namespace is None or nats_client_port is None:
+ nats_uri = get_setting('NATS_URI', settings=settings, default=DEFAULT_NATS_URI)
+ else:
+ nats_uri = NATS_URI_TEMPLATE.format(nats_namespace, nats_client_port)
self._terminate = threading.Event()
self._nats_backend_thread = NatsBackendThread(nats_uri)
self._nats_backend_thread.start()
diff --git a/src/context/service/database/Engine.py b/src/context/service/database/Engine.py
index c507efc72..a37ec0c1e 100644
--- a/src/context/service/database/Engine.py
+++ b/src/context/service/database/Engine.py
@@ -19,11 +19,20 @@ LOGGER = logging.getLogger(__name__)
APP_NAME = 'tfs'
ECHO = False # true: dump SQL commands and transactions executed
+CRDB_URI_TEMPLATE = 'cockroachdb://{:s}:{:s}@cockroachdb-public.{:s}.svc.cluster.local:{:s}/{:s}?sslmode={:s}'
class Engine:
@staticmethod
def get_engine() -> sqlalchemy.engine.Engine:
- crdb_uri = get_setting('CRDB_URI')
+ CRDB_NAMESPACE = get_setting('CRDB_NAMESPACE')
+ CRDB_SQL_PORT = get_setting('CRDB_SQL_PORT')
+ CRDB_DATABASE = get_setting('CRDB_DATABASE')
+ CRDB_USERNAME = get_setting('CRDB_USERNAME')
+ CRDB_PASSWORD = get_setting('CRDB_PASSWORD')
+ CRDB_SSLMODE = get_setting('CRDB_SSLMODE')
+
+ crdb_uri = CRDB_URI_TEMPLATE.format(
+ CRDB_USERNAME, CRDB_PASSWORD, CRDB_NAMESPACE, CRDB_SQL_PORT, CRDB_DATABASE, CRDB_SSLMODE)
try:
engine = sqlalchemy.create_engine(
diff --git a/src/policy/src/main/resources/application.yml b/src/policy/src/main/resources/application.yml
index 3d9927634..fa7dff7b2 100644
--- a/src/policy/src/main/resources/application.yml
+++ b/src/policy/src/main/resources/application.yml
@@ -34,9 +34,9 @@ quarkus:
port: 8080
container-image:
- group: teraflow-h2020
+ group: tfs
name: controller/policy
- registry: registry.gitlab.com
+ registry: labs.etsi.org:5050
kubernetes:
name: policyservice
diff --git a/src/policy/target/kubernetes/kubernetes.yml b/src/policy/target/kubernetes/kubernetes.yml
index 1a2b4e26c..51ed10e4a 100644
--- a/src/policy/target/kubernetes/kubernetes.yml
+++ b/src/policy/target/kubernetes/kubernetes.yml
@@ -57,7 +57,7 @@ spec:
value: contextservice
- name: SERVICE_SERVICE_HOST
value: serviceservice
- image: registry.gitlab.com/teraflow-h2020/controller/policy:0.1.0
+ image: labs.etsi.org:5050/tfs/controller/policy:0.1.0
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
diff --git a/src/tests/oeccpsc22/deploy_in_kubernetes.sh b/src/tests/oeccpsc22/deploy_in_kubernetes.sh
index 426e07e13..fffce0b76 100755
--- a/src/tests/oeccpsc22/deploy_in_kubernetes.sh
+++ b/src/tests/oeccpsc22/deploy_in_kubernetes.sh
@@ -22,7 +22,7 @@ export K8S_HOSTNAME="kubernetes-master"
#export 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
--
GitLab