Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

[stable/mongodb] Fix 'storageClass' macros #16546

Merged
merged 1 commit into from Aug 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion stable/mongodb/Chart.yaml
@@ -1,6 +1,6 @@
apiVersion: v1
name: mongodb
version: 7.2.1
version: 7.2.2
appVersion: 4.0.12
description: NoSQL document-oriented database that stores JSON-like documents with dynamic schemas, simplifying the integration of data in content-driven applications.
keywords:
Expand Down
12 changes: 6 additions & 6 deletions stable/mongodb/templates/_helpers.tpl
Expand Up @@ -202,25 +202,25 @@ but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else
{{- if .Values.global -}}
{{- if .Values.global.storageClass -}}
{{- if (eq "-" .Values.global.storageClass) -}}
{{- printf "\"\"" -}}
{{- printf "storageClassName: \"\"" -}}
{{- else }}
{{- printf "%s" .Values.global.storageClass -}}
{{- printf "storageClassName: %s" .Values.global.storageClass -}}
{{- end -}}
{{- else -}}
{{- if .Values.persistence.storageClass -}}
{{- if (eq "-" .Values.persistence.storageClass) -}}
{{- printf "\"\"" -}}
{{- printf "storageClassName: \"\"" -}}
{{- else }}
{{- printf "%s" .Values.persistence.storageClass -}}
{{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{- else -}}
{{- if .Values.persistence.storageClass -}}
{{- if (eq "-" .Values.persistence.storageClass) -}}
{{- printf "\"\"" -}}
{{- printf "storageClassName: \"\"" -}}
{{- else }}
{{- printf "%s" .Values.persistence.storageClass -}}
{{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
{{- end -}}
{{- end -}}
{{- end -}}
Expand Down
2 changes: 1 addition & 1 deletion stable/mongodb/templates/pvc-standalone.yaml
Expand Up @@ -16,5 +16,5 @@ spec:
resources:
requests:
storage: {{ .Values.persistence.size | quote }}
storageClassName: {{ include "mongodb.storageClass" . }}
{{ include "mongodb.storageClass" . }}
{{- end }}
2 changes: 1 addition & 1 deletion stable/mongodb/templates/statefulset-primary-rs.yaml
Expand Up @@ -281,7 +281,7 @@ spec:
resources:
requests:
storage: {{ .Values.persistence.size | quote }}
storageClassName: {{ include "mongodb.storageClass" . }}
{{ include "mongodb.storageClass" . }}
{{- else }}
- name: datadir
emptyDir: {}
Expand Down
2 changes: 1 addition & 1 deletion stable/mongodb/templates/statefulset-secondary-rs.yaml
Expand Up @@ -255,7 +255,7 @@ spec:
resources:
requests:
storage: {{ .Values.persistence.size | quote }}
storageClassName: {{ include "mongodb.storageClass" . }}
{{ include "mongodb.storageClass" . }}
{{- else }}
- name: datadir
emptyDir: {}
Expand Down