From 8722be5d3e128e1049fbd7f27430d3c40f01ec98 Mon Sep 17 00:00:00 2001
From: "Vadzim Beuzo [EPAM / GCP]" <vadzim_beuzo@epam.com>
Date: Tue, 3 Sep 2024 16:21:16 +0000
Subject: [PATCH] GONRG-10103: add global log level to services
---
devops/gc/deploy/README.md | 19 ++++++++++---------
devops/gc/deploy/templates/configmap.yaml | 2 +-
devops/gc/deploy/values.yaml | 3 ++-
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/devops/gc/deploy/README.md b/devops/gc/deploy/README.md
index b07995183..91b1d6f7a 100644
--- a/devops/gc/deploy/README.md
+++ b/devops/gc/deploy/README.md
@@ -31,14 +31,15 @@ First you need to set variables in **values.yaml** file using any code editor. S
| Name | Description | Type | Default |Required |
|------|-------------|------|---------|---------|
**global.domain** | your domain for the external endpoint, ex `example.com` | string | - | yes
-**global.onPremEnabled** | whether on-prem is enabled | boolean | false | yes
-**global.limitsEnabled** | whether CPU and memory limits are enabled | boolean | true | yes
+**global.onPremEnabled** | whether on-prem is enabled | boolean | `false` | yes
+**global.limitsEnabled** | whether CPU and memory limits are enabled | boolean | `true` | yes
+**global.logLevel** | severity of logging level | string | `ERROR` | yes
### Configmap variables
| Name | Description | Type | Default |Required |
|------|-------------|------|---------|---------|
-**data.logLevel** | logging level | string | `ERROR` | yes
+**data.logLevel** | logging severity level for this service only | string | - | yes, only if differs from the `global.logLevel`
**data.defaultDataCountry** | Data storage region | string | `US` | yes
**data.storageServiceAccountEmail** | Storage service account email, used during OQM events processing | string | `storage@service.local` | yes
**data.entitlementsHost** | Entitlements service host address | string | `http://entitlements` | yes
@@ -47,7 +48,7 @@ First you need to set variables in **values.yaml** file using any code editor. S
**data.legalHost** | Legal service host address | string | `http://legal` | yes
**data.opaEndpoint** | OPA host address | string | `http://opa` | yes
**data.redisStorageHost** | The host for redis instance. If empty (by default), helm installs an internal redis instance | string | - | yes
-**data.redisStoragePort** | The port for redis instance | digit | 6379 | yes
+**data.redisStoragePort** | The port for redis instance | digit | `6379` | yes
### Deployment variables
@@ -72,16 +73,16 @@ First you need to set variables in **values.yaml** file using any code editor. S
**conf.postgresSecretName** | secret for postgres | string | `storage-postgres-secret` | yes
**conf.rabbitmqSecretName** | secret for rabbitmq | string | `rabbitmq-secret` | yes
**conf.storageRedisSecretName** | secret for redis that contains redis password with REDIS_PASSWORD key | string | `storage-redis-secret` | yes
-**conf.replicas** | Number of replicas | integer | 3 | yes
+**conf.replicas** | Number of replicas | integer | `3` | yes
### Istio variables
| Name | Description | Type | Default |Required |
|------|-------------|------|---------|---------|
-**istio.proxyCPU** | CPU request for Envoy sidecars | string | 10m | yes
-**istio.proxyCPULimit** | CPU limit for Envoy sidecars | string | 200m | yes
-**istio.proxyMemory** | memory request for Envoy sidecars | string | 100Mi | yes
-**istio.proxyMemoryLimit** | memory limit for Envoy sidecars | string | 256Mi | yes
+**istio.proxyCPU** | CPU request for Envoy sidecars | string | `10m` | yes
+**istio.proxyCPULimit** | CPU limit for Envoy sidecars | string | `200m` | yes
+**istio.proxyMemory** | memory request for Envoy sidecars | string | `100Mi` | yes
+**istio.proxyMemoryLimit** | memory limit for Envoy sidecars | string | `256Mi` | yes
## Install the Helm chart
diff --git a/devops/gc/deploy/templates/configmap.yaml b/devops/gc/deploy/templates/configmap.yaml
index 49d2d3a26..0806ef9b6 100644
--- a/devops/gc/deploy/templates/configmap.yaml
+++ b/devops/gc/deploy/templates/configmap.yaml
@@ -10,7 +10,7 @@ data:
DEFAULT_DATA_COUNTRY: {{ .Values.data.defaultDataCountry | quote }}
ENTITLEMENTS_HOST: {{ .Values.data.entitlementsHost | quote }}
LEGAL_HOST: {{ .Values.data.legalHost | quote }}
- LOG_LEVEL: {{ .Values.data.logLevel | quote }}
+ LOG_LEVEL: {{ .Values.data.logLevel | default .Values.global.logLevel | quote }}
PARTITION_HOST: {{ .Values.data.partitionHost | quote }}
STORAGE_SERVICE_ACCOUNT_EMAIL: {{ .Values.data.storageServiceAccountEmail | quote }}
{{- if .Values.global.onPremEnabled }}
diff --git a/devops/gc/deploy/values.yaml b/devops/gc/deploy/values.yaml
index 13d6ce97a..c506d6f8c 100644
--- a/devops/gc/deploy/values.yaml
+++ b/devops/gc/deploy/values.yaml
@@ -6,10 +6,11 @@ global:
domain: ""
onPremEnabled: false
limitsEnabled: true
+ logLevel: "ERROR"
data:
# configmaps
- logLevel: "ERROR"
+ logLevel: ""
defaultDataCountry: "US"
storageServiceAccountEmail: "storage@service.local"
entitlementsHost: "http://entitlements"
--
GitLab