File tree Expand file tree Collapse file tree 1 file changed +7
-3
lines changed
Expand file tree Collapse file tree 1 file changed +7
-3
lines changed Original file line number Diff line number Diff line change 88{{- $imageTag := include "overseer.tag" . -}}
99{{- $storage := (include "common.storage.merged" .) | fromYaml }}
1010
11+ {{- /* PVC handling - check if both PVCs point to the same claim */ -}}
12+ {{- $samePvc := and $storage.fs.ingestionSourcePvc.enabled $storage.fs.internalPvc.enabled (eq $storage.fs.internalPvc.name $storage.fs.ingestionSourcePvc.name) }}
13+ {{- $internalVolumeName := ternary "ingestion-storage" "internal-storage" $samePvc }}
14+
1115{{ $gpkgPath := (printf "%s/%s" $storage.fs.internalPvc.mountPath $storage.fs.internalPvc.gpkgSubPath) }}
1216
1317{{- if .Values.enabled -}}
6670 {{- end }}
6771 volumeMounts :
6872 {{- if $storage.fs.internalPvc.enabled }}
69- - name : internal-storage
73+ - name : {{ $internalVolumeName }}
7074 mountPath : {{ $storage.fs.internalPvc.mountPath }}
7175 {{- end }}
7276 {{- if $storage.fs.ingestionSourcePvc.enabled }}
@@ -141,7 +145,7 @@ spec:
141145 {{- tpl (toYaml .Values.sidecars) . | nindent 8 }}
142146 {{- end }}
143147 volumes :
144- {{- if $storage.fs.internalPvc.enabled }}
148+ {{- if and $storage.fs.internalPvc.enabled (not $samePvc) }}
145149 - name : internal-storage
146150 persistentVolumeClaim :
147151 claimName : {{ $storage.fs.internalPvc.name }}
@@ -150,7 +154,7 @@ spec:
150154 - name : ingestion-storage
151155 persistentVolumeClaim :
152156 claimName : {{ $storage.fs.ingestionSourcePvc.name }}
153- {{- end }}
157+ {{- end }}
154158 - name : nginx-config
155159 configMap :
156160 name : ' nginx-extra-configmap'
You can’t perform that action at this time.
0 commit comments