Merge branch 'feat/cttc-interdomain-r21' into 'develop'

Minor fixes

See merge request !131

manifests/contextservice.yaml

@@ -40,7 +40,7 @@ spec:
         - name: MB_BACKEND
           value: "nats"
         - name: LOG_LEVEL
-          value: "DEBUG"
+          value: "INFO"
         envFrom:
         - secretRef:
             name: crdb-data
@@ -54,7 +54,7 @@ spec:
             command: ["/bin/grpc_health_probe", "-addr=:1010"]
         resources:
           requests:
-            cpu: 125m
+            cpu: 250m
             memory: 128Mi
           limits:
             cpu: 1000m
@@ -79,25 +79,25 @@ spec:
     protocol: TCP
     port: 9192
     targetPort: 9192
-#---
-#apiVersion: autoscaling/v2
-#kind: HorizontalPodAutoscaler
-#metadata:
-#  name: contextservice-hpa
-#spec:
-#  scaleTargetRef:
-#    apiVersion: apps/v1
-#    kind: Deployment
-#    name: contextservice
-#  minReplicas: 1
-#  maxReplicas: 20
-#  metrics:
-#  - type: Resource
-#    resource:
-#      name: cpu
-#      target:
-#        type: Utilization
-#        averageUtilization: 80
-#  #behavior:
-#  #  scaleDown:
-#  #    stabilizationWindowSeconds: 30
+---
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: contextservice-hpa
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: contextservice
+  minReplicas: 1
+  maxReplicas: 20
+  metrics:
+  - type: Resource
+    resource:
+      name: cpu
+      target:
+        type: Utilization
+        averageUtilization: 80
+  #behavior:
+  #  scaleDown:
+  #    stabilizationWindowSeconds: 30

manifests/deviceservice.yaml

@@ -39,7 +39,7 @@ spec:
         - containerPort: 9192
         env:
         - name: LOG_LEVEL
-          value: "DEBUG"
+          value: "INFO"
         readinessProbe:
           exec:
             command: ["/bin/grpc_health_probe", "-addr=:2020"]
@@ -48,7 +48,7 @@ spec:
             command: ["/bin/grpc_health_probe", "-addr=:2020"]
         resources:
           requests:
-            cpu: 125m
+            cpu: 250m
             memory: 128Mi
           limits:
             cpu: 1000m

manifests/interdomainservice.yaml

@@ -35,7 +35,7 @@ spec:
         - containerPort: 9192
         env:
         - name: LOG_LEVEL
-          value: "DEBUG"
+          value: "INFO"
         - name: TOPOLOGY_ABSTRACTOR
           value: "DISABLE"
         readinessProbe:
@@ -46,7 +46,7 @@ spec:
             command: ["/bin/grpc_health_probe", "-addr=:10010"]
         resources:
           requests:
-            cpu: 125m
+            cpu: 250m
             memory: 64Mi
           limits:
             cpu: 1000m

manifests/pathcompservice.yaml

@@ -45,7 +45,7 @@ spec:
             command: ["/bin/grpc_health_probe", "-addr=:10020"]
         resources:
           requests:
-            cpu: 125m
+            cpu: 250m
             memory: 128Mi
           limits:
             cpu: 1000m
@@ -98,25 +98,25 @@ spec:
     protocol: TCP
     port: 9192
     targetPort: 9192
-#---
-#apiVersion: autoscaling/v2
-#kind: HorizontalPodAutoscaler
-#metadata:
-#  name: pathcompservice-hpa
-#spec:
-#  scaleTargetRef:
-#    apiVersion: apps/v1
-#    kind: Deployment
-#    name: pathcompservice
-#  minReplicas: 1
-#  maxReplicas: 20
-#  metrics:
-#  - type: Resource
-#    resource:
-#      name: cpu
-#      target:
-#        type: Utilization
-#        averageUtilization: 80
-#  #behavior:
-#  #  scaleDown:
-#  #    stabilizationWindowSeconds: 30
+---
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: pathcompservice-hpa
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: pathcompservice
+  minReplicas: 1
+  maxReplicas: 20
+  metrics:
+  - type: Resource
+    resource:
+      name: cpu
+      target:
+        type: Utilization
+        averageUtilization: 80
+  #behavior:
+  #  scaleDown:
+  #    stabilizationWindowSeconds: 30

