Merge branch 'core-elastic-tls' into 'master'

Core elastic tls

See merge request !653

devops/core-plus/bootstrap/data_core.sh

@@ -131,6 +131,14 @@ core_partition_data() {
       "sensitive": true,
       "value": "ELASTIC_PASS${PARTITION_SUFFIX}"
     },
+    "elasticsearch.8.https": {
+      "sensitive": false,
+      "value": "${ELASTIC_HTTPS}"
+    },
+    "elasticsearch.8.tls": {
+      "sensitive": false,
+      "value": "${ELASTIC_HTTPS}"
+    },
     "entitlements.datasource.url": {
       "sensitive": true,
       "value": "ENT_PG_URL${PARTITION_SUFFIX}"

devops/core-plus/deploy/README.md

@@ -113,6 +113,7 @@ First you need to set variables in **values.yaml** file using any code editor. S
 **data.minioIgnoreCertCheck** | whether minio should ignore TLS certs validity check, set to true if external minio is protected by self-signed certificates | string | false | no
 **data.minioUIEndpoint** | UI endpoint for gathering minio versions | string | `http://minio:9001` | yes
 **data.indexerAugmenterEnabled** | enable indexer Augmenter | string | false | no
+**data.elasticHttps** | use https(true) or http(false) in interservice communication (search/indexer <-> elasticsearch)| bool | "" | yes
 
 ### Deployment variables
 

devops/core-plus/deploy/templates/configmap-bootstrap.yaml

@@ -29,3 +29,4 @@ data:
   INDEXER_AUGMENTER_ENABLED: {{ .Values.data.indexerAugmenterEnabled | quote }}
   EDS_ENABLED: {{ .Values.data.edsEnabled | quote }}
   POLICY_SERVICE_ENABLED: {{ .Values.data.policyServiceEnabled | quote }}
+  ELASTIC_HTTPS: {{ .Values.data.elasticHttps | quote }}

devops/core-plus/deploy/values.yaml

@@ -22,6 +22,7 @@ data:
   imagePullPolicy: "IfNotPresent"
   image: ""
   bootstrapImage: ""
+  elasticHttps: ""
   # featureFlags
   indexerAugmenterEnabled: "false"
   asIngestedCoordinatesEnabled: "false"

devops/core-plus/pipeline/override-stages.yml

@@ -3,6 +3,10 @@ variables:
   CORE_ENABLE_BOOTSTRAP: "true"
   CORE_BUILD_BOOTSTRAP_PATH: "devops/core-plus/bootstrap/Dockerfile"
 
+core-deploy:
+  variables:
+    CORE_HELM_SETS: >-
+      --set data.elasticHttps=false
 
 core-test:
   variables:

devops/gc/deploy/templates/configmap-bootstrap.yaml

@@ -25,7 +25,7 @@ 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}}
+  ELASTIC_HTTPS: {{ .Values.data.elasticHttps | quote }}
   AS_INGESTED_COORDINATES_ENABLED: {{ .Values.data.asIngestedCoordinatesEnabled | quote }}
   KEYWORD_LOWER_ENABLED: {{ .Values.data.keywordLowerEnabled | quote }}
   BAG_OF_WORDS_ENABLED: {{ .Values.data.bagOfWordsEnabled | quote }}