From 2d441fa76371640999ad37b950865c6b3f0eefef Mon Sep 17 00:00:00 2001 From: gifrerenom Date: Mon, 10 Jul 2023 07:23:34 +0000 Subject: [PATCH] Pre-merge code cleanup --- deploy/tfs.sh | 2 +- manifests/contextservice.yaml | 6 +++--- manifests/deviceservice.yaml | 4 ++-- manifests/monitoringservice.yaml | 10 +++++----- manifests/pathcompservice.yaml | 4 ++-- manifests/serviceservice.yaml | 6 +++--- manifests/sliceservice.yaml | 6 +++--- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/deploy/tfs.sh b/deploy/tfs.sh index 5edc0c29b..e6a0c0c10 100755 --- a/deploy/tfs.sh +++ b/deploy/tfs.sh @@ -259,7 +259,7 @@ for COMPONENT in $TFS_COMPONENTS; do echo " Adapting '$COMPONENT' manifest file..." MANIFEST="$TMP_MANIFESTS_FOLDER/${COMPONENT}service.yaml" - #cp ./manifests/"${COMPONENT}"service.yaml "$MANIFEST" + # cp ./manifests/"${COMPONENT}"service.yaml "$MANIFEST" cat ./manifests/"${COMPONENT}"service.yaml | linkerd inject - --proxy-cpu-request "10m" --proxy-cpu-limit "1" --proxy-memory-request "64Mi" --proxy-memory-limit "256Mi" > "$MANIFEST" if [ "$COMPONENT" == "pathcomp" ]; then diff --git a/manifests/contextservice.yaml b/manifests/contextservice.yaml index ab8ccc521..96735bf5f 100644 --- a/manifests/contextservice.yaml +++ b/manifests/contextservice.yaml @@ -54,11 +54,11 @@ spec: command: ["/bin/grpc_health_probe", "-addr=:1010"] resources: requests: - cpu: 150m + cpu: 250m memory: 128Mi limits: - cpu: 500m - memory: 512Mi + cpu: 1000m + memory: 1024Mi --- apiVersion: v1 kind: Service diff --git a/manifests/deviceservice.yaml b/manifests/deviceservice.yaml index 4bf4d6247..a99e3e588 100644 --- a/manifests/deviceservice.yaml +++ b/manifests/deviceservice.yaml @@ -53,8 +53,8 @@ spec: command: ["/bin/grpc_health_probe", "-addr=:2020"] resources: requests: - cpu: 500m - memory: 512Mi + cpu: 250m + memory: 128Mi limits: cpu: 1000m memory: 1024Mi diff --git a/manifests/monitoringservice.yaml b/manifests/monitoringservice.yaml index 06ac823a1..dbcfa68a0 100644 --- a/manifests/monitoringservice.yaml +++ b/manifests/monitoringservice.yaml @@ -36,7 +36,7 @@ spec: - containerPort: 9192 env: - name: LOG_LEVEL - value: "DEBUG" + value: "INFO" envFrom: - secretRef: name: qdb-data @@ -48,11 +48,11 @@ spec: command: ["/bin/grpc_health_probe", "-addr=:7070"] resources: requests: - cpu: 50m - memory: 64Mi + cpu: 250m + memory: 256Mi limits: - cpu: 500m - memory: 512Mi + cpu: 1000m + memory: 1024Mi --- apiVersion: v1 kind: Service diff --git a/manifests/pathcompservice.yaml b/manifests/pathcompservice.yaml index 2fae0c8f2..c85922d96 100644 --- a/manifests/pathcompservice.yaml +++ b/manifests/pathcompservice.yaml @@ -69,10 +69,10 @@ spec: # timeoutSeconds: 5 resources: requests: - cpu: 100m + cpu: 250m memory: 256Mi limits: - cpu: 500m + cpu: 1000m memory: 1024Mi --- apiVersion: v1 diff --git a/manifests/serviceservice.yaml b/manifests/serviceservice.yaml index 6143740e8..7d7bdaa4e 100644 --- a/manifests/serviceservice.yaml +++ b/manifests/serviceservice.yaml @@ -45,11 +45,11 @@ spec: command: ["/bin/grpc_health_probe", "-addr=:3030"] resources: requests: - cpu: 150m + cpu: 250m memory: 128Mi limits: - cpu: 500m - memory: 512Mi + cpu: 1000m + memory: 1024Mi --- apiVersion: v1 kind: Service diff --git a/manifests/sliceservice.yaml b/manifests/sliceservice.yaml index 7f4d022b3..e7e5c1604 100644 --- a/manifests/sliceservice.yaml +++ b/manifests/sliceservice.yaml @@ -50,11 +50,11 @@ spec: command: ["/bin/grpc_health_probe", "-addr=:4040"] resources: requests: - cpu: 150m + cpu: 250m memory: 128Mi limits: - cpu: 500m - memory: 512Mi + cpu: 1000m + memory: 1024Mi --- apiVersion: v1 kind: Service -- GitLab