From 7cf43130fbb64173365ea7ac9c7e86ad5f6a85fa Mon Sep 17 00:00:00 2001 From: gifrerenom Date: Fri, 7 Jul 2023 17:01:31 +0000 Subject: [PATCH 1/2] Pre-merge code cleanup --- manifests/contextservice.yaml | 48 +++++++++++++++---------------- manifests/deviceservice.yaml | 4 +-- manifests/interdomainservice.yaml | 4 +-- manifests/pathcompservice.yaml | 46 ++++++++++++++--------------- manifests/serviceservice.yaml | 48 +++++++++++++++---------------- manifests/sliceservice.yaml | 48 +++++++++++++++---------------- manifests/webuiservice.yaml | 4 +-- 7 files changed, 101 insertions(+), 101 deletions(-) diff --git a/manifests/contextservice.yaml b/manifests/contextservice.yaml index db592cffa..96735bf5f 100644 --- a/manifests/contextservice.yaml +++ b/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 diff --git a/manifests/deviceservice.yaml b/manifests/deviceservice.yaml index 530275acb..22c0f5f9d 100644 --- a/manifests/deviceservice.yaml +++ b/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 diff --git a/manifests/interdomainservice.yaml b/manifests/interdomainservice.yaml index d28887e10..a23583402 100644 --- a/manifests/interdomainservice.yaml +++ b/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 diff --git a/manifests/pathcompservice.yaml b/manifests/pathcompservice.yaml index a1ff81fba..15dd31197 100644 --- a/manifests/pathcompservice.yaml +++ b/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 diff --git a/manifests/serviceservice.yaml b/manifests/serviceservice.yaml index 26cce6a77..7d7bdaa4e 100644 --- a/manifests/serviceservice.yaml +++ b/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 diff --git a/manifests/sliceservice.yaml b/manifests/sliceservice.yaml index 8abce1e1e..e7e5c1604 100644 --- a/manifests/sliceservice.yaml +++ b/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 diff --git a/manifests/webuiservice.yaml b/manifests/webuiservice.yaml index a061f8e13..ba408bb40 100644 --- a/manifests/webuiservice.yaml +++ b/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 -- GitLab From 312edf3a2b5cbeb9bd0c9fdca3b2deb73723e06e Mon Sep 17 00:00:00 2001 From: gifrerenom Date: Fri, 7 Jul 2023 17:21:56 +0000 Subject: [PATCH 2/2] Pre-merge code cleanup --- src/tests/oeccpsc22/expose_interdomain_dom2.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/tests/oeccpsc22/expose_interdomain_dom2.sh b/src/tests/oeccpsc22/expose_interdomain_dom2.sh index 7bdddae0b..c4ab728fe 100755 --- a/src/tests/oeccpsc22/expose_interdomain_dom2.sh +++ b/src/tests/oeccpsc22/expose_interdomain_dom2.sh @@ -1,4 +1,17 @@ #!/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}" -- GitLab