manifests/serviceservice.yaml

@@ -36,7 +36,7 @@ spec:
         - containerPort: 9192
         env:
         - name: LOG_LEVEL
-          value: "DEBUG"
+          value: "INFO"
         readinessProbe:
           exec:
             command: ["/bin/grpc_health_probe", "-addr=:3030"]
@@ -45,7 +45,7 @@ spec:
             command: ["/bin/grpc_health_probe", "-addr=:3030"]
         resources:
           requests:
-            cpu: 125m
+            cpu: 250m
             memory: 128Mi
           limits:
             cpu: 1000m
@@ -70,25 +70,25 @@ spec:
     protocol: TCP
     port: 9192
     targetPort: 9192
-#---
-#apiVersion: autoscaling/v2
-#kind: HorizontalPodAutoscaler
-#metadata:
-#  name: serviceservice-hpa
-#spec:
-#  scaleTargetRef:
-#    apiVersion: apps/v1
-#    kind: Deployment
-#    name: serviceservice
-#  minReplicas: 1
-#  maxReplicas: 20
-#  metrics:
-#  - type: Resource
-#    resource:
-#      name: cpu
-#      target:
-#        type: Utilization
-#        averageUtilization: 80
-#  #behavior:
-#  #  scaleDown:
-#  #    stabilizationWindowSeconds: 30
+---
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: serviceservice-hpa
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: serviceservice
+  minReplicas: 1
+  maxReplicas: 20
+  metrics:
+  - type: Resource
+    resource:
+      name: cpu
+      target:
+        type: Utilization
+        averageUtilization: 80
+  #behavior:
+  #  scaleDown:
+  #    stabilizationWindowSeconds: 30

manifests/sliceservice.yaml

@@ -36,7 +36,7 @@ spec:
         - containerPort: 9192
         env:
         - name: LOG_LEVEL
-          value: "DEBUG"
+          value: "INFO"
         - name: SLICE_GROUPING
           value: "DISABLE"
         envFrom:
@@ -50,7 +50,7 @@ spec:
             command: ["/bin/grpc_health_probe", "-addr=:4040"]
         resources:
           requests:
-            cpu: 125m
+            cpu: 250m
             memory: 128Mi
           limits:
             cpu: 1000m
@@ -75,25 +75,25 @@ spec:
     protocol: TCP
     port: 9192
     targetPort: 9192
-#---
-#apiVersion: autoscaling/v2
-#kind: HorizontalPodAutoscaler
-#metadata:
-#  name: sliceservice-hpa
-#spec:
-#  scaleTargetRef:
-#    apiVersion: apps/v1
-#    kind: Deployment
-#    name: sliceservice
-#  minReplicas: 1
-#  maxReplicas: 20
-#  metrics:
-#  - type: Resource
-#    resource:
-#      name: cpu
-#      target:
-#        type: Utilization
-#        averageUtilization: 80
-#  #behavior:
-#  #  scaleDown:
-#  #    stabilizationWindowSeconds: 30
+---
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: sliceservice-hpa
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: sliceservice
+  minReplicas: 1
+  maxReplicas: 20
+  metrics:
+  - type: Resource
+    resource:
+      name: cpu
+      target:
+        type: Utilization
+        averageUtilization: 80
+  #behavior:
+  #  scaleDown:
+  #    stabilizationWindowSeconds: 30

manifests/webuiservice.yaml

@@ -39,7 +39,7 @@ spec:
         - containerPort: 8004
         env:
         - name: LOG_LEVEL
-          value: "DEBUG"
+          value: "INFO"
         - name: WEBUISERVICE_SERVICE_BASEURL_HTTP
           value: "/webui/"
         readinessProbe:
@@ -56,7 +56,7 @@ spec:
           timeoutSeconds: 1
         resources:
           requests:
-            cpu: 125m
+            cpu: 50m
             memory: 128Mi
           limits:
             cpu: 1000m

src/tests/oeccpsc22/expose_interdomain_dom2.sh

 #!/bin/bash
+# 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.
 
 PATCH='{"data": {"10010": "tfs-dom2/interdomainservice:10010"}}'
 kubectl patch configmap nginx-ingress-tcp-microk8s-conf-dom2 --namespace ingress --patch "${PATCH}"