diff --git a/devops/gc/deploy/README.md b/devops/gc/deploy/README.md
index b77aed3c34d7b5dc294439dcd5e0dd970c3831a6..17d79036d4cee7fea38c582b35d54525f4005130 100644
--- a/devops/gc/deploy/README.md
+++ b/devops/gc/deploy/README.md
@@ -1,5 +1,3 @@
-<!--- Deploy -->
-
# Deploy helm chart
## Introduction
@@ -32,7 +30,6 @@ First you need to set variables in **values.yaml** file using any code editor. S
| Name | Description | Type | Default |Required |
|------|-------------|------|---------|---------|
**data.entitlementsHost** | entitlements host | string | "http://entitlements" | yes
-**data.indexerQueueHost** | indexer-queue host | string | "http://indexer-queue" | yes
**data.logLevel** | logging level | string | INFO | yes
**data.partitionHost** | partition host | string | "http://partition" | yes
**data.schemaHost** | schema host | string | "http://schema" | yes
@@ -46,8 +43,8 @@ First you need to set variables in **values.yaml** file using any code editor. S
| Name | Description | Type | Default |Required |
|------|-------------|------|---------|---------|
-**data.requestsCpu** | amount of requested CPU | string | 480m | yes
-**data.requestsMemory** | amount of requested memory| string | 700Mi | yes
+**data.requestsCpu** | amount of requested CPU | string | 35m | yes
+**data.requestsMemory** | amount of requested memory| string | 640Mi | yes
**data.limitsCpu** | CPU limit | string | 1 | yes
**data.limitsMemory** | memory limit | string | 1G | yes
**data.image** | service image | string | - | yes
@@ -72,10 +69,10 @@ First you need to set variables in **values.yaml** file using any code editor. S
| Name | Description | Type | Default |Required |
|------|-------------|------|---------|---------|
-**istio.proxyCPU** | CPU request for Envoy sidecars | string | 130m | yes
-**istio.proxyCPULimit** | CPU limit for Envoy sidecars | string | 500m | 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 | 512Mi | 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 3ca6fe5812d03b62c52b480ac8df345f8f57a187..73c17cfc8ff461e868f3f30a6164414d65a20dd0 100644
--- a/devops/gc/deploy/templates/configmap.yaml
+++ b/devops/gc/deploy/templates/configmap.yaml
@@ -7,7 +7,6 @@ metadata:
namespace: {{ .Release.Namespace | quote }}
data:
ENTITLEMENTS_HOST: {{ .Values.data.entitlementsHost | quote }}
- INDEXER_QUEUE_BASE_HOST: {{ .Values.data.indexerQueueHost | quote }}
LOG_LEVEL: {{ .Values.data.logLevel | quote }}
PARTITION_HOST: {{ .Values.data.partitionHost | quote }}
{{- if .Values.data.redisIndexerHost }}
diff --git a/devops/gc/deploy/templates/deploy-redis.yaml b/devops/gc/deploy/templates/deploy-redis.yaml
index f310f1a847b80c2af66ef3dc3fa218e7250e661c..740335a6b86f7fa8fa75e52647532d01816bb3be 100644
--- a/devops/gc/deploy/templates/deploy-redis.yaml
+++ b/devops/gc/deploy/templates/deploy-redis.yaml
@@ -32,6 +32,6 @@ spec:
protocol: TCP
resources:
requests:
- cpu: 30m
+ cpu: 10m
memory: 50Mi
{{ end }}
diff --git a/devops/gc/deploy/values.yaml b/devops/gc/deploy/values.yaml
index a5f7c271e40d3dfb957915b94612319fc8798ab9..b71731641d6454c02d5373b65d32c44ad72bfca5 100644
--- a/devops/gc/deploy/values.yaml
+++ b/devops/gc/deploy/values.yaml
@@ -5,7 +5,6 @@
data:
# Configmap
entitlementsHost: "http://entitlements"
- indexerQueueHost: "http://indexer-queue"
logLevel: "ERROR"
partitionHost: "http://partition"
schemaHost: "http://schema"
@@ -13,8 +12,8 @@ data:
springProfilesActive: "gcp"
storageHost: "http://storage"
# Deployment
- requestsCpu: "480m"
- requestsMemory: "700Mi"
+ requestsCpu: "35m"
+ requestsMemory: "640Mi"
limitsCpu: "1"
limitsMemory: "1G"
image: ""
@@ -36,7 +35,7 @@ conf:
indexerRedisSecretName: "indexer-redis-secret"
istio:
- proxyCPU: "130m"
+ proxyCPU: "10m"
proxyCPULimit: "200m"
proxyMemory: "100Mi"
proxyMemoryLimit: "256Mi"
diff --git a/pom.xml b/pom.xml
index 42b096b3a8a73735ae42c63baeb32638a0456fdc..75ae7745b5c753f7b9e353ff8fc815f7558cd7d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<spring-cloud.version>Greenwich.SR2</spring-cloud.version>
- <os-core-common.version>0.19.0-SNAPSHOT</os-core-common.version>
+ <os-core-common.version>0.19.0</os-core-common.version>
<snakeyaml.version>1.33</snakeyaml.version>
<hibernate-validator.version>6.1.5.Final</hibernate-validator.version>
<jackson-databind.version>2.13.4.2</jackson-databind.version>
diff --git a/provider/indexer-aws/pom.xml b/provider/indexer-aws/pom.xml
index 741636525f6048d7718d05093e21a23a61153bf9..63a5c3a8817f4026cbf62c21130ac8dc85756704 100644
--- a/provider/indexer-aws/pom.xml
+++ b/provider/indexer-aws/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
- <version>0.18.0</version>
+ <version>0.19.0-rc3</version>
</dependency>
<!-- AWS managed packages -->
diff --git a/provider/indexer-gc/docs/gc/README.md b/provider/indexer-gc/docs/gc/README.md
index 7c390dea4b1046123997f174c8f41165c90c53e4..4fbcefb066ae0e3c91dca47eed5a39f69ff77dc5 100644
--- a/provider/indexer-gc/docs/gc/README.md
+++ b/provider/indexer-gc/docs/gc/README.md
@@ -9,8 +9,8 @@ Must have:
| name | value | description | sensitive? | source |
|----------------------------------------------|---------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------|---------------------------------------------------|
| `SPRING_PROFILES_ACTIVE` | ex `gcp` | Spring profile that activate default configuration for Google Cloud environment | false | - |
-| `<ELASTICSEARCH_USER_ENV_VARIABLE_NAME>` | ex `user` | Elasticsearch user, name of that variable not defined at the service level, the name will be received through partition service. Each tenant can have it's own ENV name value, and it must be present in ENV of Indexer service, see [Partition properties set](#Properties-set-in-Partition-service) | yes | - |
-| `<ELASTICSEARCH_PASSWORD_ENV_VARIABLE_NAME>` | ex `password` | Elasticsearch password, name of that variable not defined at the service level, the name will be received through partition service. Each tenant can have it's own ENV name value, and it must be present in ENV of Indexer service, see [Partition properties set](#Properties-set-in-Partition-service) | false | - |
+| `<ELASTICSEARCH_USER_ENV_VARIABLE_NAME>` | ex `user` | Elasticsearch user, name of that variable not defined at the service level, the name will be received through partition service. Each tenant can have it's own ENV name value, and it must be present in ENV of Indexer service, see [Partition properties set](#properties-set-in-partition-service) | yes | - |
+| `<ELASTICSEARCH_PASSWORD_ENV_VARIABLE_NAME>` | ex `password` | Elasticsearch password, name of that variable not defined at the service level, the name will be received through partition service. Each tenant can have it's own ENV name value, and it must be present in ENV of Indexer service, see [Partition properties set](#properties-set-in-partition-service) | false | - |
Defined in default application property file but possible to override:
@@ -27,7 +27,6 @@ Defined in default application property file but possible to override:
| `PARTITION_HOST` | ex `https://partition.com` | Partition host | no | output of infrastructure deployment |
| `ENTITLEMENTS_HOST` | ex `https://entitlements.com` | Entitlements host | no | output of infrastructure deployment |
| `STORAGE_HOST` | ex `https://storage.com` | Storage host | no | output of infrastructure deployment |
-| `INDEXER_QUEUE_HOST` | ex `http://indexer-queue/api/indexer-queue/v1/_dps/task-handlers/enqueue` | Indexer-Queue host endpoint used for reprocessing tasks | no | output of infrastructure deployment |
| `SCHEMA_BASE_HOST` | ex `https://schema.com` | Schema service host | no | output of infrastructure deployment |
| `GOOGLE_APPLICATION_CREDENTIALS` | ex `/path/to/directory/service-key.json` | Service account credentials, you only need this if running locally | yes | <https://console.cloud.google.com/iam-admin/serviceaccounts> |
@@ -62,7 +61,7 @@ It is possible, but not necessary to adjust consumer throughput via Partition se
*MID* - for consumers with the average load, defaults(streams = 2, threads = 2, outstanding elements = 40)
*MAX* - for maximum loaded consumers, defaults(streams = 2, threads = 5, outstanding elements = 100)
-https://community.opengroup.org/osdu/platform/system/lib/cloud/gcp/oqm/-/blob/master/src/main/java/org/opengroup/osdu/core/gcp/oqm/driver/pubsub/config/PsThroughputConfiguration.java
+<https://community.opengroup.org/osdu/platform/system/lib/cloud/gcp/oqm/-/blob/master/src/main/java/org/opengroup/osdu/core/gcp/oqm/driver/pubsub/config/PsThroughputConfiguration.java>
```
"max.sub.parallel.streams": {
@@ -79,7 +78,6 @@ https://community.opengroup.org/osdu/platform/system/lib/cloud/gcp/oqm/-/blob/ma
}
```
-
### Properties set in Partition service
Note that properties can be set in Partition as `sensitive` in that case in property `value` should be present not value itself, but ENV variable name.
diff --git a/provider/indexer-gc/src/main/resources/application.properties b/provider/indexer-gc/src/main/resources/application.properties
index 721d5d180b4acc19d9ac61a0c525a5683980c8c4..a5e5077aa785f9ee0c02f8e25b31d35395ed8ba2 100644
--- a/provider/indexer-gc/src/main/resources/application.properties
+++ b/provider/indexer-gc/src/main/resources/application.properties
@@ -54,4 +54,3 @@ records-changed-topic-name=records-changed
schema-changed-topic-name=schema-changed
reprocess-topic-name=reprocess
status-changed-topic-name=indexing-progress
-
diff --git a/testing/indexer-test-aws/pom.xml b/testing/indexer-test-aws/pom.xml
index 5a33fa2c96c7f7e87e87e5ef13d18eef22b371f0..19bdc68759d3923f93fed0ad09912d37f1af928a 100644
--- a/testing/indexer-test-aws/pom.xml
+++ b/testing/indexer-test-aws/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
- <version>0.14.0-rc2</version>
+ <version>0.19.0-rc3</version>
</dependency>
<!-- Testing -->