From bfd3bbac20a720d390f739ea41e1cc080e8591ee Mon Sep 17 00:00:00 2001 From: JesseBot Date: Mon, 17 Jun 2024 17:58:51 +0200 Subject: [PATCH] fix #5681 convert all resources parameters to maps instead of strings (#5689) --- k8s/charts/seaweedfs/Chart.yaml | 2 +- k8s/charts/seaweedfs/templates/filer-statefulset.yaml | 4 ++-- k8s/charts/seaweedfs/templates/master-statefulset.yaml | 4 ++-- k8s/charts/seaweedfs/templates/s3-deployment.yaml | 4 ++-- k8s/charts/seaweedfs/templates/volume-statefulset.yaml | 4 ++-- k8s/charts/seaweedfs/values.yaml | 8 ++++---- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/k8s/charts/seaweedfs/Chart.yaml b/k8s/charts/seaweedfs/Chart.yaml index e7ed1f472..bacf28a6a 100644 --- a/k8s/charts/seaweedfs/Chart.yaml +++ b/k8s/charts/seaweedfs/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 description: SeaweedFS name: seaweedfs appVersion: "3.68" -version: 3.68.0 +version: 4.0.0 diff --git a/k8s/charts/seaweedfs/templates/filer-statefulset.yaml b/k8s/charts/seaweedfs/templates/filer-statefulset.yaml index 22d5197c7..1e27c1840 100644 --- a/k8s/charts/seaweedfs/templates/filer-statefulset.yaml +++ b/k8s/charts/seaweedfs/templates/filer-statefulset.yaml @@ -269,9 +269,9 @@ spec: failureThreshold: {{ .Values.filer.livenessProbe.failureThreshold }} timeoutSeconds: {{ .Values.filer.livenessProbe.timeoutSeconds }} {{- end }} - {{- if .Values.filer.resources }} + {{- with .Values.filer.resources }} resources: - {{ tpl .Values.filer.resources . | nindent 12 | trim }} + {{- toYaml . | nindent 12 }} {{- end }} {{- if .Values.filer.containerSecurityContext.enabled }} securityContext: {{- omit .Values.filer.containerSecurityContext "enabled" | toYaml | nindent 12 }} diff --git a/k8s/charts/seaweedfs/templates/master-statefulset.yaml b/k8s/charts/seaweedfs/templates/master-statefulset.yaml index 358f7f1cf..73d1f9fb3 100644 --- a/k8s/charts/seaweedfs/templates/master-statefulset.yaml +++ b/k8s/charts/seaweedfs/templates/master-statefulset.yaml @@ -227,9 +227,9 @@ spec: failureThreshold: {{ .Values.master.livenessProbe.failureThreshold }} timeoutSeconds: {{ .Values.master.livenessProbe.timeoutSeconds }} {{- end }} - {{- if .Values.master.resources }} + {{- with .Values.master.resources }} resources: - {{ tpl .Values.master.resources . | nindent 12 | trim }} + {{- toYaml . | nindent 12 }} {{- end }} {{- if .Values.master.containerSecurityContext.enabled }} securityContext: {{- omit .Values.master.containerSecurityContext "enabled" | toYaml | nindent 12 }} diff --git a/k8s/charts/seaweedfs/templates/s3-deployment.yaml b/k8s/charts/seaweedfs/templates/s3-deployment.yaml index 778cac60f..b678a0eff 100644 --- a/k8s/charts/seaweedfs/templates/s3-deployment.yaml +++ b/k8s/charts/seaweedfs/templates/s3-deployment.yaml @@ -204,9 +204,9 @@ spec: failureThreshold: {{ .Values.s3.livenessProbe.failureThreshold }} timeoutSeconds: {{ .Values.s3.livenessProbe.timeoutSeconds }} {{- end }} - {{- if .Values.s3.resources }} + {{- with .Values.s3.resources }} resources: - {{ tpl .Values.s3.resources . | nindent 12 | trim }} + {{- toYaml . | nindent 12 }} {{- end }} {{- if .Values.s3.containerSecurityContext.enabled }} securityContext: {{- omit .Values.s3.containerSecurityContext "enabled" | toYaml | nindent 12 }} diff --git a/k8s/charts/seaweedfs/templates/volume-statefulset.yaml b/k8s/charts/seaweedfs/templates/volume-statefulset.yaml index 5a2c62505..0a70d8c44 100644 --- a/k8s/charts/seaweedfs/templates/volume-statefulset.yaml +++ b/k8s/charts/seaweedfs/templates/volume-statefulset.yaml @@ -242,9 +242,9 @@ spec: failureThreshold: {{ .Values.volume.livenessProbe.failureThreshold }} timeoutSeconds: {{ .Values.volume.livenessProbe.timeoutSeconds }} {{- end }} - {{- if .Values.volume.resources }} + {{- with .Values.volume.resources }} resources: - {{ tpl .Values.volume.resources . | nindent 12 | trim }} + {{- toYaml . | nindent 12 }} {{- end }} {{- if .Values.volume.containerSecurityContext.enabled }} securityContext: {{- omit .Values.volume.containerSecurityContext "enabled" | toYaml | nindent 12 }} diff --git a/k8s/charts/seaweedfs/values.yaml b/k8s/charts/seaweedfs/values.yaml index fc16bd537..e275a90d3 100644 --- a/k8s/charts/seaweedfs/values.yaml +++ b/k8s/charts/seaweedfs/values.yaml @@ -140,7 +140,7 @@ master: # should map directly to the value of the resources field for a PodSpec, # formatted as a multi-line string. By default no direct resource request # is made. - resources: null + resources: {} # updatePartition is used to control a careful rolling update of SeaweedFS # masters. @@ -401,7 +401,7 @@ volume: # should map directly to the value of the resources field for a PodSpec, # formatted as a multi-line string. By default no direct resource request # is made. - resources: null + resources: {} # Toleration Settings for server pods # This should be a multi-line string matching the Toleration array @@ -593,7 +593,7 @@ filer: # should map directly to the value of the resources field for a PodSpec, # formatted as a multi-line string. By default no direct resource request # is made. - resources: null + resources: {} # Toleration Settings for server pods # This should be a multi-line string matching the Toleration array @@ -789,7 +789,7 @@ s3: # should map directly to the value of the resources field for a PodSpec, # formatted as a multi-line string. By default no direct resource request # is made. - resources: null + resources: {} # Toleration Settings for server pods # This should be a multi-line string matching the Toleration array