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-elasticsearch/templates/deployment.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-elasticsearch/templates/deployment.yaml')
| -rw-r--r-- | kubernetes/pomba/charts/pomba-elasticsearch/templates/deployment.yaml | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/kubernetes/pomba/charts/pomba-elasticsearch/templates/deployment.yaml b/kubernetes/pomba/charts/pomba-elasticsearch/templates/deployment.yaml index 93b5539cfc..2e6f1fde54 100644 --- a/kubernetes/pomba/charts/pomba-elasticsearch/templates/deployment.yaml +++ b/kubernetes/pomba/charts/pomba-elasticsearch/templates/deployment.yaml @@ -108,10 +108,18 @@ spec: - key: elasticsearch.yml path: elasticsearch.yml - name: {{ include "common.fullname" . }}-data + {{- if .Values.persistence.enabled }} persistentVolumeClaim: claimName: {{ include "common.fullname" . }} + {{- else }} + emptyDir: {} + {{- end }} - name: {{ include "common.fullname" . }}-logs - hostPath: - path: {{ .Values.global.persistence.mountPath | default .Values.persistence.mountPath }}/{{ .Release.Name }}/{{ .Values.persistence.mountSubPathLogs }} + {{- if .Values.persistence.enabled }} + persistentVolumeClaim: + claimName: {{ include "common.fullname" . }}-logs + {{- else }} + emptyDir: {} + {{- end }} imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" |