diff --git a/devops/gc/deploy/README.md b/devops/gc/deploy/README.md index 6918be0c88c614810e80eade8aa6aea233b9fa99..ef0bd0c83473c30752bd9adbed4c9f18f27df870 100644 --- a/devops/gc/deploy/README.md +++ b/devops/gc/deploy/README.md @@ -115,6 +115,7 @@ First you need to set variables in **values.yaml** file using any code editor. S **data.partitionNamespace** | datastore namespace where partition will store the data | string | `partition` | yes **data.datafierSa** | datafier service account | string | `datafier` | yes **data.indexerAugmenterEnabled** | enable indexer Augmenter | string | `false` | no +**data.elasticHttps** | Configuration of the communication protocol for search and indexer services | boolean | - | yes | ### Deployment variables diff --git a/devops/gc/deploy/templates/configmap-bootstrap.yaml b/devops/gc/deploy/templates/configmap-bootstrap.yaml index 3f354266b5cf4d5569320dff95c61b157e7152c4..93e995adcc98e6adea0160ef86d0f129ad56f2b3 100644 --- a/devops/gc/deploy/templates/configmap-bootstrap.yaml +++ b/devops/gc/deploy/templates/configmap-bootstrap.yaml @@ -29,3 +29,4 @@ data: {{- end }} SERVICE_ACCOUNT: {{ printf "%s@%s.iam.gserviceaccount.com" .Values.data.datafierSa .Values.data.projectId | quote }} DATABASE_ID: "{{ $databaseId }}" + ELASTIC_HTTPS: {{ .Values.data.elasticHttps | quote}} diff --git a/devops/gc/deploy/values.yaml b/devops/gc/deploy/values.yaml index f1ac971b17bdb22e5c69dfbb690542a479dd9875..4986a1a3eb78089165696c1cc7ae33ed49db8f56 100644 --- a/devops/gc/deploy/values.yaml +++ b/devops/gc/deploy/values.yaml @@ -21,6 +21,7 @@ data: edsEnabled: "false" autocompleteEnabled: "true" databaseId: "" + elasticHttps: "" # deployments requestsCpu: "5m" requestsMemory: "350Mi" diff --git a/devops/gc/pipeline/override-stages.yml b/devops/gc/pipeline/override-stages.yml index a0d764c3de5da7c30c0f87950ddd236b8a13e851..0600cd1f4fd930ed7f5c6617999a4aa4839f85f9 100644 --- a/devops/gc/pipeline/override-stages.yml +++ b/devops/gc/pipeline/override-stages.yml @@ -37,6 +37,7 @@ gc-deploy: # reuse common deploy job for test deployment --set istio.sidecarInject=false --set data.edsEnabled=true --set data.databaseId=\(default\) + --set data.elasticHttps=true GC_SA_EMAIL: $GC_SA_GKE_EMAIL gc-test: @@ -83,6 +84,7 @@ gc-verified-deploy: # verified deploy after tests GC_HELM_SETS: >- --set data.edsEnabled=true --set data.databaseId=\(default\) + --set data.elasticHttps=true # Dev2 jobs gc-dev2-deploy: # reuse common deploy job for test deployment @@ -139,6 +141,7 @@ gc-dev2-verified-deploy: # verified deploy after tests GC_HELM_SETS: >- --set data.edsEnabled=true --set data.databaseId=\(default\) + --set data.elasticHttps=true gc-preship-deploy: extends: .gc-preship-variables @@ -151,3 +154,4 @@ gc-preship-deploy: --set global.dataPartitionId=m19 --set data.edsEnabled=true --set data.databaseId=\(default\) + --set data.elasticHttps=true diff --git a/provider/partition-gc/bootstrap/data_gc.sh b/provider/partition-gc/bootstrap/data_gc.sh index a765d8fcaa654e0ba7f2167486b91df6ae0b0e98..50fe27f7e826230a6be86f054c1f049246797b25 100644 --- a/provider/partition-gc/bootstrap/data_gc.sh +++ b/provider/partition-gc/bootstrap/data_gc.sh @@ -112,6 +112,14 @@ gc_partition_data() { "elasticsearch.8.password": { "sensitive": true, "value": "ELASTIC_PASS${PARTITION_SUFFIX}" + }, + "elasticsearch.8.https": { + "sensitive": false, + "value": "${ELASTIC_HTTPS}" + }, + "elasticsearch.8.tls": { + "sensitive": false, + "value": "${ELASTIC_HTTPS}" } } }