diff --git a/devops/gc/deploy/README.md b/devops/gc/deploy/README.md index 1f6bb5f98654c122c601114068cc04cf6ff16385..0c2cba82883add975f236846f55233d091982ade 100644 --- a/devops/gc/deploy/README.md +++ b/devops/gc/deploy/README.md @@ -32,46 +32,47 @@ 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 baremetal is enabled | boolean | false | yes -**global.limitsEnabled** | whether CPU and memory limits are enabled | boolean | true | yes +**global.onPremEnabled** | whether baremetal is enabled | boolean | `false` | yes +**global.limitsEnabled** | whether CPU and memory limits are enabled | boolean | `true` | yes **global.dataPartitionId** | data partition id | string | - | yes +**global.logLevel** | severity of logging level | string | `ERROR` | yes ### Common variables | Name | Description | Type | Default |Required | -|------|-------------|------|---------|---------| -**data.logLevel** | logging level | string | INFO | yes +|------|-------------|------|---------|----------| +**data.logLevel** | logging severity level for this service only | string | - | yes, only if differs from the `global.logLevel` **data.image** | policy image name | string | - | yes -**data.requestsCpu** | amount of requests CPU | string | 10m | yes -**data.requestsMemory** | amount of requests memory| string | 200Mi | yes -**data.limitsCpu** | CPU limit | string | 1 | only if `global.limitsEnabled` is true -**data.limitsMemory** | memory limit | string | 1G | only if `global.limitsEnabled` is true +**data.requestsCpu** | amount of requests CPU | string | `10m` | yes +**data.requestsMemory** | amount of requests memory| string | `200Mi` | yes +**data.limitsCpu** | CPU limit | string | `1` | only if `global.limitsEnabled` is true +**data.limitsMemory** | memory limit | string | `1G` | only if `global.limitsEnabled` is true **data.serviceAccountName** | name of your service account | string | - | yes -**data.imagePullPolicy** | when to pull image | string | IfNotPresent | yes +**data.imagePullPolicy** | when to pull image | string | `IfNotPresent` | yes **data.bucketName** | bucket name | string | - | yes -**data.scopes** | scope of OPA | string | "<https://www.googleapis.com/auth/devstorage.read_only>" | yes -**data.entitlementsHost** | Entitlements host | string | "<http://entitlements>" | yes -**data.entitlementsBasePath** | Entitlements path | string | "/api/entitlements/v2/groups" | yes -**data.useBundles** | use bundle or not | string | "yes" | yes -**data.legalHost** | Legal host | string | "<http://legal>" | yes -**data.partitionHost** | Partition host | string | "<http://partition>" | yes +**data.scopes** | scope of OPA | string | `https://www.googleapis.com/auth/devstorage.read_only` | yes +**data.entitlementsHost** | Entitlements host | string | `http://entitlements` | yes +**data.entitlementsBasePath** | Entitlements path | string | `/api/entitlements/v2/groups` | yes +**data.useBundles** | use bundle or not | string | `yes` | yes +**data.legalHost** | Legal host | string | `http://legal` | yes +**data.partitionHost** | Partition host | string | `http://partition` | yes ### Baremetal variables | Name | Description | Type | Default |Required | |------|-------------|------|---------|---------| -**data.minioHost** | minio host | string | <http://minio:9000> | yes -**conf.minioSecretName** | secret name for the app | string | "policy-minio-secret" | yes +**data.minioHost** | minio host | string | `http://minio:9000` | yes +**conf.minioSecretName** | secret name for the app | string | `policy-minio-secret` | yes ### Config variables | Name | Description | Type | Default |Required | |------|-------------|------|---------|---------| -**conf.appName** | name of the app | string | policy | yes -**conf.configmap** | configmap to be used | string | policy-config | yes -**conf.bootstrapSecretName** | secret name for the bootstrap | string | "minio-bootstrap-secret" | yes -**conf.minDelaySeconds** | min delay for bundle download | num | 6 | yes -**conf.maxDelaySeconds** | max delay for bundle download | num | 12 | yes +**conf.appName** | name of the app | string | `policy` | yes +**conf.configmap** | configmap to be used | string | `policy-config` | yes +**conf.bootstrapSecretName** | secret name for the bootstrap | string | `minio-bootstrap-secret` | yes +**conf.minDelaySeconds** | min delay for bundle download | num | `6` | yes +**conf.maxDelaySeconds** | max delay for bundle download | num | `12` | yes ### Bootstrap variables @@ -84,22 +85,22 @@ First you need to set variables in **values.yaml** file using any code editor. S | Name | Description | Type | Default |Required | |------|-------------|------|---------|---------| -**opa.conf.configmap** | configmap to be used | string | opa-config | yes -**opa.conf.envConfig** | configmap with env vars | string | opa-env-config | yes -**opa.conf.appName** | name of the app | string | opa | yes -**opa.data.serviceAccountName** | name of your service account | string | opa-k8s | yes +**opa.conf.configmap** | configmap to be used | string | `opa-config` | yes +**opa.conf.envConfig** | configmap with env vars | string | `opa-env-config` | yes +**opa.conf.appName** | name of the app | string | `opa` | yes +**opa.data.serviceAccountName** | name of your service account | string | `opa-k8s` | yes **opa.data.image** | image name | string | - | 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 | 500m | yes -**istio.proxyMemory** | memory request for Envoy sidecars | string | 100Mi | yes -**istio.proxyMemoryLimit** | memory limit for Envoy sidecars | string | 512Mi | yes -**istio.bootstrapProxyCPU** | CPU request for Envoy sidecars | string | 10m | yes -**istio.bootstrapProxyCPULimit** | CPU limit for Envoy sidecars | string | 100m | yes +**istio.proxyCPU** | CPU request for Envoy sidecars | string | `10m` | yes +**istio.proxyCPULimit** | CPU limit for Envoy sidecars | string | `500m` | yes +**istio.proxyMemory** | memory request for Envoy sidecars | string | `100Mi` | yes +**istio.proxyMemoryLimit** | memory limit for Envoy sidecars | string | `512Mi` | yes +**istio.bootstrapProxyCPU** | CPU request for Envoy sidecars | string | `10m` | yes +**istio.bootstrapProxyCPULimit** | CPU limit for Envoy sidecars | string | `100m` | yes ### Install the helm chart diff --git a/devops/gc/deploy/templates/policy-configmap.yaml b/devops/gc/deploy/templates/policy-configmap.yaml index 8e1d26f26bba60d63693abf6bf6d6c4f790221d8..f31def449ecbf8867341d8ae34bbc78594dc4652 100644 --- a/devops/gc/deploy/templates/policy-configmap.yaml +++ b/devops/gc/deploy/templates/policy-configmap.yaml @@ -6,7 +6,7 @@ metadata: name: "{{ .Values.conf.configmap }}" namespace: "{{ .Release.Namespace }}" data: - LOG_LEVEL: "{{ .Values.data.logLevel }}" + LOG_LEVEL: {{ .Values.data.logLevel | default .Values.global.logLevel | quote }} OPA_URL: {{ printf "http://%s" .Values.opa.conf.appName | quote }} ENTITLEMENTS_BASE_URL: "{{ .Values.data.entitlementsHost }}" ENTITLEMENTS_BASE_PATH: "{{ .Values.data.entitlementsBasePath }}" diff --git a/devops/gc/deploy/values.yaml b/devops/gc/deploy/values.yaml index f3e2079e9ff5dfc690987d57f3db0808fa90a19f..4d61be6e419ee58c62c42131b41f237ad2b8442c 100644 --- a/devops/gc/deploy/values.yaml +++ b/devops/gc/deploy/values.yaml @@ -4,6 +4,7 @@ global: onPremEnabled: false limitsEnabled: true dataPartitionId: "" + logLevel: "ERROR" data: # Deployment resources @@ -17,7 +18,7 @@ data: bootstrapImage: '' bootstrapServiceAccountName: '' # ConfigMap resources - logLevel: ERROR + logLevel: "" entitlementsHost: http://entitlements entitlementsBasePath: /api/entitlements/v2/groups legalHost: http://legal