truenas/chart
1
0
Fork 0
mirror of https://github.com/truenas/charts.git synced 2026-05-16 14:12:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

NAS-123856 / 24.04 / take size into account when creating a unique name (#1500)

Browse Source
This commit is contained in:
Stavros Kois
2023-09-04 19:16:03 +03:00
committed by GitHub
parent 828e6fa9ca
commit 32f5f875f7
7 changed files with 189 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/common/Chart.yaml
View File

@@ -2,7 +2,7 @@ apiVersion: v2
name: common
description: A library chart for iX Official Catalog
type: library
version: 1.1.0
version: 1.1.1
appVersion: v1
annotations:
title: Common Library Chart

3
library/common/templates/lib/pod/volumes/_pvc.tpl
View File

@@ -14,7 +14,8 @@ objectData: The object data to be used to render the volume.
{{- end -}}
{{- if mustHas $objectData.type (list "nfs-pv-pvc" "smb-pv-pvc") -}}
{{- $hashValues := (printf "%s-%s" $objectData.server $objectData.share) -}}
{{- $size := $objectData.size | default $rootCtx.Values.fallbackDefaults.pvcSize -}}
{{- $hashValues := (printf "%s-%s-%s" $size $objectData.server $objectData.share) -}}
{{- if $objectData.domain -}}
{{- $hashValues = (printf "%s-%s" $hashValues $objectData.domain) -}}
{{- end -}}

6
library/common/templates/spawner/_pvc.tpl
View File

@@ -38,7 +38,8 @@
{{/* Validate SMB CSI */}}
{{- include "ix.v1.common.lib.storage.smbCSI.validation" (dict "rootCtx" $ "objectData" $objectData) -}}
{{- $hashValues := (printf "%s-%s" $objectData.server $objectData.share) -}}
{{- $size := $objectData.size | default $.Values.fallbackDefaults.pvcSize -}}
{{- $hashValues := (printf "%s-%s-%s" $size $objectData.server $objectData.share) -}}
{{- if $objectData.domain -}}
{{- $hashValues = (printf "%s-%s" $hashValues $objectData.domain) -}}
{{- end -}}
@@ -71,7 +72,8 @@
{{/* Validate NFS CSI */}}
{{- include "ix.v1.common.lib.storage.nfsCSI.validation" (dict "rootCtx" $ "objectData" $objectData) -}}
{{- $hashValues := (printf "%s-%s" $objectData.server $objectData.share) -}}
{{- $size := $objectData.size | default $.Values.fallbackDefaults.pvcSize -}}
{{- $hashValues := (printf "%s-%s-%s" $size $objectData.server $objectData.share) -}}
{{/* Create a unique name taking into account server and share,
without this, changing one of those values is not possible */}}
{{- $hash := adler32sum $hashValues -}}