From abaf7965c2e43818b06f439cbb8339ba49ec5ba0 Mon Sep 17 00:00:00 2001
From: Gilles Mouchet <gilles.mouchet@gmail.com>
Date: Thu, 26 Jun 2025 12:07:57 +0200
Subject: [PATCH] elasticsearch ok

---
 .../elasticsearch/create-kibana-user-job.yaml    | 16 ++++++++--------
 .../elasticsearch/secret-elasticsearch.yaml      |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/helm/templates/elasticsearch/create-kibana-user-job.yaml  b/helm/templates/elasticsearch/create-kibana-user-job.yaml 
index 5906c70..7abaf07 100644
--- a/helm/templates/elasticsearch/create-kibana-user-job.yaml 	
+++ b/helm/templates/elasticsearch/create-kibana-user-job.yaml 	
@@ -16,20 +16,20 @@ spec:
         command: ["/bin/sh", "-c"]
         args:
           - |
-            echo "⏳ Waiting for Elasticsearch..."
+            echo "waiting for elasticsearch..."
             until curl -s -u ${ELASTIC_USERNAME}:${ELASTIC_PASSWORD} http://service-elasticsearch:9200/_cluster/health | grep -q '"status":"green"'; do
-              echo "🟡 Elasticsearch not ready yet..."
+              echo "elasticsearch not ready yet..."
               sleep 5
             done
 
-            echo "🔍 Checking if user '${KIBANA_USERNAME}' exists..."
-            USER_EXISTS=$(curl -s -o /dev/null -w "%{http_code}" -u ${ELASTIC_USERNAME}:${ELASTIC_PASSWORD} http://elasticsearch:9200/_security/user/${KIBANA_USERNAME})
+            echo "checking if user '${KIBANA_USERNAME}' exists..."
+            USER_EXISTS=$(curl -s -o /dev/null -w "%{http_code}" -u ${ELASTIC_USERNAME}:${ELASTIC_PASSWORD} http://service-elasticsearch:9200/_security/user/${KIBANA_USERNAME})
 
             if [ "$USER_EXISTS" -eq 200 ]; then
-              echo "✅ User '${KIBANA_USERNAME}' already exists."
+              echo "user '${KIBANA_USERNAME}' already exists."
             else
-              echo "➕ Creating user '${KIBANA_USERNAME}'..."
-              curl -s -u ${ELASTIC_USERNAME}:${ELASTIC_PASSWORD} -X POST http://elasticsearch:9200/_security/user/${KIBANA_USERNAME} \
+              echo "creating user '${KIBANA_USERNAME}'..."
+              curl -u ${ELASTIC_USERNAME}:${ELASTIC_PASSWORD} -X POST http://service-elasticsearch:9200/_security/user/${KIBANA_USERNAME} \
                 -H "Content-Type: application/json" \
                 -d "{
                   \"password\": \"${KIBANA_PASSWORD}\",
@@ -37,7 +37,7 @@ spec:
                   \"full_name\": \"Kibana System User\",
                   \"enabled\": true
                 }"
-              echo "✅ User '${KIBANA_USERNAME}' created."
+              echo "user '${KIBANA_USERNAME}' created."
             fi
         envFrom:
         - secretRef:
diff --git a/helm/templates/elasticsearch/secret-elasticsearch.yaml b/helm/templates/elasticsearch/secret-elasticsearch.yaml
index e97cd11..50a2687 100644
--- a/helm/templates/elasticsearch/secret-elasticsearch.yaml
+++ b/helm/templates/elasticsearch/secret-elasticsearch.yaml
@@ -11,5 +11,5 @@ type: Opaque
 stringData:
   ELASTIC_USERNAME: elastic
   ELASTIC_PASSWORD: "{{ required ".Values.elastic.password entry is required!" .Values.elastic.password }}"
-  KIBANA_PASSWORD: kibanaPass55w0rd
-  KIBANA_USERNAME: kibana_system_user
\ No newline at end of file
+  KIBANA_PASSWORD: "{{ required ".Values.kibana.password entry is required!" .Values.kibana.password }}"
+  KIBANA_USERNAME: "{{ required ".Values.kibana.username entry is required!" .Values.kibana.username }}"