mirror of
https://github.com/helm/charts.git
synced 2026-08-23 22:37:45 +00:00
[stable/orangehrm] Fix 'storageClass' macros (#16550)
* Fix 'storageClass' macros Signed-off-by: Alejandro Moreno <amoreno@bitnami.com> * Update MariaDB dependency Signed-off-by: juan131 <juan@bitnami.com>
This commit is contained in:
committed by
Kubernetes Prow Robot
parent
aa50f3a241
commit
40bf3da08b
@@ -1,6 +1,6 @@
|
||||
apiVersion: v1
|
||||
name: orangehrm
|
||||
version: 6.1.1
|
||||
version: 6.1.2
|
||||
appVersion: 4.3.2-0
|
||||
description: OrangeHRM is a free HR management system that offers a wealth of modules
|
||||
to suit the needs of your business.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
dependencies:
|
||||
- name: mariadb
|
||||
repository: https://kubernetes-charts.storage.googleapis.com/
|
||||
version: 6.7.2
|
||||
version: 6.8.2
|
||||
digest: sha256:a363428d6463718a9523a88c70e485218373e315f2979cb1bb17b034ec2be96a
|
||||
generated: "2019-07-25T09:26:32.03089+02:00"
|
||||
generated: "2019-08-22T17:49:48.731564+02:00"
|
||||
|
||||
@@ -130,25 +130,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.orangehrm.storageClass -}}
|
||||
{{- if (eq "-" .Values.persistence.orangehrm.storageClass) -}}
|
||||
{{- printf "\"\"" -}}
|
||||
{{- printf "storageClassName: \"\"" -}}
|
||||
{{- else }}
|
||||
{{- printf "%s" .Values.persistence.orangehrm.storageClass -}}
|
||||
{{- printf "storageClassName: %s" .Values.persistence.orangehrm.storageClass -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
{{- else -}}
|
||||
{{- if .Values.persistence.orangehrm.storageClass -}}
|
||||
{{- if (eq "-" .Values.persistence.orangehrm.storageClass) -}}
|
||||
{{- printf "\"\"" -}}
|
||||
{{- printf "storageClassName: \"\"" -}}
|
||||
{{- else }}
|
||||
{{- printf "%s" .Values.persistence.orangehrm.storageClass -}}
|
||||
{{- printf "storageClassName: %s" .Values.persistence.orangehrm.storageClass -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
|
||||
@@ -14,5 +14,5 @@ spec:
|
||||
resources:
|
||||
requests:
|
||||
storage: {{ .Values.persistence.orangehrm.size | quote }}
|
||||
storageClassName: {{ include "orangehrm.storageClass" . }}
|
||||
{{ include "orangehrm.storageClass" . }}
|
||||
{{- end -}}
|
||||
|
||||
Reference in New Issue
Block a user