From a33c4778612e19da9356e0a59a5963298fe91790 Mon Sep 17 00:00:00 2001 From: almog8k Date: Mon, 26 Jan 2026 15:57:16 +0200 Subject: [PATCH 1/2] fix: improve PVC handling logic in deployment template --- helm/templates/deployment.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml index e027009..6ad96d4 100644 --- a/helm/templates/deployment.yaml +++ b/helm/templates/deployment.yaml @@ -10,6 +10,11 @@ {{- $s3 := (include "common.s3.merged" .) | fromYaml }} {{- $fs := (include "common.fs.merged" .) | fromYaml }} {{- $storage := (include "common.storage.merged" .) | fromYaml }} + +{{- /* PVC handling - check if both PVCs point to the same claim */ -}} +{{- $samePvc := and $fs.ingestionSourcePvc.enabled $fs.internalPvc.enabled (eq $fs.internalPvc.name $fs.ingestionSourcePvc.name) }} +{{- $internalVolumeName := ternary "ingestion-storage" "internal-storage" $samePvc }} + {{ $gpkgPath := clean (printf "/%s/%s" $fs.internalPvc.mountPath $fs.ingestionSourcePvc.gpkgSubPath) }} {{ $tilePath := clean (printf "/%s/%s" $fs.internalPvc.mountPath $fs.internalPvc.tilesSubPath) }} {{ $ingestionSourcePath := clean (printf "/%s/%s" $fs.ingestionSourcePvc.mountPath $fs.ingestionSourcePvc.subPath) }} @@ -72,7 +77,7 @@ spec: persistentVolumeClaim: claimName: {{ $fs.ingestionSourcePvc.name }} {{- end }} - {{- if $fs.internalPvc.enabled }} + {{- if and $fs.internalPvc.enabled (not $samePvc) }} - name: internal-storage persistentVolumeClaim: claimName: {{ $fs.internalPvc.name }} @@ -134,7 +139,7 @@ spec: mountPath: {{ $fs.ingestionSourcePvc.mountPath }} {{- end }} {{- if $fs.internalPvc.enabled }} - - name: internal-storage + - name: {{ $internalVolumeName }} mountPath: {{ $fs.internalPvc.mountPath }} {{- end }} {{- if .Values.global.ca.secretName }} From 4d7fa00fc3c21e5bc967e476f7b60b29f0e4635c Mon Sep 17 00:00:00 2001 From: almog8k Date: Mon, 26 Jan 2026 15:57:44 +0200 Subject: [PATCH 2/2] chore: update version to 2.1.6 in Chart.yaml --- helm/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 08669b9..6d576c0 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: gpkg-merger description: A Helm chart for gpkg-merger service # refers to MergerService type: application -version: 2.1.5 -appVersion: 2.1.5 +version: 2.1.6 +appVersion: 2.1.6 dependencies: - name: mclabels version: 1.0.1