From 27a1d09c1be68d83e4824ecf80a93bf141d534f4 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Thu, 9 Nov 2023 17:02:36 +0000
Subject: [PATCH] Policy component:
- Remove unneeded jacoco.exec file
- Updated Kubernetes.yml file
---
src/policy/jacoco.exec | Bin 43756 -> 0 bytes
src/policy/target/kubernetes/kubernetes.yml | 44 +++++++++++++-------
2 files changed, 28 insertions(+), 16 deletions(-)
delete mode 100644 src/policy/jacoco.exec
diff --git a/src/policy/jacoco.exec b/src/policy/jacoco.exec
deleted file mode 100644
index 1aaf10e44c52d67a9ddaf8de0aa78da148adc51f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 43756
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
diff --git a/src/policy/target/kubernetes/kubernetes.yml b/src/policy/target/kubernetes/kubernetes.yml
index 18c90107f..aa42e6021 100644
--- a/src/policy/target/kubernetes/kubernetes.yml
+++ b/src/policy/target/kubernetes/kubernetes.yml
@@ -1,3 +1,16 @@
+# 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
kind: Service
@@ -10,20 +23,19 @@ metadata:
prometheus.io/port: "8080"
prometheus.io/scheme: http
labels:
- app.kubernetes.io/name: policy
+ app.kubernetes.io/name: policyservice
app.kubernetes.io/version: 0.1.0
- name: policy
+ name: policyservice
spec:
ports:
- name: http
- port: 80
+ port: 9192
targetPort: 8080
- name: grpc-server
- port: 9000
- targetPort: 9000
+ port: 6060
+ targetPort: 6060
selector:
- app.kubernetes.io/name: policy
- app.kubernetes.io/version: 0.1.0
+ app.kubernetes.io/name: policyservice
type: ClusterIP
---
apiVersion: apps/v1
@@ -37,14 +49,14 @@ metadata:
prometheus.io/port: "8080"
prometheus.io/scheme: http
labels:
- app.kubernetes.io/name: policy
+ app.kubernetes.io/name: policyservice
app.kubernetes.io/version: 0.1.0
- name: policy
+ name: policyservice
spec:
replicas: 1
selector:
matchLabels:
- app.kubernetes.io/name: policy
+ app.kubernetes.io/name: policyservice
app.kubernetes.io/version: 0.1.0
template:
metadata:
@@ -56,7 +68,7 @@ spec:
prometheus.io/port: "8080"
prometheus.io/scheme: http
labels:
- app.kubernetes.io/name: policy
+ app.kubernetes.io/name: policyservice
app.kubernetes.io/version: 0.1.0
spec:
containers:
@@ -65,7 +77,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: nuc8/policy:0.1.0
+ image: labs.etsi.org:5050/tfs/controller/policy:0.1.0
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
@@ -73,16 +85,16 @@ spec:
path: /q/health/live
port: 8080
scheme: HTTP
- initialDelaySeconds: 0
- periodSeconds: 30
+ initialDelaySeconds: 2
+ periodSeconds: 10
successThreshold: 1
timeoutSeconds: 10
- name: policy
+ name: policyservice
ports:
- containerPort: 8080
name: http
protocol: TCP
- - containerPort: 9000
+ - containerPort: 6060
name: grpc-server
protocol: TCP
readinessProbe:
--
GitLab