From 169e17680f6649e22d78fdf33e95f0cdc5fde1bb Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Thu, 9 Nov 2023 17:07:35 +0000
Subject: [PATCH] Policy component:
- Remove unneeded log message
- Updated Kubernetes.yml file
---
.../eu/teraflow/policy/PolicyServiceImpl.java | 4 ++--
src/policy/target/kubernetes/kubernetes.yml | 24 ++++++++++++++-----
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/src/policy/src/main/java/eu/teraflow/policy/PolicyServiceImpl.java b/src/policy/src/main/java/eu/teraflow/policy/PolicyServiceImpl.java
index fb56f9de2..3caadf92e 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/PolicyServiceImpl.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/PolicyServiceImpl.java
@@ -216,8 +216,8 @@ public class PolicyServiceImpl implements PolicyService {
LOGGER.infof(alarmDescriptor.toString());
alarmIds.add(monitoringService.setKpiAlarm(alarmDescriptor));
}
- LOGGER.infof("THIS IS A TEST!");
- LOGGER.infof("%s", alarmIds);
+ //LOGGER.infof("THIS IS A TEST!");
+ //LOGGER.infof("%s", alarmIds);
// Transform the alarmIds into promised alarms returned from the
// getAlarmResponseStream
List<Multi<AlarmResponse>> alarmResponseStreamList = new ArrayList<>();
diff --git a/src/policy/target/kubernetes/kubernetes.yml b/src/policy/target/kubernetes/kubernetes.yml
index aa42e6021..5a576268f 100644
--- a/src/policy/target/kubernetes/kubernetes.yml
+++ b/src/policy/target/kubernetes/kubernetes.yml
@@ -24,7 +24,7 @@ metadata:
prometheus.io/scheme: http
labels:
app.kubernetes.io/name: policyservice
- app.kubernetes.io/version: 0.1.0
+ app: policyservice
name: policyservice
spec:
ports:
@@ -49,15 +49,14 @@ metadata:
prometheus.io/port: "8080"
prometheus.io/scheme: http
labels:
+ app: policyservice
app.kubernetes.io/name: policyservice
- app.kubernetes.io/version: 0.1.0
name: policyservice
spec:
replicas: 1
selector:
matchLabels:
app.kubernetes.io/name: policyservice
- app.kubernetes.io/version: 0.1.0
template:
metadata:
annotations:
@@ -68,8 +67,8 @@ spec:
prometheus.io/port: "8080"
prometheus.io/scheme: http
labels:
+ app: policyservice
app.kubernetes.io/name: policyservice
- app.kubernetes.io/version: 0.1.0
spec:
containers:
- env:
@@ -77,6 +76,12 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
+ - name: CONTEXT_SERVICE_HOST
+ value: contextservice
+ - name: SERVICE_SERVICE_HOST
+ value: serviceservice
+ - name: MONITORING_SERVICE_HOST
+ value: monitoringservice
image: labs.etsi.org:5050/tfs/controller/policy:0.1.0
imagePullPolicy: Always
livenessProbe:
@@ -103,7 +108,14 @@ spec:
path: /q/health/ready
port: 8080
scheme: HTTP
- initialDelaySeconds: 0
- periodSeconds: 30
+ initialDelaySeconds: 2
+ periodSeconds: 10
successThreshold: 1
timeoutSeconds: 10
+ resources:
+ limits:
+ cpu: 500m
+ memory: 2048Mi
+ requests:
+ cpu: 50m
+ memory: 512Mi
--
GitLab