DevOps/truecharts
2
0
Fork 0
Code Issues Pull Requests Actions 32 Packages Projects Releases 1 Wiki Activity

fix(common): ensure storageClassName gets rendered correctly (#1385)

Browse Source 
* fix(common): ensure storageClassName gets rendered correctly

* Add a canary test to common

* remove canary for now
This commit is contained in:
Kjeld Schouten-Lebbing
2021-11-23 11:21:13 +01:00
committed by GitHub
parent 151ab190b6
commit 342f88afbf
2 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/library/common/Chart.yaml
+1 -1
View File
@@ -15,4 +15,4 @@ maintainers:
name: common
sources: null
type: library
version: 8.9.1
version: 8.9.2
charts/library/common/templates/lib/utils/_storage.tpl
+18 -22
View File
@@ -6,34 +6,30 @@ Return the proper Storage Class
{{- define "common.storage.class" -}}
{{- $storageClass := .persistence.storageClass -}}
{{- $output := "" -}}
{{- if $storageClass -}}
{{- if (eq "-" $storageClass) -}}
{{- printf "storageClassName: \"\"" -}}
{{- $output = "\"\"" -}}
{{- else if (eq "SCALE-ZFS" $storageClass ) }}
{{- ( printf "storageClassName: ix-storage-class-%s" .global.Release.Name ) -}}
{{- $output = ( printf "ix-storage-class-%s" .global.Release.Name ) -}}
{{- else }}
{{- printf "storageClassName: %s" $storageClass -}}
{{- $output = $storageClass -}}
{{- end -}}
{{- else if .global }}
{{- if .global.Values.storageClass -}}
{{- $output = .global.Values.storageClass -}}
{{- else if .global.Values.ixChartContext }}
{{- $output = ( printf "ix-storage-class-%s" .global.Release.Name ) -}}
{{- else if .global.Values.global -}}
{{- if .global.Values.global.storageClass -}}
{{- $output = .global.Values.global.storageClass -}}
{{- end -}}
{{- if or ( .global.Values.global.ixChartContext ) ( .global.Values.global.isSCALE ) -}}
{{- $output = ( printf "ix-storage-class-%s" .global.Release.Name ) -}}
{{- end }}
{{- end -}}
{{- end -}}
{{- if .global }}
{{- if .global.Values.global -}}
{{- if .global.Values.global.storageClass -}}
{{- $storageClass = .global.Values.global.storageClass -}}
{{- end -}}
{{- if or ( .global.Values.global.ixChartContext ) ( .global.Values.global.isSCALE ) -}}
{{- ( printf "storageClassName: ix-storage-class-%s" .global.Release.Name ) -}}
{{- end }}
{{- end -}}
{{- if .global.Values.storageClass -}}
{{- $storageClass = .global.Values.storageClass -}}
{{- end -}}
{{- if .global.Values.ixChartContext }}
{{- ( printf "storageClassName: ix-storage-class-%s" .global.Release.Name ) -}}
{{- end }}
{{- end }}
{{- printf "storageClassName: %s" $output -}}
{{- end -}}