Merge branch 'feat/nfvsdn22' into 'develop' (feea6f16) · Commits · TFS / controller

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -162,6 +162,7 @@ cython_debug/

		# TeraFlowSDN-generated files
		tfs_runtime_env_vars.sh
		tfs_runtime_env_vars*.sh
		tfs_bchain_runtime_env_vars.sh
		delete_local_deployment.sh
		local_docker_deployment.sh

+60 −54

Original line number	Diff line number	Diff line
		@@ -36,9 +36,13 @@ export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs"}
		# If not already set, set additional manifest files to be applied after the deployment
		export TFS_EXTRA_MANIFESTS=${TFS_EXTRA_MANIFESTS:-""}

		# If not already set, set the neew Grafana admin password
		# If not already set, set the new Grafana admin password
		export TFS_GRAFANA_PASSWORD=${TFS_GRAFANA_PASSWORD:-"admin123+"}

		# If not already set, disable skip-build flag.
		# If TFS_SKIP_BUILD is "YES", the containers are not rebuilt-retagged-repushed and existing ones are used.
		export TFS_SKIP_BUILD=${TFS_SKIP_BUILD:-""}

		########################################################################################################################
		# Automated steps start here
		########################################################################################################################
		@@ -67,6 +71,7 @@ echo "export PYTHONPATH=${PYTHONPATH}" >> $ENV_VARS_SCRIPT
		for COMPONENT in $TFS_COMPONENTS; do
		echo "Processing '$COMPONENT' component..."

		if [ "$TFS_SKIP_BUILD" != "YES" ]; then
		echo " Building Docker image..."
		BUILD_LOG="$TMP_LOGS_FOLDER/build_${COMPONENT}.log"

		@@ -136,6 +141,7 @@ for COMPONENT in $TFS_COMPONENTS; do
		docker push "$IMAGE_URL" > "$PUSH_LOG"
		fi
		fi
		fi

		echo " Adapting '$COMPONENT' manifest file..."
		MANIFEST="$TMP_MANIFESTS_FOLDER/${COMPONENT}service.yaml"

+7 −7

Original line number	Diff line number	Diff line
		@@ -34,10 +34,10 @@ spec:
		- containerPort: 6379
		resources:
		requests:
		cpu: 250m
		memory: 512Mi
		cpu: 100m
		memory: 128Mi
		limits:
		cpu: 700m
		cpu: 500m
		memory: 1024Mi
		- name: server
		image: registry.gitlab.com/teraflow-h2020/controller/context:latest
		@@ -64,11 +64,11 @@ spec:
		command: ["/bin/grpc_health_probe", "-addr=:1010"]
		resources:
		requests:
		cpu: 250m
		memory: 512Mi
		cpu: 50m
		memory: 64Mi
		limits:
		cpu: 700m
		memory: 1024Mi
		cpu: 500m
		memory: 512Mi
		---
		apiVersion: v1
		kind: Service

+4 −4

Original line number	Diff line number	Diff line
		@@ -43,11 +43,11 @@ spec:
		command: ["/bin/grpc_health_probe", "-addr=:2020"]
		resources:
		requests:
		cpu: 250m
		memory: 512Mi
		cpu: 50m
		memory: 64Mi
		limits:
		cpu: 700m
		memory: 1024Mi
		cpu: 500m
		memory: 512Mi
		---
		apiVersion: v1
		kind: Service

+12 −5

Original line number	Diff line number	Diff line
		@@ -35,6 +35,11 @@ spec:
		env:
		- name: LOG_LEVEL
		value: "INFO"
		## for debug purposes
		#- name: DLT_GATEWAY_HOST
		# value: "mock-blockchain.tfs-bchain.svc.cluster.local"
		#- name: DLT_GATEWAY_PORT
		# value: "50051"
		readinessProbe:
		exec:
		command: ["/bin/grpc_health_probe", "-addr=:8080"]
		@@ -43,14 +48,16 @@ spec:
		command: ["/bin/grpc_health_probe", "-addr=:8080"]
		resources:
		requests:
		cpu: 250m
		memory: 512Mi
		cpu: 50m
		memory: 64Mi
		limits:
		cpu: 700m
		memory: 1024Mi
		cpu: 500m
		memory: 512Mi
		- name: gateway
		image: registry.gitlab.com/teraflow-h2020/controller/dlt-gateway:latest
		imagePullPolicy: Always
		ports:
		- containerPort: 50051
		#readinessProbe:
		# httpGet:
		# path: /health
		@@ -65,7 +72,7 @@ spec:
		# timeoutSeconds: 5
		resources:
		requests:
		cpu: 250m
		cpu: 200m
		memory: 512Mi
		limits:
		cpu: 700m