diff --git a/NOTICE b/NOTICE index 6a5578e973b7046ddf896d733b341da7e740f014..f336ad814cc2c6b0daed39616a9e518096f768d5 100644 --- a/NOTICE +++ b/NOTICE @@ -77,7 +77,7 @@ The following software have components provided under the terms of this license: - Byte Buddy Java agent (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent) - ClassMate (from http://github.com/cowtowncoder/java-classmate) - Cloud Key Management Service (KMS) API v1-rev20240801-2.0.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms) -- Cloud Storage JSON API v1-rev20240809-2.0.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage) +- Cloud Storage JSON API v1-rev20240819-2.0.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage) - Collections (from https://repo1.maven.org/maven2/commons-collections/commons-collections) - Commons Digester (from http://commons.apache.org/digester/) - Converter: Jackson (from https://github.com/square/retrofit, https://repo1.maven.org/maven2/com/squareup/retrofit2/converter-jackson) diff --git a/devops/gc/deploy/README.md b/devops/gc/deploy/README.md index 5db3675c6fdcca847697d269043708f6e60488f3..c550a55df48bb1d32051a5b047d67a1a7eada696 100644 --- a/devops/gc/deploy/README.md +++ b/devops/gc/deploy/README.md @@ -31,33 +31,34 @@ 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 severity level for this service only | string | - | yes, only if differs from the `global.logLevel` **data.dataPartitionId** | data partition id | string | - | yes -**data.entitlementsHost** | entitlements host | string | "http://entitlements" | yes -**data.javaOptions** | java options | string | "-Xms512M -Xmx1024M -XX:+UseG1GC -XX:+UseStringDeduplication -XX:InitiatingHeapOccupancyPercent=45" | yes -**data.logLevel** | logging level | string | INFO | yes -**data.partitionHost** | partition host | string | "http://partition" | yes -**data.schemaTopicName** | topic for schema changes events | string | "schema-changed" | yes +**data.entitlementsHost** | entitlements host | string | `http://entitlements` | yes +**data.javaOptions** | java options | string | `-Xms512M -Xmx1024M -XX:+UseG1GC -XX:+UseStringDeduplication -XX:InitiatingHeapOccupancyPercent=45` | yes +**data.partitionHost** | partition host | string | `http://partition` | yes +**data.schemaTopicName** | topic for schema changes events | string | `schema-changed` | yes ### Deployment variables | Name | Description | Type | Default |Required | |------|-------------|------|---------|---------| -**data.requestsCpu** | amount of requested CPU | string | 220m | yes -**data.requestsMemory** | amount of requested memory| string | 1.7G | yes -**data.limitsCpu** | CPU limit | string | 1 | only if `global.limitsEnabled` is true -**data.limitsMemory** | memory limit | string | 1.5G | only if `global.limitsEnabled` is true +**data.requestsCpu** | amount of requested CPU | string | `220m` | yes +**data.requestsMemory** | amount of requested memory| string | `1.7G` | yes +**data.limitsCpu** | CPU limit | string | `1` | only if `global.limitsEnabled` is true +**data.limitsMemory** | memory limit | string | `1.5G` | only if `global.limitsEnabled` is true **data.bootstrapImage** | bootstrap image | string | - | yes **data.bootstrapServiceAccountName** | bootstrap service account name | string | - | yes **data.image** | service image | string | - | yes -**data.imagePullPolicy** | when to pull image | string | IfNotPresent | yes -**data.serviceAccountName** | name of your service account | string | schema | yes +**data.imagePullPolicy** | when to pull image | string | `IfNotPresent` | yes +**data.serviceAccountName** | name of your service account | string | `schema` | yes ### Configuration variables @@ -76,11 +77,11 @@ First you need to set variables in **values.yaml** file using any code editor. S | Name | Description | Type | Default |Required | |------|-------------|------|---------|---------| -**data.datastoreKind** | Datastore Kind for Schema | string | "system_schema_osm" | yes -**data.datastoreNamespace** | Datastore Namespace for Schema | string | "dataecosystem" | yes -**data.enableCleanup** | whether cleanup is enabled | boolean | false | yes +**data.datastoreKind** | Datastore Kind for Schema | string | `system_schema_osm` | yes +**data.datastoreNamespace** | Datastore Namespace for Schema | string | `dataecosystem` | yes +**data.enableCleanup** | whether cleanup is enabled | boolean | `false` | yes **data.schemaBucket** | name of the bucket with schemas | string | - | yes -**data.schemaHost** | schema host | string | "http://schema" | yes +**data.schemaHost** | schema host | string | `http://schema` | yes ### Istio variables diff --git a/devops/gc/deploy/templates/configmap.yaml b/devops/gc/deploy/templates/configmap.yaml index edfe7d77b3ba5fe4c3c3c0058612138b52ac6f0c..c18ecbc335a7892b6697f9adbabfd16e62a8abde 100644 --- a/devops/gc/deploy/templates/configmap.yaml +++ b/devops/gc/deploy/templates/configmap.yaml @@ -11,7 +11,7 @@ data: {{- else }} {{ .Values.global.dataPartitionId | quote }} {{- end }} - LOG_LEVEL: {{ .Values.data.logLevel | quote }} + LOG_LEVEL: {{ .Values.data.logLevel | default .Values.global.logLevel | quote }} ENTITLEMENTS_HOST: {{ .Values.data.entitlementsHost | quote }} SCHEMA_CHANGED_TOPIC_NAME: {{ .Values.data.schemaTopicName | quote }} SCHEMA_CHANGED_MESSAGING_ENABLED: {{ .Values.data.schemaChangedMessagingEnabled | quote }} diff --git a/devops/gc/deploy/values.yaml b/devops/gc/deploy/values.yaml index 349db50a12ea23bb3c77257d2b0fa26d8310407c..66b8dcaa923a7a5dee91a1ebc50399249fda7a69 100644 --- a/devops/gc/deploy/values.yaml +++ b/devops/gc/deploy/values.yaml @@ -3,12 +3,13 @@ global: onPremEnabled: false limitsEnabled: true dataPartitionId: "" + logLevel: "ERROR" data: #Configmaps entitlementsHost: "http://entitlements" javaOptions: "-Xms512M -Xmx1024M -XX:+UseG1GC -XX:+UseStringDeduplication -XX:InitiatingHeapOccupancyPercent=45" - logLevel: "ERROR" + logLevel: "" partitionHost: "http://partition" schemaTopicName: "schema-changed" schemaChangedMessagingEnabled: true