From 4982bd32b1a158d673ccffadd79f6cc50f54649f Mon Sep 17 00:00:00 2001
From: almog8k <almog8k@gmail.com>
Date: Mon, 26 Jan 2026 17:21:11 +0200
Subject: [PATCH 1/2] fix: resolve duplicate volume claims in PVC handling
 logic

---
 helm/templates/deployment.yaml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml
index 83f72ed..30dede3 100644
--- a/helm/templates/deployment.yaml
+++ b/helm/templates/deployment.yaml
@@ -8,6 +8,10 @@
 {{- $imageTag := include "overseer.tag" . -}}
 {{- $storage := (include "common.storage.merged" .) | fromYaml }}
 
+{{- /* PVC handling - check if both PVCs point to the same claim */ -}}
+{{- $samePvc := and $storage.fs.ingestionSourcePvc.enabled $storage.fs.internalPvc.enabled (eq $storage.fs.internalPvc.name $storage.fs.ingestionSourcePvc.name) }}
+{{- $internalVolumeName := ternary "ingestion-storage" "internal-storage" $samePvc }}
+
 {{ $gpkgPath := (printf "%s/%s" $storage.fs.internalPvc.mountPath $storage.fs.internalPvc.gpkgSubPath) }}
 
 {{- if .Values.enabled -}}
@@ -66,7 +70,7 @@ spec:
           {{- end }}
           volumeMounts:
             {{- if $storage.fs.internalPvc.enabled }}
-            - name: internal-storage
+            - name: {{ $internalVolumeName }}
               mountPath: {{ $storage.fs.internalPvc.mountPath }}
             {{- end }}
             {{- if $storage.fs.ingestionSourcePvc.enabled }}
@@ -141,7 +145,7 @@ spec:
         {{- tpl (toYaml .Values.sidecars) . | nindent 8 }}
         {{- end }}
       volumes:
-        {{- if $storage.fs.internalPvc.enabled }}  
+           {{- if and $storage.fs.internalPvc.enabled (not $samePvc) }}  
         - name: internal-storage
           persistentVolumeClaim:
             claimName: {{ $storage.fs.internalPvc.name }}
@@ -150,7 +154,7 @@ spec:
         - name: ingestion-storage
           persistentVolumeClaim:
             claimName: {{ $storage.fs.ingestionSourcePvc.name }}
-        {{- end }}          
+        {{- end }}
         - name: nginx-config
           configMap:
             name: 'nginx-extra-configmap'      

From 0e39ab8b93d5220460aebe024ee92b1c5d3803d3 Mon Sep 17 00:00:00 2001
From: almog8k <almog8k@gmail.com>
Date: Mon, 26 Jan 2026 17:24:03 +0200
Subject: [PATCH 2/2] fix: correct indentation for internal PVC volume
 condition in deployment.yaml

---
 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 30dede3..366e134 100644
--- a/helm/templates/deployment.yaml
+++ b/helm/templates/deployment.yaml
@@ -145,7 +145,7 @@ spec:
         {{- tpl (toYaml .Values.sidecars) . | nindent 8 }}
         {{- end }}
       volumes:
-           {{- if and $storage.fs.internalPvc.enabled (not $samePvc) }}  
+        {{- if and $storage.fs.internalPvc.enabled (not $samePvc) }}  
         - name: internal-storage
           persistentVolumeClaim:
             claimName: {{ $storage.fs.internalPvc.name }}