diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 0c54a53..ba90513 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.3 -appVersion: 2.1.3 +version: 2.1.4 +appVersion: 2.1.4 dependencies: - name: mclabels version: 1.0.1 diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml index 0d8cdfa..d218be7 100644 --- a/helm/templates/deployment.yaml +++ b/helm/templates/deployment.yaml @@ -10,9 +10,11 @@ {{- $s3 := (include "common.s3.merged" .) | fromYaml }} {{- $fs := (include "common.fs.merged" .) | fromYaml }} {{- $storage := (include "common.storage.merged" .) | fromYaml }} -{{ $gpkgPath := clean (printf "%s/%s" $fs.internalPvc.mountPath $fs.ingestionSourcePvc.gpkgSubPath) }} -{{ $tilePath := clean (printf "%s/%s" $fs.internalPvc.mountPath $fs.internalPvc.tilesSubPath) }} -{{ $sources := clean (ternary $tilePath (printf "%s/%s" $fs.ingestionSourcePvc.mountPath $fs.ingestionSourcePvc.subPath) .Values.isExporter ) }} +{{ $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) }} +{{ $sourcesRaw := ternary $tilePath $ingestionSourcePath .Values.isExporter }} + apiVersion: apps/v1 kind: Deployment