Merge develop into hpsr23 (3371071a) · Commits · TFS / controller

.gitlab-ci.yml

+4 −3

Original line number	Diff line number	Diff line
		@@ -28,9 +28,10 @@ include:
		- local: '/src/context/.gitlab-ci.yml'
		- local: '/src/device/.gitlab-ci.yml'
		- local: '/src/service/.gitlab-ci.yml'
		#- local: '/src/dbscanserving/.gitlab-ci.yml'
		#- local: '/src/opticalattackmitigator/.gitlab-ci.yml'
		#- local: '/src/opticalcentralizedattackdetector/.gitlab-ci.yml'
		- local: '/src/dbscanserving/.gitlab-ci.yml'
		- local: '/src/opticalattackmitigator/.gitlab-ci.yml'
		- local: '/src/opticalattackdetector/.gitlab-ci.yml'
		- local: '/src/opticalattackmanager/.gitlab-ci.yml'
		- local: '/src/automation/.gitlab-ci.yml'
		- local: '/src/policy/.gitlab-ci.yml'
		#- local: '/src/webui/.gitlab-ci.yml'

common_requirements.in

+1 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@ coverage==6.3
		grpcio==1.47.*
		grpcio-health-checking==1.47.*
		grpcio-tools==1.47.*
		grpclib==0.4.4
		prettytable==3.5.0
		prometheus-client==0.13.0
		protobuf==3.20.*

deploy/tfs.sh

+33 −0

Original line number	Diff line number	Diff line
		@@ -175,6 +175,14 @@ echo "# Environment variables for TeraFlowSDN deployment" > $ENV_VARS_SCRIPT
		PYTHONPATH=$(pwd)/src
		echo "export PYTHONPATH=${PYTHONPATH}" >> $ENV_VARS_SCRIPT

		echo "Create Redis secret..."
		# first try to delete an old one if exists
		kubectl delete secret redis-secrets --namespace=$TFS_K8S_NAMESPACE --ignore-not-found
		REDIS_PASSWORD=`uuidgen`
		kubectl create secret generic redis-secrets --namespace=$TFS_K8S_NAMESPACE \
		--from-literal=REDIS_PASSWORD=$REDIS_PASSWORD
		echo "export REDIS_PASSWORD=${REDIS_PASSWORD}" >> $ENV_VARS_SCRIPT

		for COMPONENT in $TFS_COMPONENTS; do
		echo "Processing '$COMPONENT' component..."

		@@ -424,6 +432,31 @@ if [[ "$TFS_COMPONENTS" == "webui" ]]; then
		}' ${GRAFANA_URL_UPDATED}/api/datasources
		echo

		curl -X POST -H "Content-Type: application/json" -H "Accept: application/json" -d '{
		"access" : "proxy",
		"type" : "postgres",
		"name" : "cockroachdb",
		"url" : "'cockroachdb-public.${CRDB_NAMESPACE}.svc.cluster.local:${CRDB_SQL_PORT}'",
		"database" : "'${CRDB_DATABASE}'",
		"user" : "'${CRDB_USERNAME}'",
		"basicAuth": false,
		"isDefault": false,
		"jsonData" : {
		"sslmode" : "require",
		"postgresVersion" : 1100,
		"maxOpenConns" : 0,
		"maxIdleConns" : 2,
		"connMaxLifetime" : 14400,
		"tlsAuth" : false,
		"tlsAuthWithCACert" : false,
		"timescaledb" : false,
		"tlsConfigurationMethod": "file-path",
		"tlsSkipVerify" : true
		},
		"secureJsonData": {"password": "'${CRDB_PASSWORD}'"}
		}' ${GRAFANA_URL_UPDATED}/api/datasources
		echo

		# adding the datasource of the metrics collection framework
		curl -X POST -H "Content-Type: application/json" -H "Accept: application/json" -d '{
		"access" : "proxy",

expose_ingress_grpc.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@
		export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs"}

		# If not already set, set the list of components you want to build images for, and deploy.
		export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device automation policy service compute monitoring dbscanserving opticalattackmitigator opticalcentralizedattackdetector webui"}
		export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device automation policy service compute monitoring dbscanserving opticalattackmitigator opticalcentralizedattackdetector l3_attackmitigator l3_centralizedattackdetector webui"}

		########################################################################################################################
		# Automated steps start here

manifests/cachingservice.yaml

0 → 100644

+64 −0

Original line number	Diff line number	Diff line
		# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
		#
		# Licensed under the Apache License, Version 2.0 (the "License");
		# you may not use this file except in compliance with the License.
		# You may obtain a copy of the License at
		#
		# http://www.apache.org/licenses/LICENSE-2.0
		#
		# Unless required by applicable law or agreed to in writing, software
		# distributed under the License is distributed on an "AS IS" BASIS,
		# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		# See the License for the specific language governing permissions and
		# limitations under the License.

		---
		apiVersion: apps/v1
		kind: Deployment
		metadata:
		name: cachingservice
		spec:
		selector:
		matchLabels:
		app: cachingservice
		template:
		metadata:
		labels:
		app: cachingservice
		spec:
		containers:
		- name: redis
		image: redis:7.0-alpine
		env:
		- name: REDIS_PASSWORD
		valueFrom:
		secretKeyRef:
		name: redis-secrets
		key: REDIS_PASSWORD
		ports:
		- containerPort: 6379
		name: client
		command: ["redis-server"]
		args:
		- --requirepass
		- $(REDIS_PASSWORD)
		resources:
		requests:
		cpu: 50m
		memory: 64Mi
		limits:
		cpu: 500m
		memory: 512Mi
		---
		apiVersion: v1
		kind: Service
		metadata:
		name: cachingservice
		spec:
		type: ClusterIP
		selector:
		app: cachingservice
		ports:
		- name: redis
		port: 6379
		targetPort: 6379