diff options
| author |   Daniel Rose <dr695h@att.com> | 2019-12-11 19:25:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-12-11 19:25:44 +0000 |
| commit | bc1480dc6c66d23ed04feaff93fca10da6a65a8f (patch) | |
| tree | 4d8c267c83e3fe7ca2cbafadd4ebdfd422e0936c | |
| parent | dbb4ed7385a22871a0ffb719f04e0f0f257d0ab3 (diff) | |
| parent | a58fe83cfbf60ae058819daf7e6d942f96e603cf (diff) | |
Merge "Use global storage templates for PVC"
| -rw-r--r-- | templates/pv.yaml | 3 | ||||
| -rw-r--r-- | templates/pvc.yaml | 11 |
2 files changed, 4 insertions, 10 deletions
diff --git a/templates/pv.yaml b/templates/pv.yaml index 184728f..63829cb 100644 --- a/templates/pv.yaml +++ b/templates/pv.yaml @@ -15,6 +15,7 @@ */}} {{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) -}} +{{- if eq "True" (include "common.needPV" .) -}} kind: PersistentVolume apiVersion: v1 metadata: @@ -31,7 +32,9 @@ spec: storage: {{ .Values.persistence.size}} accessModes: - {{ .Values.persistence.accessMode }} + storageClassName: "{{ include "common.fullname" . }}-data" persistentVolumeReclaimPolicy: {{ .Values.persistence.volumeReclaimPolicy }} hostPath: path: {{ .Values.global.persistence.mountPath | default .Values.persistence.mountPath }}/{{ .Release.Name }}/{{ .Values.persistence.mountSubPath }} {{- end -}} +{{- end -}} diff --git a/templates/pvc.yaml b/templates/pvc.yaml index e27c331..e21babb 100644 --- a/templates/pvc.yaml +++ b/templates/pvc.yaml @@ -30,19 +30,10 @@ metadata: {{ toYaml .Values.persistence.annotations | indent 4 }} {{- end }} spec: - selector: - matchLabels: - name: {{ include "common.fullname" . }} accessModes: - {{ .Values.persistence.accessMode }} + storageClassName: {{ include "common.storageClass" . }} resources: requests: storage: {{ .Values.persistence.size }} -{{- if .Values.persistence.storageClass }} -{{- if (eq "-" .Values.persistence.storageClass) }} - storageClassName: "" -{{- else }} - storageClassName: "{{ .Values.persistence.storageClass }}" -{{- end }} -{{- end }} {{- end -}} |