Mirror
/
seaweedfs
mirror of https://github.com/seaweedfs/seaweedfs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

helm: avoid duplicate env var keys in workload env lists (#8488) 

* helm: dedupe merged extraEnvironmentVars in workloads

* address comments

Co-Authored-By: Copilot <223556219+Copilot@users.noreply.github.com>

* range

Co-Authored-By: Copilot <223556219+Copilot@users.noreply.github.com>

* helm: reuse merge helper for extraEnvironmentVars

---------

Co-authored-by: Copilot <copilot@github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
pull/3961/merge
Chris Lu 3 days ago
committed by GitHub
parent
fb944f0071
commit
2644816692
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
9 changed files with 44 additions and 112 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      k8s/charts/seaweedfs/templates/admin/admin-statefulset.yaml
  2. 18
      k8s/charts/seaweedfs/templates/cosi/cosi-deployment.yaml
  3. 18
      k8s/charts/seaweedfs/templates/filer/filer-statefulset.yaml
  4. 18
      k8s/charts/seaweedfs/templates/master/master-statefulset.yaml
  5. 18
      k8s/charts/seaweedfs/templates/s3/s3-deployment.yaml
  6. 18
      k8s/charts/seaweedfs/templates/sftp/sftp-deployment.yaml
  7. 12
      k8s/charts/seaweedfs/templates/shared/_helpers.tpl
  8. 18
      k8s/charts/seaweedfs/templates/volume/volume-statefulset.yaml
  9. 18
      k8s/charts/seaweedfs/templates/worker/worker-deployment.yaml

18
k8s/charts/seaweedfs/templates/admin/admin-statefulset.yaml
View File

@ -118,8 +118,10 @@ spec:
fieldPath: metadata.namespace fieldPath: metadata.namespace
- name: SEAWEEDFS_FULLNAME - name: SEAWEEDFS_FULLNAME
value: "{{ include "seaweedfs.fullname" . }}" value: "{{ include "seaweedfs.fullname" . }}"
{{- if .Values.admin.extraEnvironmentVars }}
{{- range $key, $value := .Values.admin.extraEnvironmentVars }}
{{- $mergedExtraEnvironmentVars := dict }}
{{- include "seaweedfs.mergeExtraEnvironmentVars" (dict "global" .Values.global "component" .Values.admin "target" $mergedExtraEnvironmentVars) }}
{{- range $key := keys $mergedExtraEnvironmentVars | sortAlpha }}
{{- $value := index $mergedExtraEnvironmentVars $key }}
- name: {{ $key }} - name: {{ $key }}
{{- if kindIs "string" $value }} {{- if kindIs "string" $value }}
value: {{ tpl $value $ | quote }} value: {{ tpl $value $ | quote }}
@ -128,18 +130,6 @@ spec:
{{ toYaml $value | nindent 16 | trim }} {{ toYaml $value | nindent 16 | trim }}
{{- end -}} {{- end -}}
{{- end }} {{- end }}
{{- end }}
{{- if .Values.global.extraEnvironmentVars }}
{{- range $key, $value := .Values.global.extraEnvironmentVars }}
- name: {{ $key }}
{{- if kindIs "string" $value }}
value: {{ tpl $value $ | quote }}
{{- else }}
valueFrom:
{{ toYaml $value | nindent 16 | trim }}
{{- end -}}
{{- end }}
{{- end }}
command: command:
- "/bin/sh" - "/bin/sh"
- "-ec" - "-ec"

18
k8s/charts/seaweedfs/templates/cosi/cosi-deployment.yaml
View File

@ -96,8 +96,10 @@ spec:
- name: WEED_GRPC_CA - name: WEED_GRPC_CA
value: /usr/local/share/ca-certificates/client/ca.crt value: /usr/local/share/ca-certificates/client/ca.crt
{{- end }} {{- end }}
{{- if .Values.cosi.extraEnvironmentVars }}
{{- range $key, $value := .Values.cosi.extraEnvironmentVars }}
{{- $mergedExtraEnvironmentVars := dict }}
{{- include "seaweedfs.mergeExtraEnvironmentVars" (dict "global" .Values.global "component" .Values.cosi "target" $mergedExtraEnvironmentVars) }}
{{- range $key := keys $mergedExtraEnvironmentVars | sortAlpha }}
{{- $value := index $mergedExtraEnvironmentVars $key }}
- name: {{ $key }} - name: {{ $key }}
{{- if kindIs "string" $value }} {{- if kindIs "string" $value }}
value: {{ tpl $value $ | quote }} value: {{ tpl $value $ | quote }}
@ -106,18 +108,6 @@ spec:
{{ toYaml $value | nindent 16 | trim }} {{ toYaml $value | nindent 16 | trim }}
{{- end -}} {{- end -}}
{{- end }} {{- end }}
{{- end }}
{{- if .Values.global.extraEnvironmentVars }}
{{- range $key, $value := .Values.global.extraEnvironmentVars }}
- name: {{ $key }}
{{- if kindIs "string" $value }}
value: {{ tpl $value $ | quote }}
{{- else }}
valueFrom:
{{ toYaml $value | nindent 16 | trim }}
{{- end -}}
{{- end }}
{{- end }}
volumeMounts: volumeMounts:
- mountPath: /var/lib/cosi - mountPath: /var/lib/cosi
name: socket name: socket

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

@ -114,8 +114,10 @@ spec:
optional: true optional: true
- name: SEAWEEDFS_FULLNAME - name: SEAWEEDFS_FULLNAME
value: "{{ include "seaweedfs.fullname" . }}" value: "{{ include "seaweedfs.fullname" . }}"
{{- if .Values.filer.extraEnvironmentVars }}
{{- range $key, $value := .Values.filer.extraEnvironmentVars }}
{{- $mergedExtraEnvironmentVars := dict }}
{{- include "seaweedfs.mergeExtraEnvironmentVars" (dict "global" .Values.global "component" .Values.filer "target" $mergedExtraEnvironmentVars) }}
{{- range $key := keys $mergedExtraEnvironmentVars | sortAlpha }}
{{- $value := index $mergedExtraEnvironmentVars $key }}
- name: {{ $key }} - name: {{ $key }}
{{- if kindIs "string" $value }} {{- if kindIs "string" $value }}
value: {{ tpl $value $ | quote }} value: {{ tpl $value $ | quote }}
@ -124,18 +126,6 @@ spec:
{{ toYaml $value | nindent 16 | trim }} {{ toYaml $value | nindent 16 | trim }}
{{- end -}} {{- end -}}
{{- end }} {{- end }}
{{- end }}
{{- if .Values.global.extraEnvironmentVars }}
{{- range $key, $value := .Values.global.extraEnvironmentVars }}
- name: {{ $key }}
{{- if kindIs "string" $value }}
value: {{ tpl $value $ | quote }}
{{- else }}
valueFrom:
{{ toYaml $value | nindent 16 | trim }}
{{- end -}}
{{- end }}
{{- end }}
{{- if .Values.filer.secretExtraEnvironmentVars }} {{- if .Values.filer.secretExtraEnvironmentVars }}
{{- range $key, $value := .Values.filer.secretExtraEnvironmentVars }} {{- range $key, $value := .Values.filer.secretExtraEnvironmentVars }}
- name: {{ $key }} - name: {{ $key }}

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

@ -98,8 +98,10 @@ spec:
fieldPath: metadata.namespace fieldPath: metadata.namespace
- name: SEAWEEDFS_FULLNAME - name: SEAWEEDFS_FULLNAME
value: "{{ include "seaweedfs.fullname" . }}" value: "{{ include "seaweedfs.fullname" . }}"
{{- if .Values.master.extraEnvironmentVars }}
{{- range $key, $value := .Values.master.extraEnvironmentVars }}
{{- $mergedExtraEnvironmentVars := dict }}
{{- include "seaweedfs.mergeExtraEnvironmentVars" (dict "global" .Values.global "component" .Values.master "target" $mergedExtraEnvironmentVars) }}
{{- range $key := keys $mergedExtraEnvironmentVars | sortAlpha }}
{{- $value := index $mergedExtraEnvironmentVars $key }}
- name: {{ $key }} - name: {{ $key }}
{{- if kindIs "string" $value }} {{- if kindIs "string" $value }}
value: {{ tpl $value $ | quote }} value: {{ tpl $value $ | quote }}
@ -108,18 +110,6 @@ spec:
{{ toYaml $value | nindent 16 | trim }} {{ toYaml $value | nindent 16 | trim }}
{{- end -}} {{- end -}}
{{- end }} {{- end }}
{{- end }}
{{- if .Values.global.extraEnvironmentVars }}
{{- range $key, $value := .Values.global.extraEnvironmentVars }}
- name: {{ $key }}
{{- if kindIs "string" $value }}
value: {{ tpl $value $ | quote }}
{{- else }}
valueFrom:
{{ toYaml $value | nindent 16 | trim }}
{{- end -}}
{{- end }}
{{- end }}
command: command:
- "/bin/sh" - "/bin/sh"
- "-ec" - "-ec"

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

@ -90,8 +90,10 @@ spec:
fieldPath: metadata.namespace fieldPath: metadata.namespace
- name: SEAWEEDFS_FULLNAME - name: SEAWEEDFS_FULLNAME
value: "{{ include "seaweedfs.fullname" . }}" value: "{{ include "seaweedfs.fullname" . }}"
{{- if .Values.s3.extraEnvironmentVars }}
{{- range $key, $value := .Values.s3.extraEnvironmentVars }}
{{- $mergedExtraEnvironmentVars := dict }}
{{- include "seaweedfs.mergeExtraEnvironmentVars" (dict "global" .Values.global "component" .Values.s3 "target" $mergedExtraEnvironmentVars) }}
{{- range $key := keys $mergedExtraEnvironmentVars | sortAlpha }}
{{- $value := index $mergedExtraEnvironmentVars $key }}
- name: {{ $key }} - name: {{ $key }}
{{- if kindIs "string" $value }} {{- if kindIs "string" $value }}
value: {{ tpl $value $ | quote }} value: {{ tpl $value $ | quote }}
@ -100,18 +102,6 @@ spec:
{{ toYaml $value | nindent 16 | trim }} {{ toYaml $value | nindent 16 | trim }}
{{- end -}} {{- end -}}
{{- end }} {{- end }}
{{- end }}
{{- if .Values.global.extraEnvironmentVars }}
{{- range $key, $value := .Values.global.extraEnvironmentVars }}
- name: {{ $key }}
{{- if kindIs "string" $value }}
value: {{ tpl $value $ | quote }}
{{- else }}
valueFrom:
{{ toYaml $value | nindent 16 | trim }}
{{- end -}}
{{- end }}
{{- end }}
command: command:
- "/bin/sh" - "/bin/sh"
- "-ec" - "-ec"

18
k8s/charts/seaweedfs/templates/sftp/sftp-deployment.yaml
View File

@ -90,8 +90,10 @@ spec:
fieldPath: metadata.namespace fieldPath: metadata.namespace
- name: SEAWEEDFS_FULLNAME - name: SEAWEEDFS_FULLNAME
value: "{{ include "seaweedfs.fullname" . }}" value: "{{ include "seaweedfs.fullname" . }}"
{{- if .Values.sftp.extraEnvironmentVars }}
{{- range $key, $value := .Values.sftp.extraEnvironmentVars }}
{{- $mergedExtraEnvironmentVars := dict }}
{{- include "seaweedfs.mergeExtraEnvironmentVars" (dict "global" .Values.global "component" .Values.sftp "target" $mergedExtraEnvironmentVars) }}
{{- range $key := keys $mergedExtraEnvironmentVars | sortAlpha }}
{{- $value := index $mergedExtraEnvironmentVars $key }}
- name: {{ $key }} - name: {{ $key }}
{{- if kindIs "string" $value }} {{- if kindIs "string" $value }}
value: {{ tpl $value $ | quote }} value: {{ tpl $value $ | quote }}
@ -100,18 +102,6 @@ spec:
{{ toYaml $value | nindent 16 | trim }} {{ toYaml $value | nindent 16 | trim }}
{{- end -}} {{- end -}}
{{- end }} {{- end }}
{{- end }}
{{- if .Values.global.extraEnvironmentVars }}
{{- range $key, $value := .Values.global.extraEnvironmentVars }}
- name: {{ $key }}
{{- if kindIs "string" $value }}
value: {{ tpl $value $ | quote }}
{{- else }}
valueFrom:
{{ toYaml $value | nindent 16 | trim }}
{{- end -}}
{{- end }}
{{- end }}
command: command:
- "/bin/sh" - "/bin/sh"
- "-ec" - "-ec"

12
k8s/charts/seaweedfs/templates/shared/_helpers.tpl
View File

@ -59,6 +59,18 @@ Inject extra environment vars in the format key:value, if populated
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{- define "seaweedfs.mergeExtraEnvironmentVars" -}}
{{- $global := ((.global | default dict).extraEnvironmentVars | default dict) -}}
{{- $component := ((.component | default dict).extraEnvironmentVars | default dict) -}}
{{- $target := .target -}}
{{- range $key, $value := $global }}
{{- $_ := set $target $key $value }}
{{- end }}
{{- range $key, $value := $component }}
{{- $_ := set $target $key $value }}
{{- end }}
{{- end -}}
{{/* Return the proper filer image */}} {{/* Return the proper filer image */}}
{{- define "filer.image" -}} {{- define "filer.image" -}}
{{- if .Values.filer.imageOverride -}} {{- if .Values.filer.imageOverride -}}

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

