diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2019-12-09 11:26:40 +0100 |
|---|---|---|
| committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2019-12-12 11:12:52 +0100 |
| commit | 9deede9016bf6c06521b88f11374a52f6d802bd2 (patch) | |
| tree | 230ce2998adf8c7d2ab70a9543c32bd9cf266d11 /kubernetes/pomba/charts/pomba-data-router/templates/pvc.yaml | |
| parent | 8501d7cee5a887f9e19d5fe3671ef8180bce526b (diff) | |
[POMBA] Use global storage templates for PVC
OOM has now templates in order to create the needed PVC, using:
* a PV with a specific class when using a common nfs mount path between
nodes (sames as today use) --> is the default behavior today
* or a storage class if we want to use dynamic PV.
On this case, we use (in order of priority):
- persistence.storageClassOverride if set on the chart
- global.persistence.storageClass if set globally
- persistence.storageClass if set on the chart
I've also created a PV/PVC couple for logs of ES as it was hardcoded in
the deployment.
Change-Id: Ic2da694da008803f5afc1a0e0de38a1428c5b40e
Issue-ID: OOM-1227
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Diffstat (limited to 'kubernetes/pomba/charts/pomba-data-router/templates/pvc.yaml')
| -rw-r--r-- | kubernetes/pomba/charts/pomba-data-router/templates/pvc.yaml | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/kubernetes/pomba/charts/pomba-data-router/templates/pvc.yaml b/kubernetes/pomba/charts/pomba-data-router/templates/pvc.yaml index e27c3311e9..49f1d6886f 100644 --- a/kubernetes/pomba/charts/pomba-data-router/templates/pvc.yaml +++ b/kubernetes/pomba/charts/pomba-data-router/templates/pvc.yaml @@ -25,24 +25,16 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" + name: {{ include "common.fullname" . }} {{- if .Values.persistence.annotations }} annotations: {{ toYaml .Values.persistence.annotations | indent 4 }} {{- end }} spec: - selector: - matchLabels: - name: {{ include "common.fullname" . }} accessModes: - {{ .Values.persistence.accessMode }} + storageClassName: {{ include "common.storageClass" . }} resources: requests: storage: {{ .Values.persistence.size }} -{{- if .Values.persistence.storageClass }} -{{- if (eq "-" .Values.persistence.storageClass) }} - storageClassName: "" -{{- else }} - storageClassName: "{{ .Values.persistence.storageClass }}" -{{- end }} -{{- end }} {{- end -}} |