Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-03-16 14:57:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/elasticsearch] Fixed master.persistence.storageClass (#1932)

Browse Source 
* Fixed master.persistence.storageClass

The master.persistence.storageClass was never read and was always
replaced by the data.persistence.storageClass. This change renames the
elasticsearch.data.storageClass template to elasticsearch.storageClass
so it can be used by both the data and master nodes.
This commit is contained in:
Eric Stokes
2020-02-20 08:45:41 +00:00
committed by GitHub
parent 6072df405d
commit 5280714f4d
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
bitnami/elasticsearch/templates/_helpers.tpl
View File

@@ -278,34 +278,36 @@ Also, we can't use a single if because lazy evaluation is not an option
{{/*
Return the proper Storage Class
Usage:
{{ include "elasticsearch.storageClass" (dict "global" .Values.global "local" .Values.master) }}
*/}}
{{- define "elasticsearch.data.storageClass" -}}
{{- define "elasticsearch.storageClass" -}}
{{/*
Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else logic.
*/}}
{{- if .Values.global -}}
{{- if .Values.global.storageClass -}}
{{- if (eq "-" .Values.global.storageClass) -}}
{{- if .global -}}
{{- if .global.storageClass -}}
{{- if (eq "-" .global.storageClass) -}}
{{- printf "storageClassName: \"\"" -}}
{{- else }}
{{- printf "storageClassName: %s" .Values.global.storageClass -}}
{{- printf "storageClassName: %s" .global.storageClass -}}
{{- end -}}
{{- else -}}
{{- if .Values.data.persistence.storageClass -}}
{{- if (eq "-" .Values.data.persistence.storageClass) -}}
{{- if .local.persistence.storageClass -}}
{{- if (eq "-" .local.persistence.storageClass) -}}
{{- printf "storageClassName: \"\"" -}}
{{- else }}
{{- printf "storageClassName: %s" .Values.data.persistence.storageClass -}}
{{- printf "storageClassName: %s" .local.persistence.storageClass -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{- else -}}
{{- if .Values.data.persistence.storageClass -}}
{{- if (eq "-" .Values.data.persistence.storageClass) -}}
{{- if .local.persistence.storageClass -}}
{{- if (eq "-" .local.persistence.storageClass) -}}
{{- printf "storageClassName: \"\"" -}}
{{- else }}
{{- printf "storageClassName: %s" .Values.data.persistence.storageClass -}}
{{- printf "storageClassName: %s" .local.persistence.storageClass -}}
{{- end -}}
{{- end -}}
{{- end -}}

3
bitnami/elasticsearch/templates/data-statefulset.yaml
View File

@@ -167,7 +167,8 @@ spec:
{{- end }}
spec:
accessModes: {{- toYaml .Values.data.persistence.accessModes | nindent 10 }}
{{ include "elasticsearch.data.storageClass" . }}
{{ $storage := dict "global" .Values.global "local" .Values.data }}
{{ include "elasticsearch.storageClass" $storage }}
resources:
requests:
storage: {{ .Values.data.persistence.size | quote }}

3
bitnami/elasticsearch/templates/master-statefulset.yaml
View File

@@ -171,7 +171,8 @@ spec:
{{- end }}
spec:
accessModes: {{- toYaml .Values.master.persistence.accessModes | nindent 10 }}
{{ include "elasticsearch.data.storageClass" . }}
{{ $storage := dict "global" .Values.global "local" .Values.master }}
{{ include "elasticsearch.storageClass" $storage }}
resources:
requests:
storage: {{ .Values.master.persistence.size | quote }}