diff options
| author |   Borislav Glozman <Borislav.Glozman@amdocs.com> | 2019-12-11 14:05:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-12-11 14:05:43 +0000 |
| commit | ef7963b2f0a8b5b4d4e0840435dcbdbf98fccb0d (patch) | |
| tree | 0bc424cce99023cc16ac564bf6366b0117286b49 | |
| parent | 95b77050a816e1ea505c11d5082a1dfc3511ee7d (diff) | |
| parent | 06a449bab3f4713a83f0415f5013bb5602e72e1f (diff) | |
Merge "[SO] Use global storage templates for PVC"
| -rw-r--r-- | kubernetes/so/charts/so-mariadb/templates/pv.yaml | 1 | ||||
| -rw-r--r-- | kubernetes/so/charts/so-mariadb/templates/pvc.yaml | 12 |
2 files changed, 2 insertions, 11 deletions
diff --git a/kubernetes/so/charts/so-mariadb/templates/pv.yaml b/kubernetes/so/charts/so-mariadb/templates/pv.yaml index 5f5d09e2eb..f8315ef5f9 100644 --- a/kubernetes/so/charts/so-mariadb/templates/pv.yaml +++ b/kubernetes/so/charts/so-mariadb/templates/pv.yaml @@ -36,6 +36,7 @@ spec: accessModes: - {{ .Values.persistence.accessMode }} persistentVolumeReclaimPolicy: {{ .Values.persistence.volumeReclaimPolicy }} + storageClassName: "{{ include "common.fullname" . }}-data" hostPath: path: {{ .Values.global.persistence.mountPath | default .Values.persistence.mountPath }}/{{ .Release.Name }}/{{ .Values.persistence.mountSubPath }} {{- end }} diff --git a/kubernetes/so/charts/so-mariadb/templates/pvc.yaml b/kubernetes/so/charts/so-mariadb/templates/pvc.yaml index 92d5eed0c4..17ff7730c7 100644 --- a/kubernetes/so/charts/so-mariadb/templates/pvc.yaml +++ b/kubernetes/so/charts/so-mariadb/templates/pvc.yaml @@ -33,20 +33,10 @@ metadata: {{ toYaml .Values.persistence.annotations | indent 4 }} {{- end }} spec: - selector: - matchLabels: - name: {{ include "common.fullname" . }}-migration accessModes: - {{ .Values.persistence.accessMode }} resources: requests: storage: {{ .Values.persistence.size }} -{{- if .Values.persistence.storageClass }} -{{- if (eq "-" .Values.persistence.storageClass) }} - storageClassName: "" -{{- else }} - storageClassName: "{{ .Values.persistence.storageClass }}" + storageClassName: {{ include "common.storageClass" . }} {{- end }} -{{- end }} -{{- end }} - |