mirror of
https://github.com/helm/charts.git
synced 2026-08-23 22:37:45 +00:00
Fix 'storageClass' macros (#16555)
Signed-off-by: Alejandro Moreno <amoreno@bitnami.com>
This commit is contained in:
committed by
Kubernetes Prow Robot
parent
81a38cfa5f
commit
e1a0c0e127
@@ -1,6 +1,6 @@
|
||||
apiVersion: v1
|
||||
name: rabbitmq
|
||||
version: 6.4.1
|
||||
version: 6.4.2
|
||||
appVersion: 3.7.17
|
||||
description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP)
|
||||
keywords:
|
||||
|
||||
@@ -187,25 +187,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 -}}
|
||||
|
||||
@@ -319,5 +319,5 @@ spec:
|
||||
resources:
|
||||
requests:
|
||||
storage: {{ .Values.persistence.size | quote }}
|
||||
storageClassName: {{ include "rabbitmq.storageClass" . }}
|
||||
{{ include "rabbitmq.storageClass" . }}
|
||||
{{- end }}
|
||||
|
||||
Reference in New Issue
Block a user