From 60141128dc3b8224b9f414c599d3c8826574c45c Mon Sep 17 00:00:00 2001 From: Sylvain Desbureaux Date: Fri, 29 Nov 2019 15:55:11 +0100 Subject: [DMaaP] 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 split the 3 PV from dr-node into 3 files and used range so the number of PV is the same as number of PODs. Change-Id: I46b4e62042ea8330bef8cdc1561fa8bbf3f25d12 Issue-ID: OOM-1227 Signed-off-by: Sylvain Desbureaux --- kubernetes/dmaap/components/dmaap-dr-prov/templates/pvc.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'kubernetes/dmaap/components/dmaap-dr-prov/templates/pvc.yaml') diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/pvc.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/templates/pvc.yaml index 6ff9e6d615..b75daf5f12 100644 --- a/kubernetes/dmaap/components/dmaap-dr-prov/templates/pvc.yaml +++ b/kubernetes/dmaap/components/dmaap-dr-prov/templates/pvc.yaml @@ -18,6 +18,7 @@ # ============LICENSE_END========================================================= */}} {{- if .Values.global.aafEnabled }} +{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }} kind: PersistentVolumeClaim apiVersion: v1 metadata: @@ -33,13 +34,11 @@ metadata: {{ toYaml .Values.persistence.annotations | indent 4 }} {{- end }} spec: - selector: - matchLabels: - name: {{ include "common.fullname" . }}-aaf-props accessModes: - {{ .Values.persistence.accessMode }} - storageClassName: "{{ include "common.fullname" . }}-aaf-props-stcl" + storageClassName: {{ include "common.storageClass" . }} resources: requests: storage: {{ .Values.persistence.aafCredsSize }} -{{ end -}} \ No newline at end of file +{{ end -}} +{{ end -}} -- cgit 1.2.3-korg