mirror/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-12-18 12:47:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

k8s-chart-helm: unify extraEnvironmentVars (#5327)

Browse Source
This commit is contained in:
Sébastien 2024-02-22 10:57:00 +01:00 committed by GitHub
parent e8f094dcac
commit abf1dd13d2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 59 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,7 +105,12 @@ spec:
{{- if .Values.global.extraEnvironmentVars }} {{- if .Values.global.extraEnvironmentVars }}
{{- range $key, $value := .Values.global.extraEnvironmentVars }} {{- range $key, $value := .Values.global.extraEnvironmentVars }}
- name: {{ $key }} - name: {{ $key }}
{{- if kindIs "string" $value }}
value: {{ $value | quote }} value: {{ $value | quote }}
{{- else }}
valueFrom:
{{ toYaml $value | nindent 16 | trim }}
{{- end -}}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- if .Values.filer.secretExtraEnvironmentVars }} {{- if .Values.filer.secretExtraEnvironmentVars }}

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

@ -83,13 +83,23 @@ spec:
{{- if .Values.master.extraEnvironmentVars }} {{- if .Values.master.extraEnvironmentVars }}
{{- range $key, $value := .Values.master.extraEnvironmentVars }} {{- range $key, $value := .Values.master.extraEnvironmentVars }}
- name: {{ $key }} - name: {{ $key }}
{{- if kindIs "string" $value }}
value: {{ $value | quote }} value: {{ $value | quote }}
{{- else }}
valueFrom:
{{ toYaml $value | nindent 16 | trim }}
{{- end -}}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- if .Values.global.extraEnvironmentVars }} {{- if .Values.global.extraEnvironmentVars }}
{{- range $key, $value := .Values.global.extraEnvironmentVars }} {{- range $key, $value := .Values.global.extraEnvironmentVars }}
- name: {{ $key }} - name: {{ $key }}
{{- if kindIs "string" $value }}
value: {{ $value | quote }} value: {{ $value | quote }}
{{- else }}
valueFrom:
{{ toYaml $value | nindent 16 | trim }}
{{- end -}}
{{- end }} {{- end }}
{{- end }} {{- end }}
command: command:

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

@ -69,10 +69,26 @@ spec:
fieldPath: metadata.namespace fieldPath: metadata.namespace
- name: SEAWEEDFS_FULLNAME - name: SEAWEEDFS_FULLNAME
value: "{{ template "seaweedfs.name" . }}" value: "{{ template "seaweedfs.name" . }}"
{{- if .Values.s3.extraEnvironmentVars }}
{{- range $key, $value := .Values.s3.extraEnvironmentVars }}
- name: {{ $key }}
{{- if kindIs "string" $value }}
value: {{ $value | quote }}
{{- else }}
valueFrom:
{{ toYaml $value | nindent 16 | trim }}
{{- end -}}
{{- end }}
{{- end }}
{{- if .Values.global.extraEnvironmentVars }} {{- if .Values.global.extraEnvironmentVars }}
{{- range $key, $value := .Values.global.extraEnvironmentVars }} {{- range $key, $value := .Values.global.extraEnvironmentVars }}
- name: {{ $key }} - name: {{ $key }}
{{- if kindIs "string" $value }}
value: {{ $value | quote }} value: {{ $value | quote }}
{{- else }}
valueFrom:
{{ toYaml $value | nindent 16 | trim }}
{{- end -}}
{{- end }} {{- end }}
{{- end }} {{- end }}
command: command:

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

@ -91,10 +91,26 @@ spec:
fieldPath: status.hostIP fieldPath: status.hostIP
- name: SEAWEEDFS_FULLNAME - name: SEAWEEDFS_FULLNAME
value: "{{ template "seaweedfs.name" . }}" value: "{{ template "seaweedfs.name" . }}"
{{- if .Values.volume.extraEnvironmentVars }}
{{- range $key, $value := .Values.volume.extraEnvironmentVars }}
- name: {{ $key }}
{{- if kindIs "string" $value }}
value: {{ $value | quote }}
{{- else }}
valueFrom:
{{ toYaml $value | nindent 16 | trim }}
{{- end -}}
{{- end }}
{{- end }}
{{- if .Values.global.extraEnvironmentVars }} {{- if .Values.global.extraEnvironmentVars }}
{{- range $key, $value := .Values.global.extraEnvironmentVars }} {{- range $key, $value := .Values.global.extraEnvironmentVars }}
- name: {{ $key }} - name: {{ $key }}
{{- if kindIs "string" $value }}
value: {{ $value | quote }} value: {{ $value | quote }}
{{- else }}
valueFrom:
{{ toYaml $value | nindent 16 | trim }}
{{- end -}}
{{- end }} {{- end }}
{{- end }} {{- end }}
command: command:

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

@ -36,6 +36,10 @@ global:
WEED_CLUSTER_DEFAULT: "sw" WEED_CLUSTER_DEFAULT: "sw"
WEED_CLUSTER_SW_MASTER: "seaweedfs-master.seaweedfs:9333" WEED_CLUSTER_SW_MASTER: "seaweedfs-master.seaweedfs:9333"
WEED_CLUSTER_SW_FILER: "seaweedfs-filer-client.seaweedfs:8888" WEED_CLUSTER_SW_FILER: "seaweedfs-filer-client.seaweedfs:8888"
# WEED_JWT_SIGNING_KEY:
# secretKeyRef:
# name: seaweedfs-signing-key
# key: signingKey
image: image:
registry: "" registry: ""
@ -186,10 +190,10 @@ master:
tls: [] tls: []
extraEnvironmentVars: extraEnvironmentVars:
WEED_MASTER_VOLUME_GROWTH_COPY_1: 7 WEED_MASTER_VOLUME_GROWTH_COPY_1: '7'
WEED_MASTER_VOLUME_GROWTH_COPY_2: 6 WEED_MASTER_VOLUME_GROWTH_COPY_2: '6'
WEED_MASTER_VOLUME_GROWTH_COPY_3: 3 WEED_MASTER_VOLUME_GROWTH_COPY_3: '3'
WEED_MASTER_VOLUME_GROWTH_COPY_OTHER: 1 WEED_MASTER_VOLUME_GROWTH_COPY_OTHER: '1'
# used to configure livenessProbe on master-server containers # used to configure livenessProbe on master-server containers
# #
@ -371,6 +375,8 @@ volume:
# ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/ # ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
serviceAccountName: "" serviceAccountName: ""
extraEnvironmentVars:
# used to configure livenessProbe on volume-server containers # used to configure livenessProbe on volume-server containers
# #
livenessProbe: livenessProbe:
@ -706,6 +712,8 @@ s3:
storageClass: "" storageClass: ""
hostPathPrefix: /storage hostPathPrefix: /storage
extraEnvironmentVars:
# used to configure livenessProbe on s3 containers # used to configure livenessProbe on s3 containers
# #
livenessProbe: livenessProbe: