From b2025b8648c1910fe88f62d0bf1d396f8deed97f Mon Sep 17 00:00:00 2001
From: mmatokovic <27929908+mmatokovic@users.noreply.github.com>
Date: Fri, 26 Jun 2026 08:40:01 +0200
Subject: [PATCH 1/2] [apigateway] add volumeClaimDeletePolicy support for
 Elasticsearch

Signed-off-by: mmatokovic <27929908+mmatokovic@users.noreply.github.com>
---
 apigateway/helm/Chart.yaml                   | 2 +-
 apigateway/helm/templates/elasticsearch.yaml | 3 +++
 apigateway/helm/values.yaml                  | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/apigateway/helm/Chart.yaml b/apigateway/helm/Chart.yaml
index f2a494d..96ea3d2 100644
--- a/apigateway/helm/Chart.yaml
+++ b/apigateway/helm/Chart.yaml
@@ -33,7 +33,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 3.12.1
+version: 3.13.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/apigateway/helm/templates/elasticsearch.yaml b/apigateway/helm/templates/elasticsearch.yaml
index d9a127d..2170165 100644
--- a/apigateway/helm/templates/elasticsearch.yaml
+++ b/apigateway/helm/templates/elasticsearch.yaml
@@ -36,6 +36,9 @@ spec:
   {{- if .Values.elasticsearch.image }}
   image: {{ .Values.elasticsearch.image }}
   {{- end }}
+  {{- if .Values.elasticsearch.volumeClaimDeletePolicy }}
+  volumeClaimDeletePolicy: { { .Values.elasticsearch.volumeClaimDeletePolicy } }
+  {{- end }}
   http:
     tls:
     {{- if .Values.elasticsearch.tlsEnabled }}
diff --git a/apigateway/helm/values.yaml b/apigateway/helm/values.yaml
index 878da35..5cd15cf 100644
--- a/apigateway/helm/values.yaml
+++ b/apigateway/helm/values.yaml
@@ -729,6 +729,10 @@ elasticsearch:
   # -- Set Pods' Priority Class Name
   priorityClassName: ""
 
+  # -- Volume claim delete policy. Controls when ECK deletes PVCs.
+  # By default the value is DeleteOnScaledownAndClusterDeletion
+  volumeClaimDeletePolicy: ""
+
   # -- Node sets. See official ElasticSearch documentation at:
   # https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-orchestration.html
   # if you specify node sets here the defaultNodeSet will not be used.

From 11e2939242d13e64b4f3336868df9cc4b91c977d Mon Sep 17 00:00:00 2001
From: mmatokovic <27929908+mmatokovic@users.noreply.github.com>
Date: Fri, 26 Jun 2026 12:30:46 +0200
Subject: [PATCH 2/2] [apigateway] render extraConfig in elasticsearch
 defaultNodeSet config block

Signed-off-by: mmatokovic <27929908+mmatokovic@users.noreply.github.com>
---
 apigateway/helm/templates/elasticsearch.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apigateway/helm/templates/elasticsearch.yaml b/apigateway/helm/templates/elasticsearch.yaml
index 2170165..957c367 100644
--- a/apigateway/helm/templates/elasticsearch.yaml
+++ b/apigateway/helm/templates/elasticsearch.yaml
@@ -96,6 +96,9 @@ spec:
         {{- if not .Values.elasticsearch.defaultNodeSet.memoryMapping  }}
         node.store.allow_mmap: false
         {{- end }}
+        { { - with .Values.elasticsearch.defaultNodeSet.extraConfig } }
+        { { - toYaml . | nindent 8 } }
+        { { - end } }
       podTemplate:
         metadata:
           labels: