mirror of
https://github.com/cozystack/cozystack.git
synced 2026-11-21 12:13:55 +09:00
fix(seaweedfs): quote every storage class the upstream claims carry
The master, filer, volume index, log and all-in-one claims of the upstream chart write storageClassName unquoted, like the data claims did, so a class name made only of digits renders as a number and the claim is rejected. None of them is set by Cozystack today, but they are values of the same chart that a later change can start handing on, and the patch already exists for the data claims. They follow the same rule: quoted, and left out when no class is named so that the cluster default applies. The deprecated filer.enablePVC claim is left alone: it renders only with filer.data unset, and the template fails earlier on an unset filer.data, so it cannot be reached. Assisted-by: LLM Signed-off-by: Alexey Artamonov <aleksei.artamonov@aenix.io>
This commit is contained in:
1 parent
e7b5a5a1a9
commit
f83db514b0
7 files changed
+245
-10
No files matched your search
@@ -346,7 +346,9 @@ spec:
|
||||
{{- end }}
|
||||
spec:
|
||||
accessModes: [ "ReadWriteOnce" ]
|
||||
storageClassName: {{ .Values.admin.logs.storageClass }}
|
||||
{{- with .Values.admin.logs.storageClass }}
|
||||
storageClassName: {{ . | quote }}
|
||||
{{- end }}
|
||||
resources:
|
||||
requests:
|
||||
storage: {{ .Values.admin.logs.size }}
|
||||
|
||||
@@ -19,7 +19,7 @@ spec:
|
||||
accessModes:
|
||||
{{- toYaml (.Values.allInOne.data.accessModes | default (list "ReadWriteOnce")) | nindent 4 }}
|
||||
{{- if .Values.allInOne.data.storageClass }}
|
||||
storageClassName: {{ .Values.allInOne.data.storageClass }}
|
||||
storageClassName: {{ .Values.allInOne.data.storageClass | quote }}
|
||||
{{- end }}
|
||||
resources:
|
||||
requests:
|
||||
|
||||
@@ -451,7 +451,9 @@ spec:
|
||||
{{- end }}
|
||||
spec:
|
||||
accessModes: [ "ReadWriteOnce" ]
|
||||
storageClassName: {{ .Values.filer.data.storageClass }}
|
||||
{{- with .Values.filer.data.storageClass }}
|
||||
storageClassName: {{ . | quote }}
|
||||
{{- end }}
|
||||
resources:
|
||||
requests:
|
||||
storage: {{ .Values.filer.data.size }}
|
||||
@@ -467,7 +469,9 @@ spec:
|
||||
{{- end }}
|
||||
spec:
|
||||
accessModes: [ "ReadWriteOnce" ]
|
||||
storageClassName: {{ .Values.filer.logs.storageClass }}
|
||||
{{- with .Values.filer.logs.storageClass }}
|
||||
storageClassName: {{ . | quote }}
|
||||
{{- end }}
|
||||
resources:
|
||||
requests:
|
||||
storage: {{ .Values.filer.logs.size }}
|
||||
|
||||
@@ -336,7 +336,9 @@ spec:
|
||||
{{- end }}
|
||||
spec:
|
||||
accessModes: [ "ReadWriteOnce" ]
|
||||
storageClassName: {{ .Values.master.data.storageClass }}
|
||||
{{- with .Values.master.data.storageClass }}
|
||||
storageClassName: {{ . | quote }}
|
||||
{{- end }}
|
||||
resources:
|
||||
requests:
|
||||
storage: {{ .Values.master.data.size }}
|
||||
@@ -352,7 +354,9 @@ spec:
|
||||
{{- end }}
|
||||
spec:
|
||||
accessModes: [ "ReadWriteOnce" ]
|
||||
storageClassName: {{ .Values.master.logs.storageClass }}
|
||||
{{- with .Values.master.logs.storageClass }}
|
||||
storageClassName: {{ . | quote }}
|
||||
{{- end }}
|
||||
resources:
|
||||
requests:
|
||||
storage: {{ .Values.master.logs.size }}
|
||||
|
||||
@@ -424,7 +424,9 @@ spec:
|
||||
{{- end }}
|
||||
spec:
|
||||
accessModes: [ "ReadWriteOnce" ]
|
||||
storageClassName: {{ $volume.idx.storageClass }}
|
||||
{{- with $volume.idx.storageClass }}
|
||||
storageClassName: {{ . | quote }}
|
||||
{{- end }}
|
||||
resources:
|
||||
requests:
|
||||
storage: {{ $volume.idx.size }}
|
||||
@@ -440,7 +442,9 @@ spec:
|
||||
{{- end }}
|
||||
spec:
|
||||
accessModes: [ "ReadWriteOnce" ]
|
||||
storageClassName: {{ $volume.logs.storageClass }}
|
||||
{{- with $volume.logs.storageClass }}
|
||||
storageClassName: {{ . | quote }}
|
||||
{{- end }}
|
||||
resources:
|
||||
requests:
|
||||
storage: {{ $volume.logs.size }}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/admin/admin-statefulset.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/admin/admin-statefulset.yaml
|
||||
index ad112981f..b3d070651 100644
|
||||
index ad112981f..1ce6f3cab 100644
|
||||
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/admin/admin-statefulset.yaml
|
||||
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/admin/admin-statefulset.yaml
|
||||
@@ -330,7 +330,9 @@ spec:
|
||||
@@ -13,8 +13,84 @@ index ad112981f..b3d070651 100644
|
||||
resources:
|
||||
requests:
|
||||
storage: {{ .Values.admin.data.size }}
|
||||
@@ -344,7 +346,9 @@ spec:
|
||||
{{- end }}
|
||||
spec:
|
||||
accessModes: [ "ReadWriteOnce" ]
|
||||
- storageClassName: {{ .Values.admin.logs.storageClass }}
|
||||
+ {{- with .Values.admin.logs.storageClass }}
|
||||
+ storageClassName: {{ . | quote }}
|
||||
+ {{- end }}
|
||||
resources:
|
||||
requests:
|
||||
storage: {{ .Values.admin.logs.size }}
|
||||
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one/all-in-one-pvc.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one/all-in-one-pvc.yaml
|
||||
index 4a402f318..f5329a24e 100644
|
||||
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one/all-in-one-pvc.yaml
|
||||
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one/all-in-one-pvc.yaml
|
||||
@@ -19,7 +19,7 @@ spec:
|
||||
accessModes:
|
||||
{{- toYaml (.Values.allInOne.data.accessModes | default (list "ReadWriteOnce")) | nindent 4 }}
|
||||
{{- if .Values.allInOne.data.storageClass }}
|
||||
- storageClassName: {{ .Values.allInOne.data.storageClass }}
|
||||
+ storageClassName: {{ .Values.allInOne.data.storageClass | quote }}
|
||||
{{- end }}
|
||||
resources:
|
||||
requests:
|
||||
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-statefulset.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-statefulset.yaml
|
||||
index e505faf1c..ced2d597a 100644
|
||||
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-statefulset.yaml
|
||||
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-statefulset.yaml
|
||||
@@ -451,7 +451,9 @@ spec:
|
||||
{{- end }}
|
||||
spec:
|
||||
accessModes: [ "ReadWriteOnce" ]
|
||||
- storageClassName: {{ .Values.filer.data.storageClass }}
|
||||
+ {{- with .Values.filer.data.storageClass }}
|
||||
+ storageClassName: {{ . | quote }}
|
||||
+ {{- end }}
|
||||
resources:
|
||||
requests:
|
||||
storage: {{ .Values.filer.data.size }}
|
||||
@@ -467,7 +469,9 @@ spec:
|
||||
{{- end }}
|
||||
spec:
|
||||
accessModes: [ "ReadWriteOnce" ]
|
||||
- storageClassName: {{ .Values.filer.logs.storageClass }}
|
||||
+ {{- with .Values.filer.logs.storageClass }}
|
||||
+ storageClassName: {{ . | quote }}
|
||||
+ {{- end }}
|
||||
resources:
|
||||
requests:
|
||||
storage: {{ .Values.filer.logs.size }}
|
||||
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/master/master-statefulset.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/master/master-statefulset.yaml
|
||||
index 914f0dfd1..5df83e687 100644
|
||||
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/master/master-statefulset.yaml
|
||||
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/master/master-statefulset.yaml
|
||||
@@ -336,7 +336,9 @@ spec:
|
||||
{{- end }}
|
||||
spec:
|
||||
accessModes: [ "ReadWriteOnce" ]
|
||||
- storageClassName: {{ .Values.master.data.storageClass }}
|
||||
+ {{- with .Values.master.data.storageClass }}
|
||||
+ storageClassName: {{ . | quote }}
|
||||
+ {{- end }}
|
||||
resources:
|
||||
requests:
|
||||
storage: {{ .Values.master.data.size }}
|
||||
@@ -352,7 +354,9 @@ spec:
|
||||
{{- end }}
|
||||
spec:
|
||||
accessModes: [ "ReadWriteOnce" ]
|
||||
- storageClassName: {{ .Values.master.logs.storageClass }}
|
||||
+ {{- with .Values.master.logs.storageClass }}
|
||||
+ storageClassName: {{ . | quote }}
|
||||
+ {{- end }}
|
||||
resources:
|
||||
requests:
|
||||
storage: {{ .Values.master.logs.size }}
|
||||
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-statefulset.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-statefulset.yaml
|
||||
index 04011d1d6..0702d703e 100644
|
||||
index 04011d1d6..88b13822d 100644
|
||||
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-statefulset.yaml
|
||||
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-statefulset.yaml
|
||||
@@ -404,7 +404,9 @@ spec:
|
||||
@@ -28,3 +104,25 @@ index 04011d1d6..0702d703e 100644
|
||||
resources:
|
||||
requests:
|
||||
storage: {{ $dir.size }}
|
||||
@@ -422,7 +424,9 @@ spec:
|
||||
{{- end }}
|
||||
spec:
|
||||
accessModes: [ "ReadWriteOnce" ]
|
||||
- storageClassName: {{ $volume.idx.storageClass }}
|
||||
+ {{- with $volume.idx.storageClass }}
|
||||
+ storageClassName: {{ . | quote }}
|
||||
+ {{- end }}
|
||||
resources:
|
||||
requests:
|
||||
storage: {{ $volume.idx.size }}
|
||||
@@ -438,7 +442,9 @@ spec:
|
||||
{{- end }}
|
||||
spec:
|
||||
accessModes: [ "ReadWriteOnce" ]
|
||||
- storageClassName: {{ $volume.logs.storageClass }}
|
||||
+ {{- with $volume.logs.storageClass }}
|
||||
+ storageClassName: {{ . | quote }}
|
||||
+ {{- end }}
|
||||
resources:
|
||||
requests:
|
||||
storage: {{ $volume.logs.size }}
|
||||
@@ -0,0 +1,123 @@
|
||||
suite: seaweedfs claims keep the storage class a string
|
||||
|
||||
# A StorageClass name may be all digits. Emitted unquoted it renders as a
|
||||
# number, which the claim rejects; and an empty storageClassName disables
|
||||
# dynamic provisioning, so with no class named the field has to stay out for
|
||||
# the cluster default to apply.
|
||||
|
||||
templates:
|
||||
- charts/seaweedfs/templates/master/master-statefulset.yaml
|
||||
- charts/seaweedfs/templates/filer/filer-statefulset.yaml
|
||||
- charts/seaweedfs/templates/volume/volume-statefulset.yaml
|
||||
- charts/seaweedfs/templates/admin/admin-statefulset.yaml
|
||||
- charts/seaweedfs/templates/all-in-one/all-in-one-pvc.yaml
|
||||
# filer-statefulset includes it for its checksum annotation.
|
||||
- charts/seaweedfs/templates/s3/s3-secret.yaml
|
||||
|
||||
release:
|
||||
name: seaweedfs-system
|
||||
namespace: tenant-root
|
||||
|
||||
tests:
|
||||
- it: keeps numeric master data and logs storage class names strings
|
||||
template: charts/seaweedfs/templates/master/master-statefulset.yaml
|
||||
set:
|
||||
seaweedfs.master.data: {type: persistentVolumeClaim, size: 1Gi, storageClass: "123"}
|
||||
seaweedfs.master.logs: {type: persistentVolumeClaim, size: 1Gi, storageClass: "456"}
|
||||
asserts:
|
||||
- equal:
|
||||
path: spec.volumeClaimTemplates[?(@.metadata.name == "data-tenant-root")].spec.storageClassName
|
||||
value: "123"
|
||||
- equal:
|
||||
path: spec.volumeClaimTemplates[?(@.metadata.name == "seaweedfs-master-log-volume")].spec.storageClassName
|
||||
value: "456"
|
||||
|
||||
- it: leaves the master claims on the cluster default when no class is named
|
||||
template: charts/seaweedfs/templates/master/master-statefulset.yaml
|
||||
set:
|
||||
seaweedfs.master.data: {type: persistentVolumeClaim, size: 1Gi}
|
||||
seaweedfs.master.logs: {type: persistentVolumeClaim, size: 1Gi}
|
||||
asserts:
|
||||
- notExists:
|
||||
path: spec.volumeClaimTemplates[0].spec.storageClassName
|
||||
- notExists:
|
||||
path: spec.volumeClaimTemplates[1].spec.storageClassName
|
||||
|
||||
- it: keeps numeric filer data and logs storage class names strings
|
||||
template: charts/seaweedfs/templates/filer/filer-statefulset.yaml
|
||||
set:
|
||||
seaweedfs.filer.data: {type: persistentVolumeClaim, size: 1Gi, storageClass: "123"}
|
||||
seaweedfs.filer.logs: {type: persistentVolumeClaim, size: 1Gi, storageClass: "456"}
|
||||
asserts:
|
||||
- equal:
|
||||
path: spec.volumeClaimTemplates[0].spec.storageClassName
|
||||
value: "123"
|
||||
- equal:
|
||||
path: spec.volumeClaimTemplates[1].spec.storageClassName
|
||||
value: "456"
|
||||
|
||||
- it: leaves the filer claims on the cluster default when no class is named
|
||||
template: charts/seaweedfs/templates/filer/filer-statefulset.yaml
|
||||
set:
|
||||
seaweedfs.filer.data: {type: persistentVolumeClaim, size: 1Gi}
|
||||
seaweedfs.filer.logs: {type: persistentVolumeClaim, size: 1Gi}
|
||||
asserts:
|
||||
- notExists:
|
||||
path: spec.volumeClaimTemplates[0].spec.storageClassName
|
||||
- notExists:
|
||||
path: spec.volumeClaimTemplates[1].spec.storageClassName
|
||||
|
||||
- it: keeps numeric volume idx and logs storage class names strings
|
||||
template: charts/seaweedfs/templates/volume/volume-statefulset.yaml
|
||||
set:
|
||||
seaweedfs.volume.dataDirs: []
|
||||
seaweedfs.volume.idx: {type: persistentVolumeClaim, size: 1Gi, storageClass: "123"}
|
||||
seaweedfs.volume.logs: {type: persistentVolumeClaim, size: 1Gi, storageClass: "456"}
|
||||
asserts:
|
||||
- equal:
|
||||
path: spec.volumeClaimTemplates[0].spec.storageClassName
|
||||
value: "123"
|
||||
- equal:
|
||||
path: spec.volumeClaimTemplates[1].spec.storageClassName
|
||||
value: "456"
|
||||
|
||||
- it: leaves the volume idx and logs claims on the cluster default when no class is named
|
||||
template: charts/seaweedfs/templates/volume/volume-statefulset.yaml
|
||||
set:
|
||||
seaweedfs.volume.dataDirs: []
|
||||
seaweedfs.volume.idx: {type: persistentVolumeClaim, size: 1Gi}
|
||||
seaweedfs.volume.logs: {type: persistentVolumeClaim, size: 1Gi}
|
||||
asserts:
|
||||
- notExists:
|
||||
path: spec.volumeClaimTemplates[0].spec.storageClassName
|
||||
- notExists:
|
||||
path: spec.volumeClaimTemplates[1].spec.storageClassName
|
||||
|
||||
- it: keeps a numeric admin logs storage class name a string
|
||||
template: charts/seaweedfs/templates/admin/admin-statefulset.yaml
|
||||
set:
|
||||
seaweedfs.admin.enabled: true
|
||||
seaweedfs.admin.logs: {type: persistentVolumeClaim, size: 1Gi, storageClass: "456"}
|
||||
asserts:
|
||||
- equal:
|
||||
path: spec.volumeClaimTemplates[1].spec.storageClassName
|
||||
value: "456"
|
||||
|
||||
- it: leaves the admin logs claim on the cluster default when no class is named
|
||||
template: charts/seaweedfs/templates/admin/admin-statefulset.yaml
|
||||
set:
|
||||
seaweedfs.admin.enabled: true
|
||||
seaweedfs.admin.logs: {type: persistentVolumeClaim, size: 1Gi}
|
||||
asserts:
|
||||
- notExists:
|
||||
path: spec.volumeClaimTemplates[1].spec.storageClassName
|
||||
|
||||
- it: keeps a numeric all-in-one storage class name a string
|
||||
template: charts/seaweedfs/templates/all-in-one/all-in-one-pvc.yaml
|
||||
set:
|
||||
seaweedfs.allInOne.enabled: true
|
||||
seaweedfs.allInOne.data: {type: persistentVolumeClaim, size: 1Gi, storageClass: "123"}
|
||||
asserts:
|
||||
- equal:
|
||||
path: spec.storageClassName
|
||||
value: "123"
|
||||
Reference in new issue
Block a user