From 6b8608266daab098b684140b6abfa28015385b95 Mon Sep 17 00:00:00 2001
From: almog8k <almog8k@gmail.com>
Date: Thu, 22 Jan 2026 14:57:42 +0200
Subject: [PATCH 1/3] feat: update PVC paths and enable flags in deployment and
 values files

---
 helm/templates/deployment.yaml | 21 ++++++++++++++++-----
 helm/values.yaml               |  2 ++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml
index 955ef63..a1a228f 100644
--- a/helm/templates/deployment.yaml
+++ b/helm/templates/deployment.yaml
@@ -10,8 +10,8 @@
 {{- $s3 := (include "common.s3.merged" .) | fromYaml }}
 {{- $fs := (include "common.fs.merged" .) | fromYaml }}
 {{- $storage := (include "common.storage.merged" .) | fromYaml }}
-{{ $gpkgPath := (printf "%s%s" "/app/tiles_outputs/" $fs.internalPvc.gpkgSubPath) }}
-{{ $tilePath := (printf "%s%s" "/app/tiles_outputs/" $fs.internalPvc.tilesSubPath) }}
+{{ $gpkgPath := (printf "%s%s" $fs.ingestionSourcePvc.mountPath $fs.ingestionSourcePvc.gpkgSubPath) }}
+{{ $tilePath := (printf "%s%s"  $fs.internalPvc.mountPath $fs.internalPvc.tilesSubPath) }}
 {{ $sources := (ternary $tilePath (printf "%s%s" "/layerSources/" $fs.ingestionSourcePvc.subPath) .Values.isExporter ) }}
 
 apiVersion: apps/v1
@@ -65,9 +65,16 @@ spec:
         - name: {{ $cloudProviderImagePullSecretName | quote }}
     {{- end }}
       volumes:
+      {{- if $fs.ingestionSourcePvc.enabled }}
       - name: ingestion-storage
         persistentVolumeClaim:
           claimName: {{ $fs.ingestionSourcePvc.name }}
+      {{- end }}
+      {{- if $fs.internalPvc.enabled }}
+      - name: internal-storage
+        persistentVolumeClaim:
+          claimName: {{ $fs.internalPvc.name }}
+      {{- end }}    
       {{- if .Values.global.ca.secretName }}
       - name: root-ca
         secret:
@@ -120,10 +127,14 @@ spec:
               containerPort: 8080
               protocol: TCP
           volumeMounts:
+          {{- if $fs.ingestionSourcePvc.enabled }}
             - name: ingestion-storage
-              mountPath: /layerSources
-            - name: ingestion-storage
-              mountPath: /app/tiles_outputs
+              mountPath: {{ $fs.ingestionSourcePvc.mountPath }}
+          {{- end }}
+          {{- if $fs.internalPvc.enabled }}
+            - name: internal-storage
+              mountPath: {{ $fs.internalPvc.mountPath }}
+          {{- end }}
             {{- if .Values.global.ca.secretName }}
             - name: root-ca
               mountPath: {{ printf "%s/%s" .Values.global.ca.path .Values.global.ca.key | quote }}
diff --git a/helm/values.yaml b/helm/values.yaml
index 169bfb9..a1f3806 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -68,9 +68,11 @@ storage:
   tilesStorageProvider: ""
   fs:
     ingestionSourcePvc:
+      enabled: false
       name: ""
       subPath: ""
     internalPvc:
+      enabled: false
       name: ""
       tilesSubPath: ""
       gpkgSubPath: ""

From b48c8a744c5120c46059b084e63299d59efa67f4 Mon Sep 17 00:00:00 2001
From: almog8k <almog8k@gmail.com>
Date: Thu, 22 Jan 2026 15:18:46 +0200
Subject: [PATCH 2/3] fix: correct PVC path references in deployment template

---
 helm/templates/deployment.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml
index a1a228f..da95de5 100644
--- a/helm/templates/deployment.yaml
+++ b/helm/templates/deployment.yaml
@@ -10,9 +10,9 @@
 {{- $s3 := (include "common.s3.merged" .) | fromYaml }}
 {{- $fs := (include "common.fs.merged" .) | fromYaml }}
 {{- $storage := (include "common.storage.merged" .) | fromYaml }}
-{{ $gpkgPath := (printf "%s%s" $fs.ingestionSourcePvc.mountPath $fs.ingestionSourcePvc.gpkgSubPath) }}
+{{ $gpkgPath := (printf "%s%s" $fs.internalPvc.mountPath$fs.ingestionSourcePvc.gpkgSubPath) }}
 {{ $tilePath := (printf "%s%s"  $fs.internalPvc.mountPath $fs.internalPvc.tilesSubPath) }}
-{{ $sources := (ternary $tilePath (printf "%s%s" "/layerSources/" $fs.ingestionSourcePvc.subPath) .Values.isExporter ) }}
+{{ $sources := (ternary $tilePath (printf "%s%s" $fs.ingestionSourcePvc.mountPath $fs.ingestionSourcePvc.subPath) .Values.isExporter ) }}
 
 apiVersion: apps/v1
 kind: Deployment

From 11e344b9cd2b4b87971e624ca3b54fe0791c91df Mon Sep 17 00:00:00 2001
From: almog8k <almog8k@gmail.com>
Date: Thu, 22 Jan 2026 15:55:27 +0200
Subject: [PATCH 3/3] fix: correct spacing in gpkgPath variable assignment in
 deployment template

---
 helm/templates/deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml
index da95de5..2f4a2d3 100644
--- a/helm/templates/deployment.yaml
+++ b/helm/templates/deployment.yaml
@@ -10,7 +10,7 @@
 {{- $s3 := (include "common.s3.merged" .) | fromYaml }}
 {{- $fs := (include "common.fs.merged" .) | fromYaml }}
 {{- $storage := (include "common.storage.merged" .) | fromYaml }}
-{{ $gpkgPath := (printf "%s%s" $fs.internalPvc.mountPath$fs.ingestionSourcePvc.gpkgSubPath) }}
+{{ $gpkgPath := (printf "%s%s" $fs.internalPvc.mountPath $fs.ingestionSourcePvc.gpkgSubPath) }}
 {{ $tilePath := (printf "%s%s"  $fs.internalPvc.mountPath $fs.internalPvc.tilesSubPath) }}
 {{ $sources := (ternary $tilePath (printf "%s%s" $fs.ingestionSourcePvc.mountPath $fs.ingestionSourcePvc.subPath) .Values.isExporter ) }}