Update policy/automation application.yml files (e7ef97a0) · Commits · TFS / controller

src/automation/src/main/resources/application.yml

+10 −5

Original line number	Original line	Diff line number	Diff line
	@@ -36,6 +36,7 @@ quarkus:
	group: tfs		group: tfs
	name: controller/automation		name: controller/automation
	registry: labs.etsi.org:5050		registry: labs.etsi.org:5050
			tag: 0.2.0

	kubernetes:		kubernetes:
	name: automationservice		name: automationservice
	@@ -51,12 +52,16 @@ quarkus:
	period: 10s		period: 10s
	ports:		ports:
	http:		http:
	host-port: 8080		host-port: 9192
	container-port: 8080		container-port: 8080
	grpc:
	host-port: 5050
	container-port: 5050
	env:		env:
	vars:		vars:
	context-service-host: "contextservice"		context-service-host: "contextservice"
	device-service-host: "deviceservice"		device-service-host: "deviceservice"
			resources:
			requests:
			cpu: 50m
			memory: 512Mi
			limits:
			cpu: 500m
			memory: 2048Mi

src/automation/target/kubernetes/kubernetes.yml

+29 −48

Original line number	Original line	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: v1		apiVersion: v1
	kind: Service		kind: Service
	metadata:		metadata:
	annotations:		annotations:
	app.quarkus.io/build-timestamp: 2022-09-19 - 10:48:18 +0000		app.quarkus.io/commit-id: 23832f2975e3c8967e9685f7e3a5f5458d04527a
			app.quarkus.io/build-timestamp: 2023-04-04 - 11:47:48 +0000
			prometheus.io/scrape: "true"
			prometheus.io/path: /q/metrics
			prometheus.io/port: "8080"
			prometheus.io/scheme: http
	labels:		labels:
	app.kubernetes.io/name: automationservice		app.kubernetes.io/name: automationservice
	app: automationservice		app: automationservice
	name: automationservice		name: automationservice
	spec:		spec:
	ports:		ports:
	- name: grpc		- name: http
	port: 5050
	targetPort: 5050
	- name: metrics
	protocol: TCP
	port: 9192		port: 9192
	targetPort: 8080		targetPort: 8080
			- name: grpc-server
			port: 5050
			targetPort: 5050
	selector:		selector:
	app.kubernetes.io/name: automationservice		app.kubernetes.io/name: automationservice
	type: ClusterIP		type: ClusterIP
	@@ -39,7 +29,12 @@ apiVersion: apps/v1
	kind: Deployment		kind: Deployment
	metadata:		metadata:
	annotations:		annotations:
	app.quarkus.io/build-timestamp: 2022-09-19 - 10:48:18 +0000		app.quarkus.io/commit-id: 23832f2975e3c8967e9685f7e3a5f5458d04527a
			app.quarkus.io/build-timestamp: 2023-04-04 - 11:47:48 +0000
			prometheus.io/scrape: "true"
			prometheus.io/path: /q/metrics
			prometheus.io/port: "8080"
			prometheus.io/scheme: http
	labels:		labels:
	app: automationservice		app: automationservice
	app.kubernetes.io/name: automationservice		app.kubernetes.io/name: automationservice
	@@ -52,7 +47,12 @@ spec:
	template:		template:
	metadata:		metadata:
	annotations:		annotations:
	app.quarkus.io/build-timestamp: 2022-09-19 - 10:48:18 +0000		app.quarkus.io/commit-id: 23832f2975e3c8967e9685f7e3a5f5458d04527a
			app.quarkus.io/build-timestamp: 2023-04-04 - 11:47:48 +0000
			prometheus.io/scrape: "true"
			prometheus.io/path: /q/metrics
			prometheus.io/port: "8080"
			prometheus.io/scheme: http
	labels:		labels:
	app: automationservice		app: automationservice
	app.kubernetes.io/name: automationservice		app.kubernetes.io/name: automationservice
	@@ -81,11 +81,11 @@ spec:
	timeoutSeconds: 10		timeoutSeconds: 10
	name: automationservice		name: automationservice
	ports:		ports:
	- containerPort: 5050
	name: grpc
	protocol: TCP
	- containerPort: 8080		- containerPort: 8080
	name: metrics		name: http
			protocol: TCP
			- containerPort: 5050
			name: grpc-server
	protocol: TCP		protocol: TCP
	readinessProbe:		readinessProbe:
	failureThreshold: 3		failureThreshold: 3
	@@ -98,28 +98,9 @@ spec:
	successThreshold: 1		successThreshold: 1
	timeoutSeconds: 10		timeoutSeconds: 10
	resources:		resources:
	requests:
	cpu: 50m
	memory: 512Mi
	limits:		limits:
	cpu: 500m		cpu: 500m
	memory: 2048Mi		memory: 2048Mi
	---		requests:
	apiVersion: autoscaling/v2		cpu: 50m
	kind: HorizontalPodAutoscaler		memory: 512Mi
	metadata:
	name: automationservice-hpa
	spec:
	scaleTargetRef:
	apiVersion: apps/v1
	kind: Deployment
	name: automationservice
	minReplicas: 1
	maxReplicas: 10
	metrics:
	- type: Resource
	resource:
	name: cpu
	target:
	type: Utilization
	averageUtilization: 80

src/policy/src/main/resources/application.yml

+9 −4

Original line number	Original line	Diff line number	Diff line
	@@ -37,6 +37,7 @@ quarkus:
	group: tfs		group: tfs
	name: controller/policy		name: controller/policy
	registry: labs.etsi.org:5050		registry: labs.etsi.org:5050
			tag: 0.1.0

	kubernetes:		kubernetes:
	name: policyservice		name: policyservice
	@@ -52,14 +53,18 @@ quarkus:
	period: 10s		period: 10s
	ports:		ports:
	http:		http:
	host-port: 8080		host-port: 9192
	container-port: 8080		container-port: 8080
	grpc:
	host-port: 6060
	container-port: 6060
	env:		env:
	vars:		vars:
	context-service-host: "contextservice"		context-service-host: "contextservice"
	monitoring-service-host: "monitoringservice"		monitoring-service-host: "monitoringservice"
	service-service-host: "serviceservice"		service-service-host: "serviceservice"
			resources:
			requests:
			cpu: 50m
			memory: 512Mi
			limits:
			cpu: 500m
			memory: 2048Mi

src/policy/target/kubernetes/kubernetes.yml

+28 −49

Original line number	Original line	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: v1		apiVersion: v1
	kind: Service		kind: Service
	metadata:		metadata:
	annotations:		annotations:
	app.quarkus.io/commit-id: 8065cee75be759e14af792737179537096de5e11		app.quarkus.io/commit-id: 23832f2975e3c8967e9685f7e3a5f5458d04527a
	app.quarkus.io/build-timestamp: 2023-03-30 - 13:49:59 +0000		app.quarkus.io/build-timestamp: 2023-04-04 - 11:56:04 +0000
			prometheus.io/scrape: "true"
			prometheus.io/path: /q/metrics
			prometheus.io/port: "8080"
			prometheus.io/scheme: http
	labels:		labels:
	app.kubernetes.io/name: policyservice		app.kubernetes.io/name: policyservice
	app: policyservice		app: policyservice
	name: policyservice		name: policyservice
	spec:		spec:
	ports:		ports:
	- name: metrics		- name: http
	port: 9192		port: 9192
	targetPort: 8080		targetPort: 8080
	- name: grpc		- name: grpc-server
	port: 6060		port: 6060
	targetPort: 6060		targetPort: 6060
	selector:		selector:
	@@ -39,8 +29,12 @@ apiVersion: apps/v1
	kind: Deployment		kind: Deployment
	metadata:		metadata:
	annotations:		annotations:
	app.quarkus.io/commit-id: 8065cee75be759e14af792737179537096de5e11		app.quarkus.io/commit-id: 23832f2975e3c8967e9685f7e3a5f5458d04527a
	app.quarkus.io/build-timestamp: 2023-03-30 - 13:49:59 +0000		app.quarkus.io/build-timestamp: 2023-04-04 - 11:56:04 +0000
			prometheus.io/scrape: "true"
			prometheus.io/path: /q/metrics
			prometheus.io/port: "8080"
			prometheus.io/scheme: http
	labels:		labels:
	app: policyservice		app: policyservice
	app.kubernetes.io/name: policyservice		app.kubernetes.io/name: policyservice
	@@ -53,8 +47,12 @@ spec:
	template:		template:
	metadata:		metadata:
	annotations:		annotations:
	app.quarkus.io/commit-id: 8065cee75be759e14af792737179537096de5e11		app.quarkus.io/commit-id: 23832f2975e3c8967e9685f7e3a5f5458d04527a
	app.quarkus.io/build-timestamp: 2023-03-30 - 13:49:59 +0000		app.quarkus.io/build-timestamp: 2023-04-04 - 11:56:04 +0000
			prometheus.io/scrape: "true"
			prometheus.io/path: /q/metrics
			prometheus.io/port: "8080"
			prometheus.io/scheme: http
	labels:		labels:
	app: policyservice		app: policyservice
	app.kubernetes.io/name: policyservice		app.kubernetes.io/name: policyservice
	@@ -65,12 +63,12 @@ spec:
	valueFrom:		valueFrom:
	fieldRef:		fieldRef:
	fieldPath: metadata.namespace		fieldPath: metadata.namespace
	- name: SERVICE_SERVICE_HOST
	value: serviceservice
	- name: CONTEXT_SERVICE_HOST
	value: contextservice
	- name: MONITORING_SERVICE_HOST		- name: MONITORING_SERVICE_HOST
	value: monitoringservice		value: monitoringservice
			- name: CONTEXT_SERVICE_HOST
			value: contextservice
			- name: SERVICE_SERVICE_HOST
			value: serviceservice
	image: labs.etsi.org:5050/tfs/controller/policy:0.1.0		image: labs.etsi.org:5050/tfs/controller/policy:0.1.0
	imagePullPolicy: Always		imagePullPolicy: Always
	livenessProbe:		livenessProbe:
	@@ -86,7 +84,7 @@ spec:
	name: policyservice		name: policyservice
	ports:		ports:
	- containerPort: 8080		- containerPort: 8080
	name: metrics		name: http
	protocol: TCP		protocol: TCP
	- containerPort: 6060		- containerPort: 6060
	name: grpc-server		name: grpc-server
	@@ -102,28 +100,9 @@ spec:
	successThreshold: 1		successThreshold: 1
	timeoutSeconds: 10		timeoutSeconds: 10
	resources:		resources:
	requests:
	cpu: 50m
	memory: 512Mi
	limits:		limits:
	cpu: 500m		cpu: 500m
	memory: 2048Mi		memory: 2048Mi
	---		requests:
	apiVersion: autoscaling/v2		cpu: 50m
	kind: HorizontalPodAutoscaler		memory: 512Mi
	metadata:
	name: policyservice-hpa
	spec:
	scaleTargetRef:
	apiVersion: apps/v1
	kind: Deployment
	name: policyservice
	minReplicas: 1
	maxReplicas: 10
	metrics:
	- type: Resource
	resource:
	name: cpu
	target:
	type: Utilization
	averageUtilization: 80
	No newline at end of file