From 53c9c64f93a80d1b6ebb71f8ac09c3e87bc0aaab Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Fri, 21 Jun 2024 19:30:31 +0300
Subject: [PATCH] diskoverdata: fix perms on elastic search (#2602)

---
 library/ix-dev/charts/diskoverdata/Chart.yaml               | 2 +-
 library/ix-dev/charts/diskoverdata/templates/_es.tpl        | 6 ++++++
 .../ix-dev/charts/diskoverdata/templates/_persistence.tpl   | 5 +++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/library/ix-dev/charts/diskoverdata/Chart.yaml b/library/ix-dev/charts/diskoverdata/Chart.yaml
index ea71cb8ed7..8193cff2b0 100644
--- a/library/ix-dev/charts/diskoverdata/Chart.yaml
+++ b/library/ix-dev/charts/diskoverdata/Chart.yaml
@@ -3,7 +3,7 @@ description: Diskover is used to monitor size/volumes of distributed dataset.
 annotations:
   title: Diskover Data
 type: application
-version: 2.0.0
+version: 2.0.1
 apiVersion: v2
 appVersion: "2.0.1"
 kubeVersion: ">=1.16.0-0"
diff --git a/library/ix-dev/charts/diskoverdata/templates/_es.tpl b/library/ix-dev/charts/diskoverdata/templates/_es.tpl
index fc4f51393f..907f8926a5 100644
--- a/library/ix-dev/charts/diskoverdata/templates/_es.tpl
+++ b/library/ix-dev/charts/diskoverdata/templates/_es.tpl
@@ -50,4 +50,10 @@ workload:
                 - |
                   curl -s -H "Authorization: Basic $(base64 <<< "elastic:$ELASTIC_PASSWORD")" \
                     http://localhost:9200/_cluster/health?local=true
+      initContainers:
+      {{- include "ix.v1.common.app.permissions" (dict "containerName" "01-permissions"
+                                                        "UID" 1000
+                                                        "GID" 1000
+                                                        "mode" "check"
+                                                        "type" "install") | nindent 8 }}
 {{- end -}}
diff --git a/library/ix-dev/charts/diskoverdata/templates/_persistence.tpl b/library/ix-dev/charts/diskoverdata/templates/_persistence.tpl
index d623b24ba8..75c4a2fac4 100644
--- a/library/ix-dev/charts/diskoverdata/templates/_persistence.tpl
+++ b/library/ix-dev/charts/diskoverdata/templates/_persistence.tpl
@@ -21,6 +21,11 @@ persistence:
       elasticsearch:
         elasticsearch:
           mountPath: /usr/share/elasticsearch/data
+        {{- if and (eq .Values.diskoverStorage.esdata.type "ixVolume")
+                  (not (.Values.diskoverStorage.esdata.ixVolumeConfig | default dict).aclEnable) }}
+        01-permissions:
+          mountPath: /mnt/directories/esdata
+        {{- end }}
   defaultcrawler:
     enabled: true
     type: configmap