diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2019-12-09 11:06:39 +0100 |
|---|---|---|
| committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2019-12-16 10:54:45 +0100 |
| commit | 25e01d5ab10a68ec4689e4860edcf3c9640d1586 (patch) | |
| tree | 4fc841a64dc0e036121e3be85649a706e251e845 /kubernetes/sdnc/templates/pvc.yaml | |
| parent | 72c71c0b832a169c03bcdbaa5997956e30f62c7c (diff) | |
[SDNC] 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 used "range" for PV creation of the statefulset
I've created one file per PV (one for mdsal, one for certs).
sdnc-prom was using hostpath directly on deployment, move to a PV/PVC.
Change-Id: Id9eed3b13ac85595c386e380f41cfbc38b52c69f
Issue-ID: OOM-1227
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Diffstat (limited to 'kubernetes/sdnc/templates/pvc.yaml')
| -rw-r--r-- | kubernetes/sdnc/templates/pvc.yaml | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/kubernetes/sdnc/templates/pvc.yaml b/kubernetes/sdnc/templates/pvc.yaml index aa9515b6b5..21c2dbc8cc 100644 --- a/kubernetes/sdnc/templates/pvc.yaml +++ b/kubernetes/sdnc/templates/pvc.yaml @@ -2,31 +2,27 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: - name: {{ include "common.fullname" .}}-pvc-certs + name: {{ include "common.fullname" .}}-certs namespace: {{ include "common.namespace" . }} labels: - app: {{ include "common.name" . }}-pvc-certs + app: {{ include "common.name" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" + name: {{ include "common.fullname" . }}-certs {{- if .Values.certpersistence.annotations }} annotations: {{ toYaml .Values.certpersistence.annotations | indent 4 }} {{- end }} spec: - selector: - matchLabels: - app: {{ include "common.name" . }}-pv-certs accessModes: - {{ .Values.certpersistence.accessMode }} resources: requests: storage: {{ .Values.certpersistence.size }} -{{- if .Values.certpersistence.storageClass }} -{{- if (eq "-" .Values.certpersistence.storageClass) }} - storageClassName: "" +{{- if eq "True" (include "common.needPV" .) }} + storageClassName: "{{ include "common.fullname" . }}-certs" {{- else }} - storageClassName: "{{ .Values.certpersistence.storageClass }}" -{{- end }} -{{- end }} -{{- end -}}
\ No newline at end of file + storageClassName: {{ include "common.storageClass" . }} + {{- end }} +{{- end -}} |