@ -118,8 +118,10 @@ spec:
fieldPath: status.hostIP fieldPath: status.hostIP
- name: SEAWEEDFS_FULLNAME - name: SEAWEEDFS_FULLNAME
value: "{{ include "seaweedfs.fullname" $ }}" value: "{{ include "seaweedfs.fullname" $ }}"
{{- if $volume.extraEnvironmentVars }}
{{- range $key, $value := $volume.extraEnvironmentVars }}
{{- $mergedExtraEnvironmentVars := dict }}
{{- include "seaweedfs.mergeExtraEnvironmentVars" (dict "global" $.Values.global "component" $volume "target" $mergedExtraEnvironmentVars) }}
{{- range $key := keys $mergedExtraEnvironmentVars | sortAlpha }}
{{- $value := index $mergedExtraEnvironmentVars $key }}
- name: {{ $key }} - name: {{ $key }}
{{- if kindIs "string" $value }} {{- if kindIs "string" $value }}
value: {{ tpl $value $ | quote }} value: {{ tpl $value $ | quote }}
@ -128,18 +130,6 @@ spec:
{{ toYaml $value | nindent 16 | trim }} {{ toYaml $value | nindent 16 | trim }}
{{- end -}} {{- end -}}
{{- end }} {{- end }}
{{- end }}
{{- if $.Values.global.extraEnvironmentVars }}
{{- range $key, $value := $.Values.global.extraEnvironmentVars }}
- name: {{ $key }}
{{- if kindIs "string" $value }}
value: {{ tpl $value $ | quote }}
{{- else }}
valueFrom:
{{ toYaml $value | nindent 16 | trim }}
{{- end -}}
{{- end }}
{{- end }}
command: command:
- "/bin/sh" - "/bin/sh"
- "-ec" - "-ec"

