lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-04-05 20:52:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #5681 convert all resources parameters to maps instead of strings (#5689)

Browse Source
This commit is contained in:
JesseBot 2024-06-17 17:58:51 +02:00 committed by GitHub
parent da96a3ebba
commit bfd3bbac20
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
k8s/charts/seaweedfs/Chart.yaml
View File

@ -2,4 +2,4 @@ apiVersion: v1
description: SeaweedFS description: SeaweedFS
name: seaweedfs name: seaweedfs
appVersion: "3.68" appVersion: "3.68"
version: 3.68.0 version: 4.0.0

4
k8s/charts/seaweedfs/templates/filer-statefulset.yaml
View File

@ -269,9 +269,9 @@ spec:
failureThreshold: {{ .Values.filer.livenessProbe.failureThreshold }} failureThreshold: {{ .Values.filer.livenessProbe.failureThreshold }}
timeoutSeconds: {{ .Values.filer.livenessProbe.timeoutSeconds }} timeoutSeconds: {{ .Values.filer.livenessProbe.timeoutSeconds }}
{{- end }} {{- end }}
{{- if .Values.filer.resources }} {{- with .Values.filer.resources }}
resources: resources:
{{ tpl .Values.filer.resources . | nindent 12 | trim }} {{- toYaml . | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.filer.containerSecurityContext.enabled }} {{- if .Values.filer.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.filer.containerSecurityContext "enabled" | toYaml | nindent 12 }} securityContext: {{- omit .Values.filer.containerSecurityContext "enabled" | toYaml | nindent 12 }}

4
k8s/charts/seaweedfs/templates/master-statefulset.yaml
View File

@ -227,9 +227,9 @@ spec:
failureThreshold: {{ .Values.master.livenessProbe.failureThreshold }} failureThreshold: {{ .Values.master.livenessProbe.failureThreshold }}
timeoutSeconds: {{ .Values.master.livenessProbe.timeoutSeconds }} timeoutSeconds: {{ .Values.master.livenessProbe.timeoutSeconds }}
{{- end }} {{- end }}
{{- if .Values.master.resources }} {{- with .Values.master.resources }}
resources: resources:
{{ tpl .Values.master.resources . | nindent 12 | trim }} {{- toYaml . | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.master.containerSecurityContext.enabled }} {{- if .Values.master.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.master.containerSecurityContext "enabled" | toYaml | nindent 12 }} securityContext: {{- omit .Values.master.containerSecurityContext "enabled" | toYaml | nindent 12 }}

4
k8s/charts/seaweedfs/templates/s3-deployment.yaml
View File

@ -204,9 +204,9 @@ spec:
failureThreshold: {{ .Values.s3.livenessProbe.failureThreshold }} failureThreshold: {{ .Values.s3.livenessProbe.failureThreshold }}
timeoutSeconds: {{ .Values.s3.livenessProbe.timeoutSeconds }} timeoutSeconds: {{ .Values.s3.livenessProbe.timeoutSeconds }}
{{- end }} {{- end }}
{{- if .Values.s3.resources }} {{- with .Values.s3.resources }}
resources: resources:
{{ tpl .Values.s3.resources . | nindent 12 | trim }} {{- toYaml . | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.s3.containerSecurityContext.enabled }} {{- if .Values.s3.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.s3.containerSecurityContext "enabled" | toYaml | nindent 12 }} securityContext: {{- omit .Values.s3.containerSecurityContext "enabled" | toYaml | nindent 12 }}

4
k8s/charts/seaweedfs/templates/volume-statefulset.yaml
View File

@ -242,9 +242,9 @@ spec:
failureThreshold: {{ .Values.volume.livenessProbe.failureThreshold }} failureThreshold: {{ .Values.volume.livenessProbe.failureThreshold }}
timeoutSeconds: {{ .Values.volume.livenessProbe.timeoutSeconds }} timeoutSeconds: {{ .Values.volume.livenessProbe.timeoutSeconds }}
{{- end }} {{- end }}
{{- if .Values.volume.resources }} {{- with .Values.volume.resources }}
resources: resources:
{{ tpl .Values.volume.resources . | nindent 12 | trim }} {{- toYaml . | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.volume.containerSecurityContext.enabled }} {{- if .Values.volume.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.volume.containerSecurityContext "enabled" | toYaml | nindent 12 }} securityContext: {{- omit .Values.volume.containerSecurityContext "enabled" | toYaml | nindent 12 }}

8
k8s/charts/seaweedfs/values.yaml
View File

@ -140,7 +140,7 @@ master:
# should map directly to the value of the resources field for a PodSpec, # 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 # formatted as a multi-line string. By default no direct resource request
# is made. # is made.
resources: null resources: {}
# updatePartition is used to control a careful rolling update of SeaweedFS # updatePartition is used to control a careful rolling update of SeaweedFS
# masters. # masters.
@ -401,7 +401,7 @@ volume:
# should map directly to the value of the resources field for a PodSpec, # 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 # formatted as a multi-line string. By default no direct resource request
# is made. # is made.
resources: null resources: {}
# Toleration Settings for server pods # Toleration Settings for server pods
# This should be a multi-line string matching the Toleration array # 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, # 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 # formatted as a multi-line string. By default no direct resource request
# is made. # is made.
resources: null resources: {}
# Toleration Settings for server pods # Toleration Settings for server pods
# This should be a multi-line string matching the Toleration array # 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, # 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 # formatted as a multi-line string. By default no direct resource request
# is made. # is made.
resources: null resources: {}
# Toleration Settings for server pods # Toleration Settings for server pods
# This should be a multi-line string matching the Toleration array # This should be a multi-line string matching the Toleration array