From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Thu, 23 Jan 2020 10:45:43 +0000 (+0100)
Subject: [COMMON] Fix PV/PVC for postgres
X-Git-Tag: 6.0.0~441^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b20067e569ff2ee59b59170089ba1b1efd322acb;p=oom.git

[COMMON] Fix PV/PVC for postgres

When creating https://gerrit.onap.org/r/c/oom/+/99478, forgot to
backport storage class part of https://gerrit.onap.org/r/c/oom/+/98962.

Issue-ID: OOM-2234
Issue-ID: OOM-1227
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: I3c42b28ad5bea67eda004b0209c8a21783b539f1
---

diff --git a/kubernetes/common/postgres/templates/pv-primary.yaml b/kubernetes/common/postgres/templates/pv-primary.yaml
index 096f0c9d2b..1764868ffc 100644
--- a/kubernetes/common/postgres/templates/pv-primary.yaml
+++ b/kubernetes/common/postgres/templates/pv-primary.yaml
@@ -14,6 +14,7 @@
 # # limitations under the License.
 */}}
 {{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) -}}
+{{- if include "common.needPV" . -}}
 kind: PersistentVolume
 apiVersion: v1
 metadata:
@@ -35,3 +36,4 @@ spec:
   hostPath:
     path: {{ .Values.global.persistence.mountPath | default .Values.persistence.mountPath }}/{{ .Release.Name }}/{{ .Values.persistence.mountSubPath }}/primary
 {{- end -}}
+{{- end -}}
diff --git a/kubernetes/common/postgres/templates/pv-replica.yaml b/kubernetes/common/postgres/templates/pv-replica.yaml
index a98abefba0..b67cac0c26 100644
--- a/kubernetes/common/postgres/templates/pv-replica.yaml
+++ b/kubernetes/common/postgres/templates/pv-replica.yaml
@@ -14,6 +14,7 @@
 # # limitations under the License.
 */}}
 {{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) -}}
+{{- if include "common.needPV" . -}}
 kind: PersistentVolume
 apiVersion: v1
 metadata:
@@ -35,3 +36,4 @@ spec:
   hostPath:
     path: {{ .Values.global.persistence.mountPath | default .Values.persistence.mountPath }}/{{ .Release.Name }}/{{ .Values.persistence.mountSubPath }}/replica
 {{- end -}}
+{{- end -}}
diff --git a/kubernetes/common/postgres/templates/pvc-primary.yaml b/kubernetes/common/postgres/templates/pvc-primary.yaml
index 05a5088966..e529da1bd5 100644
--- a/kubernetes/common/postgres/templates/pvc-primary.yaml
+++ b/kubernetes/common/postgres/templates/pvc-primary.yaml
@@ -36,5 +36,10 @@ spec:
   resources:
     requests:
       storage: {{ .Values.persistence.size }}
+{{- if include "common.needPV" . }}
+  storageClassName: "{{ include "common.fullname" . }}-primary"
+{{- else }}
+  storageClassName: {{ include "common.storageClass" . }}
+{{- end }}
   storageClassName: "{{ include "common.fullname" . }}-primary"
 {{- end -}}
diff --git a/kubernetes/common/postgres/templates/pvc-replica.yaml b/kubernetes/common/postgres/templates/pvc-replica.yaml
index f740521919..41199b6861 100644
--- a/kubernetes/common/postgres/templates/pvc-replica.yaml
+++ b/kubernetes/common/postgres/templates/pvc-replica.yaml
@@ -36,5 +36,9 @@ spec:
   resources:
     requests:
       storage: {{ .Values.persistence.size }}
+{{- if include "common.needPV" . }}
   storageClassName: "{{ include "common.fullname" . }}-replica"
+{{- else }}
+  storageClassName: {{ include "common.storageClass" . }}
+{{- end }}
 {{- end -}}