mirror of
https://github.com/cozystack/cozystack.git
synced 2026-11-21 12:13:55 +09:00
fix(seaweedfs): escape pool and zone storage classes in the release values
Pool and zone storage classes were wrapped in quotes by hand, which does not escape a quote or a backslash in the value: a quote closes the string early and the data-plane release values stop parsing, with a YAML error that does not name the field. They are now quoted like the volume and admin classes. Assisted-by: LLM Signed-off-by: Alexey Artamonov <aleksei.artamonov@aenix.io>
This commit is contained in:
1 parent
f83db514b0
commit
e6eb3345c6
2 files changed
+58
-3
No files matched your search
@@ -279,7 +279,7 @@ spec:
|
||||
type: "persistentVolumeClaim"
|
||||
size: "{{ $pool.size | default $.Values.volume.size }}"
|
||||
{{- with ($pool.storageClass | default $.Values.volume.storageClass) }}
|
||||
storageClass: "{{ . }}"
|
||||
storageClass: {{ . | quote }}
|
||||
{{- end }}
|
||||
maxVolumes: 0
|
||||
extraArgs:
|
||||
@@ -295,7 +295,7 @@ spec:
|
||||
type: "persistentVolumeClaim"
|
||||
size: "{{ $zone.size | default $.Values.volume.size }}"
|
||||
{{- with ($zone.storageClass | default $.Values.volume.storageClass) }}
|
||||
storageClass: "{{ . }}"
|
||||
storageClass: {{ . | quote }}
|
||||
{{- end }}
|
||||
maxVolumes: 0
|
||||
nodeSelector: |
|
||||
@@ -320,7 +320,7 @@ spec:
|
||||
type: "persistentVolumeClaim"
|
||||
size: "{{ $pool.size | default $zone.size | default $.Values.volume.size }}"
|
||||
{{- with ($pool.storageClass | default $zone.storageClass | default $.Values.volume.storageClass) }}
|
||||
storageClass: "{{ . }}"
|
||||
storageClass: {{ . | quote }}
|
||||
{{- end }}
|
||||
maxVolumes: 0
|
||||
nodeSelector: |
|
||||
|
||||
@@ -45,3 +45,58 @@ tests:
|
||||
value: "local\n image: example/other"
|
||||
- notExists:
|
||||
path: spec.values.seaweedfs.volume.dataDirs[0].image
|
||||
|
||||
# A pool or zone class is quoted by hand around the value, which a quote
|
||||
# character inside it closes early, breaking the release values.
|
||||
- it: keeps a pool storage class with a quote inside its own field
|
||||
set:
|
||||
<<: *platform
|
||||
volume:
|
||||
pools:
|
||||
fast:
|
||||
diskType: ssd
|
||||
storageClass: 'local"x'
|
||||
documentSelector:
|
||||
path: metadata.name
|
||||
value: seaweedfs-system
|
||||
asserts:
|
||||
- equal:
|
||||
path: spec.values.seaweedfs.volumes.fast.dataDirs[0].storageClass
|
||||
value: 'local"x'
|
||||
|
||||
- it: keeps a zone storage class with a quote inside its own field
|
||||
set:
|
||||
<<: *platform
|
||||
topology: MultiZone
|
||||
replicationFactor: 1
|
||||
volume:
|
||||
zones:
|
||||
a:
|
||||
storageClass: 'local"x'
|
||||
documentSelector:
|
||||
path: metadata.name
|
||||
value: seaweedfs-system
|
||||
asserts:
|
||||
- equal:
|
||||
path: spec.values.seaweedfs.volumes.a.dataDirs[0].storageClass
|
||||
value: 'local"x'
|
||||
|
||||
- it: keeps a zone pool storage class with a quote inside its own field
|
||||
set:
|
||||
<<: *platform
|
||||
topology: MultiZone
|
||||
replicationFactor: 1
|
||||
volume:
|
||||
zones:
|
||||
a:
|
||||
pools:
|
||||
fast:
|
||||
diskType: ssd
|
||||
storageClass: 'local"x'
|
||||
documentSelector:
|
||||
path: metadata.name
|
||||
value: seaweedfs-system
|
||||
asserts:
|
||||
- equal:
|
||||
path: spec.values.seaweedfs.volumes.a-fast.dataDirs[0].storageClass
|
||||
value: 'local"x'
|
||||
Reference in new issue
Block a user