From 9deede9016bf6c06521b88f11374a52f6d802bd2 Mon Sep 17 00:00:00 2001 From: Sylvain Desbureaux Date: Mon, 9 Dec 2019 11:26:40 +0100 Subject: [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 --- .../charts/pomba-elasticsearch/templates/pvc.yaml | 25 ---------------------- 1 file changed, 25 deletions(-) delete mode 100644 kubernetes/pomba/charts/pomba-elasticsearch/templates/pvc.yaml (limited to 'kubernetes/pomba/charts/pomba-elasticsearch/templates/pvc.yaml') diff --git a/kubernetes/pomba/charts/pomba-elasticsearch/templates/pvc.yaml b/kubernetes/pomba/charts/pomba-elasticsearch/templates/pvc.yaml deleted file mode 100644 index c046f4604a..0000000000 --- a/kubernetes/pomba/charts/pomba-elasticsearch/templates/pvc.yaml +++ /dev/null @@ -1,25 +0,0 @@ -{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) -}} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ include "common.fullname" . }} - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" -{{- if .Values.persistence.annotations }} - annotations: -{{ toYaml .Values.persistence.annotations | indent 4 }} -{{- end }} -spec: - selector: - matchLabels: - name: {{ include "common.fullname" . }} - accessModes: - - {{ .Values.persistence.accessMode }} - resources: - requests: - storage: {{ .Values.persistence.size }} -{{- end -}} -- cgit 1.2.3-korg