Skip to content
Snippets Groups Projects
Commit 46543f3c authored by Oleksandr Kosse (EPAM)'s avatar Oleksandr Kosse (EPAM)
Browse files

[GONRG-10793] remove indexer host configuration and update documentation

parent 9ce6ac6a
Branches trusted-okosse
No related tags found
1 merge request!743[GONRG-10793] remove indexer host configuration and update documentation
Pipeline #308320 failed
Stage: review
Stage: build
Stage: publish
Stage: deploy
Pipeline: Search

#308321

    Hide whitespace changes
    Inline Side-by-side
    devops/gc/deploy/README.md
    + 5
    − 1
    View file @ 46543f3c
    ......@@ -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
    ......
    devops/gc/deploy/templates/configmap.yaml
    + 0
    − 1
    View file @ 46543f3c
    ......@@ -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 }}
    devops/gc/deploy/values.yaml
    + 0
    − 1
    View file @ 46543f3c
    ......@@ -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
    ......
    provider/search-gc/docs/gc/README.md
    + 13
    − 11
    View file @ 46543f3c
    ## 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**
    ......
    provider/search-gc/src/main/resources/application.properties
    + 0
    − 4
    View file @ 46543f3c
    ......@@ -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
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment