Cloned2Preserve
/
TrueChartsClone
mirror of https://github.com/truecharts/charts.git
1
0
Fork 0
Code

fix(common): correctly set defaults for volumeclaimtemplates and pvc's (#1334) 

* fix(common): correctly set defaults for volumeclaimtemplates and pvc's

* polish

* more polish

* hmmm

* whoops

* hmm

* hmm

* again....

* different

* fixes
This commit is contained in:
Kjeld Schouten-Lebbing 2021-11-15 19:30:09 +01:00 committed by GitHub
parent b858f31ba3
commit e2c09231d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/library/common/Chart.yaml
View File

@ -15,4 +15,4 @@ maintainers:
name: common name: common
sources: null sources: null
type: library type: library
version: 8.6.0 version: 8.6.1

6
charts/library/common/templates/_statefulset.tpl
View File

@ -59,13 +59,13 @@ spec:
name: {{ $vctname }} name: {{ $vctname }}
spec: spec:
accessModes: accessModes:
- {{ required (printf "accessMode is required for vCT %v" $vct.name) $vct.accessMode | quote }} - {{ ( $vct.accessMode | default "ReadWriteOnce" ) | quote }}
resources: resources:
requests: requests:
storage: {{ required (printf "size is required for PVC %v" $vct.name) $vct.size | quote }} storage: {{ $vct.size | default "999Gi" | quote }}
{{- if $vct.storageClass }} {{- if $vct.storageClass }}
storageClassName: {{ if (eq "-" $vct.storageClass) }}""{{- else if (eq "SCALE-ZFS" $vct.storageClass ) }}{{ ( printf "%v-%v" "ix-storage-class" $releaseName ) }}{{- else }}{{ $vct.storageClass | quote }}{{- end }} storageClassName: {{ if (eq "-" $vct.storageClass) }}""{{- else if (eq "SCALE-ZFS" $vct.storageClass ) }}{{ ( printf "%v-%v" "ix-storage-class" $releaseName ) }}{{- else }}{{ $vct.storageClass | quote }}{{- end }}
{{- else if $values.ixChartContext }} {{- else if or ( $values.global.isSCALE ) ( $values.ixChartContext ) ( $values.global.ixChartContext ) }}
storageClassName: {{ printf "%v-%v" "ix-storage-class" $releaseName }} storageClassName: {{ printf "%v-%v" "ix-storage-class" $releaseName }}
{{- end }} {{- end }}
{{- end }} {{- end }}

2
charts/library/common/templates/classes/_pvc.tpl
View File

@ -45,7 +45,7 @@ spec:
storage: {{ $values.size | default "999Gi" | quote }} storage: {{ $values.size | default "999Gi" | quote }}
{{- if $values.storageClass }} {{- if $values.storageClass }}
storageClassName: {{ if (eq "-" $values.storageClass) }}""{{- else if (eq "SCALE-ZFS" $values.storageClass ) }}{{ ( printf "%v-%v" "ix-storage-class" .Release.Name ) }}{{- else }}{{ $values.storageClass | quote }}{{- end }} storageClassName: {{ if (eq "-" $values.storageClass) }}""{{- else if (eq "SCALE-ZFS" $values.storageClass ) }}{{ ( printf "%v-%v" "ix-storage-class" .Release.Name ) }}{{- else }}{{ $values.storageClass | quote }}{{- end }}
{{- else if $.Values.global.isSCALE }} {{- else if or ( $.Values.global.isSCALE ) ( $.Values.ixChartContext ) ( $.Values.global.ixChartContext ) }}
storageClassName: {{ ( printf "%v-%v" "ix-storage-class" .Release.Name ) }} storageClassName: {{ ( printf "%v-%v" "ix-storage-class" .Release.Name ) }}
{{- end }} {{- end }}
{{- if $values.volumeName }} {{- if $values.volumeName }}