diff --git a/devops/gc/deploy/README.md b/devops/gc/deploy/README.md
index aa760e84dfff362af053bc1408295dde2d9c1e95..cd14e8aca31fcab9ea737a2f0c0c80a7ff8f0020 100644
--- a/devops/gc/deploy/README.md
+++ b/devops/gc/deploy/README.md
@@ -30,6 +30,7 @@ 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
@@ -41,9 +42,9 @@ You need to set variables in **values.yaml** file using any code editor. Some of
| 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
**data.partitionHost** | Partition service host | string | `http://partition` | yes
**data.policyId** | policy id from ex `${POLICY_HOST}/api/policy/v1/policies` | string | `search` | yes
@@ -55,6 +56,7 @@ You need to set variables in **values.yaml** file using any code editor. Some of
| Name | Description | Type | Default | Required |
|------|-------------|------|---------|----------|
+
**data.requestsCpu** | amount of requested CPU | string | `20m` | yes
**data.requestsMemory** | amount of requested memory| string | `550Mi` | yes
**data.limitsCpu** | CPU limit | string | `1` | only if `global.limitsEnabled` is true
@@ -68,6 +70,7 @@ You need to set variables in **values.yaml** file using any code editor. Some of
| Name | Description | Type | Default | Required |
|------|-------------|------|---------|----------|
+
**conf.appName** | Service name | string | `search` | yes
**conf.elasticSecretName** | secret for elasticsearch | string | `search-elastic-secret` | yes
**conf.searchRedisSecretName** | search Redis secret that contains redis password with REDIS_PASSWORD key | string | `search-redis-secret` | yes
@@ -76,6 +79,7 @@ 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
diff --git a/devops/gc/deploy/templates/configmap.yaml b/devops/gc/deploy/templates/configmap.yaml
index f67889254f35c388bfbb60c45e3daed580cc549d..60ec31d372e20ee5204a262636092474663f59f1 100644
--- a/devops/gc/deploy/templates/configmap.yaml
+++ b/devops/gc/deploy/templates/configmap.yaml
@@ -26,4 +26,3 @@ data:
PARTITION_HOST: {{ .Values.data.partitionHost | quote }}
POLICY_HOST: {{ .Values.data.policyHost | quote }}
POLICY_ID: {{ .Values.data.policyId | quote }}
- INDEXER_BASE_HOST: {{ .Values.data.indexerHost | quote }}
diff --git a/devops/gc/deploy/values.yaml b/devops/gc/deploy/values.yaml
index 04bf6cda337a22f7167e572aca23cfc2d0f28b82..b96f39e26816f37dd5d7f0fa06ddfe8ef62020f6 100644
--- a/devops/gc/deploy/values.yaml
+++ b/devops/gc/deploy/values.yaml
@@ -12,7 +12,6 @@ data:
entitlementsHost: "http://entitlements"
partitionHost: "http://partition"
policyHost: "http://policy"
- indexerHost: "http://indexer"
policyId: 'osdu.partition["%s"].search'
securityHttpsCertificateTrust: "true"
# Deployments
diff --git a/provider/search-gc/docs/gc/README.md b/provider/search-gc/docs/gc/README.md
index fbcd6ed14a2104bfbe1bf8c2bae08e990238c9ab..4ca68ea81e7e17ce9042b45355ad34ced8aa8904 100644
--- a/provider/search-gc/docs/gc/README.md
+++ b/provider/search-gc/docs/gc/README.md
@@ -1,4 +1,4 @@
-## Service Configuration for Google Cloud
+# Service Configuration for Google Cloud
## Run args
@@ -16,12 +16,15 @@ java -jar search.jar --add-opens java.base/java.lang=ALL-UNNAMED --add-opens jav
## Table of Contents <a name="TOC"></a>
-* [Environment variables](#Environment-variables)
- * [Properties set in Partition service](#properties-set-in-partition-service)
-* [Elasticsearch configuration](#Elasticsearch configuration)
-* [Google cloud service account configuration](#Google-cloud-service-account-configuration)
-* [Running E2E Tests](#running-e2e-tests)
-* [License](#license)
+- [Service Configuration for Google Cloud](#service-configuration-for-google-cloud)
+ - [Run args](#run-args)
+ - [Table of Contents ](#table-of-contents-)
+ - [Environment variables](#environment-variables)
+ - [Properties set in Partition service](#properties-set-in-partition-service)
+ - [Elasticsearch configuration](#elasticsearch-configuration)
+ - [Google cloud service account configuration](#google-cloud-service-account-configuration)
+ - [Running E2E Tests](#running-e2e-tests)
+ - [License](#license)
## Environment variables
@@ -58,7 +61,6 @@ Defined in default application property file but possible to override:
| `POLICY_API` | ex `http://localhost:8080/api/policy/v1/` | Policy service endpoint | no | output of infrastructure deployment |
| `POLICY_ID` | ex `search` | policyId from ex `http://localhost:8080/api/policy/v1/policies`. Look at `POLICY_API` | no | - |
| `SERVICE_POLICY_ENABLED` | ex `false` | Enable or Disable an integration with Policy Service | no | output of infrastructure deployment |
-| `INDEXER_HOST` | ex `https://os-indexer-dot-opendes.appspot.com/api/indexer/v2/` | Indexer API endpoint | no | output of infrastructure deployment |
| `MANAGEMENT_ENDPOINTS_WEB_BASE` | ex `/` | Web base for Actuator | no | - |
| `MANAGEMENT_SERVER_PORT` | ex `8081` | Port for Actuator | no | - |
@@ -79,11 +81,11 @@ Example:
```
"elasticsearch.port": {
- "sensitive": false, <- value not sensitive
+ "sensitive": false, <- value not sensitive
"value": "9243" <- will be used as is.
},
"elasticsearch.password": {
- "sensitive": true, <- value is sensitive
+ "sensitive": true, <- value is sensitive
"value": "ELASTIC_SEARCH_PASSWORD_OSDU" <- service consumer should have env variable ELASTIC_SEARCH_PASSWORD_OSDU with elastic search password
}
```
@@ -156,7 +158,7 @@ You will need to have the following environment variables defined.
| `DEFAULT_DATA_PARTITION_ID_TENANT2` | ex `not-exist` | HTTP Header 'Data-Partition-ID' with not existing tenant | no | - |
| `SEARCH_INTEGRATION_TESTER` | `ewogICJ0....` or `tmp/service-acc.json` | Service account for API calls as Base64 string or path to a file | yes | <https://console.cloud.google.com/iam-admin/serviceaccounts> |
| `SEARCH_HOST` | ex `http://localhost:8080/api/search/v2/` | Endpoint of search service | no | - |
-| `LEGAL_TAG` | ex `my-legal-tag` | a valid legal tag | no | - |
+| `LEGAL_TAG` | ex `my-legal-tag` | a valid legal tag | no | - |
**Entitlements configuration for integration accounts**
diff --git a/provider/search-gc/src/main/resources/application.properties b/provider/search-gc/src/main/resources/application.properties
index e4f6592a47156721f1ebe9c6ebf5ec5b4a8e7006..9c6a579237db387b8cda142aa53c1e7910016665 100644
--- a/provider/search-gc/src/main/resources/application.properties
+++ b/provider/search-gc/src/main/resources/application.properties
@@ -55,10 +55,6 @@ PARTITION_HOST=http://partition
PARTITION_PATH=/api/partition/v1/
PARTITION_API=${PARTITION_HOST}${PARTITION_PATH}
-INDEXER_BASE_HOST=http://indexer
-INDEXER_PATH=/api/indexer/v2
-INDEXER_HOST=${INDEXER_BASE_HOST}${INDEXER_PATH}
-
propertyResolver.strategy=partition
# autocomplete feature flag name