18
k8s/charts/seaweedfs/templates/worker/worker-deployment.yaml
View File

@ -93,8 +93,10 @@ spec:
fieldPath: metadata.namespace fieldPath: metadata.namespace
- name: SEAWEEDFS_FULLNAME - name: SEAWEEDFS_FULLNAME
value: "{{ include "seaweedfs.fullname" . }}" value: "{{ include "seaweedfs.fullname" . }}"
{{- if .Values.worker.extraEnvironmentVars }}
{{- range $key, $value := .Values.worker.extraEnvironmentVars }}
{{- $mergedExtraEnvironmentVars := dict }}
{{- include "seaweedfs.mergeExtraEnvironmentVars" (dict "global" .Values.global "component" .Values.worker "target" $mergedExtraEnvironmentVars) }}
{{- range $key := keys $mergedExtraEnvironmentVars | sortAlpha }}
{{- $value := index $mergedExtraEnvironmentVars $key }}
- name: {{ $key }} - name: {{ $key }}
{{- if kindIs "string" $value }} {{- if kindIs "string" $value }}
value: {{ tpl $value $ | quote }} value: {{ tpl $value $ | quote }}
@ -103,18 +105,6 @@ spec:
{{ toYaml $value | nindent 16 | trim }} {{ toYaml $value | nindent 16 | trim }}
{{- end -}} {{- end -}}
{{- end }} {{- end }}
{{- end }}
{{- if .Values.global.extraEnvironmentVars }}
{{- range $key, $value := .Values.global.extraEnvironmentVars }}
- name: {{ $key }}
{{- if kindIs "string" $value }}
value: {{ tpl $value $ | quote }}
{{- else }}
valueFrom:
{{ toYaml $value | nindent 16 | trim }}
{{- end -}}
{{- end }}
{{- end }}
command: command:
- "/bin/sh" - "/bin/sh"
- "-ec" - "-ec"

Write Preview
Loading…
Cancel
Save