diff --git a/devops/gc/deploy/README.md b/devops/gc/deploy/README.md index 6a055d4dde8ea40dd9840f6d7c558c437f0f8b23..32f73ddfec24bdd64f0a3e4d0567dd892e7c6816 100644 --- a/devops/gc/deploy/README.md +++ b/devops/gc/deploy/README.md @@ -31,14 +31,15 @@ You need to set variables in **values.yaml** file using any code editor. Some of | 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 +| Name | Description | Type | Default |Required | +|------|-------------|------|---------|---------| +**data.logLevel** | logging severity level for this service only | string | - | yes, only if differs from the `global.logLevel` **data.entitlementsHost** | Entitlements service host | string | `http://entitlements` | yes **data.indexerHost** | Indexer service host | string | `http://indexer` | yes **data.policyHost** | Policy service host | string | `http://policy` | yes @@ -46,7 +47,7 @@ You need to set variables in **values.yaml** file using any code editor. Some of **data.policyId** | policy id from ex `${POLICY_HOST}/api/policy/v1/policies` | string | `search` | yes **data.securityHttpsCertificateTrust** | Elastic client connection uses TrustSelfSignedStrategy(), if it is `true` | bool | `true` | yes **data.redisSearchHost** | The host for redis instance. If empty (by default), helm installs an internal redis instance | string | - | yes -**data.redisSearchPort** | The port for redis instance | digit | 6379 | yes +**data.redisSearchPort** | The port for redis instance | digit | `6379` | yes ### Deployment variables @@ -73,10 +74,10 @@ You need to set variables in **values.yaml** file using any code editor. Some of | 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 04ff821e04d1c842b87f179bebf49de5604051e0..f67889254f35c388bfbb60c45e3daed580cc549d 100644 --- a/devops/gc/deploy/templates/configmap.yaml +++ b/devops/gc/deploy/templates/configmap.yaml @@ -11,7 +11,7 @@ data: {{- else }} SPRING_PROFILES_ACTIVE: "gcp" {{- end }} - LOG_LEVEL: {{ .Values.data.logLevel | quote }} + LOG_LEVEL: {{ .Values.data.logLevel | default .Values.global.logLevel | quote }} {{- if .Values.data.redisSearchHost }} REDIS_GROUP_HOST: {{ .Values.data.redisSearchHost | quote }} REDIS_SEARCH_HOST: {{ .Values.data.redisSearchHost | quote }} diff --git a/devops/gc/deploy/values.yaml b/devops/gc/deploy/values.yaml index 6df8f3b39d29c1352a739b9994ade7b84d3817ee..fcac9c73a07bb31cdc157c2e1b39b9fdaf08d32a 100644 --- a/devops/gc/deploy/values.yaml +++ b/devops/gc/deploy/values.yaml @@ -2,10 +2,11 @@ global: domain: "" onPremEnabled: false limitsEnabled: true + logLevel: "ERROR" data: # Configmaps - logLevel: "ERROR" + logLevel: "" entitlementsHost: "http://entitlements" partitionHost: "http://partition" policyHost: "http://policy"