Add to makefile ELASTICSEARCH_PASSWORD

datalab-mi · Nov 15, 2023 · 6c75e17 · 6c75e17
1 parent 27580bf
commit 6c75e17
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -32,6 +32,7 @@ export ES_PROXY_PATH = /${API_PATH}/backend/v0/search
 
 export NPM_REGISTRY = $(shell echo $$NPM_REGISTRY )
 export NPM_VERBOSE = 1
+export ELASTICSEARCH_PASSWORD=elastic
 
 # KIBANA
 export KIBANA_HOST = kibana
@@ -192,7 +193,7 @@ deploy-traefik:
 
 deploy-k8s-ekl: create-namespace
 	@echo $@
-	#helm upgrade --install --values ${KUBE_DIR}/ekl/elasticsearch.yaml elasticsearch elastic/elasticsearch -n ridoc
+	@cat ${KUBE_DIR}/ekl/elasticsearch.yaml | envsubst | helm upgrade --install elasticsearch elastic/elasticsearch -n ridoc -f - 
 	@cat ${KUBE_DIR}/ekl/kibana.yaml | envsubst | helm upgrade --install kibana elastic/kibana -n ridoc -f - 
 	#@cat ${KUBE_DIR}/ekl/logstash.yaml | envsubst | helm upgrade --install logstash elastic/logstash -n ridoc -f -
 

diff --git a/artifacts.sample b/artifacts.sample
@@ -3,4 +3,4 @@ export INDEX_NAME = bld
 export DATA_PATH = /data
 export ENV_FILE = ${APP_PATH}/backend/tests/${INDEX_NAME}/.env-${INDEX_NAME}
 export FRONTEND_STATIC_USER=${APP_PATH}/backend/tests/${INDEX_NAME}/static
-export DC_UP_ARGS=
+export DC_UP_ARGS=
diff --git a/deployments/ekl/elasticsearch.yaml b/deployments/ekl/elasticsearch.yaml
@@ -19,7 +19,7 @@ clusterHealthCheckParams: "timeout=30s"
 #"wait_for_status=green&timeout=1s"
 secret:
   enabled: true
-  password: "elastic"
+  password: ${ELASTICSEARCH_PASSWORD}
    # generated randomly if not defined
 
 protocol: https