Merge branch 'master' into wait-for-active-shards

devops/gcp/deploy/templates/indexer-deploy.yml

@@ -23,7 +23,9 @@ spec:
         imagePullPolicy: "{{ .Values.data.imagePullPolicy }}"
         envFrom:
         - configMapRef:
-            name: "{{ .Values.conf.configmap }}"             
+            name: "{{ .Values.conf.configmap }}"
+        - secretRef:
+            name: "{{ .Values.conf.elastic_secret_name }}"
         securityContext:
           allowPrivilegeEscalation: false
           runAsUser: 0

devops/gcp/deploy/values.yaml

@@ -13,4 +13,5 @@ data:
 
 conf:
   configmap: "indexer-config"
+  elastic_secret_name: "elastic-secret"
   app_name: "indexer"

provider/indexer-gcp/README.md

@@ -205,6 +205,8 @@ Storage service account should have entitlements groups listed below:
 - service.storage.viewer
 - service.schema-service.viewers
 - data.default.viewers
+- service.storage.admin
+- service.search.admin
 
 ## Licence
 Copyright © Google LLC

provider/indexer-gcp/docs/anthos/README.md

@@ -27,7 +27,7 @@ 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` | Indexer-Queue 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 |
 
 These variables define service behavior, and are used to switch between `anthos` or `gcp` environments, their overriding and usage in mixed mode was not tested.

provider/indexer-gcp/docs/gcp/README.md

@@ -25,7 +25,7 @@ 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` | Indexer-Queue 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 |