Commit f2287700 authored Aug 13, 2021 by Lluis Gifre Renom

Merge branch 'feat/service-service' into 'develop'

Integration of Service service, multiple improvements in Context and Device services, and GitLab CI pipeline integration and functional tests

See merge request teraflow-h2020/controller!12

parents 9cc44b30 6d7d39ed

.gitlab-ci.yml

+6 −2

Original line number	Diff line number	Diff line
		@@ -2,9 +2,11 @@
		stages:
		- build
		- test
		- unit_test
		- integ_test
		- dependencies
		- deploy
		- integration_test
		- funct_test

		# include the individual .gitlab-ci.yml of each micro-service
		include:
		@@ -12,4 +14,6 @@ include:
		#- local: '/src/monitoring/.gitlab-ci.yml'
		- local: '/src/context/.gitlab-ci.yml'
		- local: '/src/device/.gitlab-ci.yml'
		- local: '/src/integration_tester/.gitlab-ci.yml'
		- local: '/src/service/.gitlab-ci.yml'
		- local: '/src/tester_integration/.gitlab-ci.yml'
		- local: '/src/tester_functional/.gitlab-ci.yml'

manifests/contextservice.yaml

+25 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ spec:
		imagePullPolicy: Always
		ports:
		- containerPort: 1010
		- containerPort: 8080
		env:
		- name: DB_ENGINE
		value: "redis"
		@@ -51,3 +52,27 @@ spec:
		- name: grpc
		port: 1010
		targetPort: 1010
		- name: http
		port: 8080
		targetPort: 8080
		---
		apiVersion: v1
		kind: Service
		metadata:
		name: contextservice-public
		labels:
		app: contextservice
		spec:
		type: NodePort
		selector:
		app: contextservice
		ports:
		- name: grpc
		protocol: TCP
		port: 1010
		targetPort: 1010
		- name: http
		protocol: TCP
		port: 8080
		targetPort: 8080
		---

manifests/deviceservice.yaml

+1 −0

Original line number	Diff line number	Diff line
		@@ -49,5 +49,6 @@ spec:
		app: deviceservice
		ports:
		- name: grpc
		protocol: TCP
		port: 2020
		targetPort: 2020

manifests/monitoringservice.yaml

+1 −0

Original line number	Diff line number	Diff line
		@@ -46,5 +46,6 @@ spec:
		app: monitoringservice
		ports:
		- name: grpc
		protocol: TCP
		port: 8080
		targetPort: 8080

manifests/redis.yaml

+16 −0

Original line number	Diff line number	Diff line
		@@ -36,3 +36,19 @@ spec:
		port: 6379
		targetPort: 6379
		---
		apiVersion: v1
		kind: Service
		metadata:
		name: redis-public
		labels:
		app: redis
		spec:
		type: NodePort
		selector:
		app: redis
		ports:
		- name: redis
		protocol: TCP
		port: 6379
		targetPort: 6379
		---