Merge branch 'develop' of ssh://gifrerenom_labs.etsi.org/tfs/controller into cnit_related_activity (7822e832) · Commits · TFS / controller

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ share/python-wheels/
		.installed.cfg
		*.egg
		MANIFEST
		.my_venv/
		# requirements.txt # removed to enable tracking versions of packages over time

		# PyInstaller

.gitlab-ci.yml

+3 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ include:
		- local: '/src/opticalcontroller/.gitlab-ci.yml'
		- local: '/src/ztp/.gitlab-ci.yml'
		- local: '/src/policy/.gitlab-ci.yml'
		- local: '/src/automation/.gitlab-ci.yml'
		- local: '/src/forecaster/.gitlab-ci.yml'
		#- local: '/src/webui/.gitlab-ci.yml'
		#- local: '/src/l3_distributedattackdetector/.gitlab-ci.yml'
		@@ -50,5 +51,7 @@ include:
		- local: '/src/kpi_value_writer/.gitlab-ci.yml'
		- local: '/src/telemetry/.gitlab-ci.yml'
		- local: '/src/analytics/.gitlab-ci.yml'
		- local: '/src/qos_profile/.gitlab-ci.yml'

		# This should be last one: end-to-end integration tests
		- local: '/src/tests/.gitlab-ci.yml'

deploy/crdb.sh

+36 −12

Original line number	Diff line number	Diff line
		@@ -154,8 +154,8 @@ function crdb_undeploy_single() {
		echo
		}

		function crdb_drop_database_single() {
		echo "Drop database if exists"
		function crdb_drop_databases_single() {
		echo "Drop TFS databases, if exist"

		if [[ -z "${GITLAB_CI}" ]]; then
		#kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o yaml
		@@ -168,9 +168,21 @@ function crdb_drop_database_single() {

		CRDB_CLIENT_URL="postgresql://${CRDB_USERNAME}:${CRDB_PASSWORD}@${CRDB_HOST}:${CRDB_PORT}/defaultdb?sslmode=require"
		echo "CRDB_CLIENT_URL=${CRDB_CLIENT_URL}"

		DATABASES=$(
		kubectl exec -i --namespace ${CRDB_NAMESPACE} cockroachdb-0 -- \
		./cockroach sql --certs-dir=/cockroach/cockroach-certs --url=${CRDB_CLIENT_URL} \
		--execute "SHOW DATABASES;" --format=tsv \| awk '{print $1}' \| grep "^tfs"
		)
		echo "Found TFS databases: ${DATABASES}" \| tr '\n' ' '
		echo

		for DB_NAME in $DATABASES; do
		echo "Dropping TFS database: $DB_NAME"
		kubectl exec -i --namespace ${CRDB_NAMESPACE} cockroachdb-0 -- \
		./cockroach sql --certs-dir=/cockroach/cockroach-certs --url=${CRDB_CLIENT_URL} \
		--execute "DROP DATABASE IF EXISTS ${CRDB_DATABASE};"
		--execute="DROP DATABASE IF EXISTS $DB_NAME CASCADE;"
		done
		echo
		}

		@@ -349,11 +361,23 @@ function crdb_undeploy_cluster() {
		echo
		}

		function crdb_drop_database_cluster() {
		echo "Drop database if exists"
		function crdb_drop_databases_cluster() {
		echo "Drop TFS databases, if exist"

		DATABASES=$(
		kubectl exec -i --namespace ${CRDB_NAMESPACE} cockroachdb-client-secure -- \
		./cockroach sql --certs-dir=/cockroach/cockroach-certs --host=cockroachdb-public --execute \
		"DROP DATABASE IF EXISTS ${CRDB_DATABASE};"
		./cockroach sql --certs-dir=/cockroach/cockroach-certs --host=cockroachdb-public \
		--execute "SHOW DATABASES;" --format=tsv \| awk '{print $1}' \| grep "^tfs"
		)
		echo "Found TFS databases: ${DATABASES}" \| tr '\n' ' '
		echo

		for DB_NAME in $DATABASES; do
		echo "Dropping TFS database: $DB_NAME"
		kubectl exec -i --namespace ${CRDB_NAMESPACE} cockroachdb-client-secure -- \
		./cockroach sql --certs-dir=/cockroach/cockroach-certs --host=cockroachdb-public \
		--execute="DROP DATABASE IF EXISTS $DB_NAME CASCADE;"
		done
		echo
		}

		@@ -365,7 +389,7 @@ if [ "$CRDB_DEPLOY_MODE" == "single" ]; then
		crdb_deploy_single

		if [ "$CRDB_DROP_DATABASE_IF_EXISTS" == "YES" ]; then
		crdb_drop_database_single
		crdb_drop_databases_single
		fi
		elif [ "$CRDB_DEPLOY_MODE" == "cluster" ]; then
		if [ "$CRDB_REDEPLOY" == "YES" ]; then
		@@ -375,7 +399,7 @@ elif [ "$CRDB_DEPLOY_MODE" == "cluster" ]; then
		crdb_deploy_cluster

		if [ "$CRDB_DROP_DATABASE_IF_EXISTS" == "YES" ]; then
		crdb_drop_database_cluster
		crdb_drop_databases_cluster
		fi
		else
		echo "Unsupported value: CRDB_DEPLOY_MODE=$CRDB_DEPLOY_MODE"

deploy/tfs.sh

+1 −2

Original line number	Diff line number	Diff line
		@@ -344,11 +344,10 @@ for COMPONENT in $TFS_COMPONENTS; do
		VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-gateway:" "$MANIFEST" \| cut -d ":" -f4)
		sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-gateway:${VERSION}#image: $IMAGE_URL#g" "$MANIFEST"
		else
		VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}:" "$MANIFEST" \| cut -d ":" -f4)
		if [ "$TFS_SKIP_BUILD" != "YES" ]; then
		IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGES/$COMPONENT:$TFS_IMAGE_TAG" \| sed 's,//,/,g' \| sed 's,http:/,,g')
		VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}:" "$MANIFEST" \| cut -d ":" -f4)
		else
		VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}:" "$MANIFEST" \| cut -d ":" -f4)
		IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGES/$COMPONENT:$VERSION" \| sed 's,//,/,g' \| sed 's,http:/,,g')
		fi
		sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT:${VERSION}#image: $IMAGE_URL#g" "$MANIFEST"

manifests/analyticsservice.yaml

+2 −2

Original line number	Diff line number	Diff line
		@@ -98,11 +98,11 @@ spec:
		selector:
		app: analyticsservice
		ports:
		- name: frontend-grpc
		- name: grpc
		protocol: TCP
		port: 30080
		targetPort: 30080
		- name: backend-grpc
		- name: grpc-backend
		protocol: TCP
		port: 30090
		targetPort: 30090