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

fix: apply tpl function to all component extraEnvironmentVars

pull/8001/head
Sheya Bernstein 1 week ago
parent
379c032868
commit
29c24e482f
10 changed files with 20 additions and 20 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. 4
      k8s/charts/seaweedfs/templates/admin/admin-statefulset.yaml
  2. 4
      k8s/charts/seaweedfs/templates/all-in-one/all-in-one-deployment.yaml
  3. 4
      k8s/charts/seaweedfs/templates/cosi/cosi-deployment.yaml
  4. 4
      k8s/charts/seaweedfs/templates/filer/filer-statefulset.yaml
  5. 4
      k8s/charts/seaweedfs/templates/master/master-statefulset.yaml
  6. 4
      k8s/charts/seaweedfs/templates/s3/s3-deployment.yaml
  7. 4
      k8s/charts/seaweedfs/templates/sftp/sftp-deployment.yaml
  8. 4
      k8s/charts/seaweedfs/templates/volume/volume-statefulset.yaml
  9. 4
      k8s/charts/seaweedfs/templates/worker/worker-deployment.yaml
  10. 4
      k8s/charts/seaweedfs/values.yaml

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

@ -119,7 +119,7 @@ spec:
{{- range $key, $value := .Values.admin.extraEnvironmentVars }} {{- range $key, $value := .Values.admin.extraEnvironmentVars }}
- name: {{ $key }} - name: {{ $key }}
{{- if kindIs "string" $value }} {{- if kindIs "string" $value }}
value: {{ $value | quote }}
value: {{ tpl $value $ | quote }}
{{- else }} {{- else }}
valueFrom: valueFrom:
{{ toYaml $value | nindent 16 | trim }} {{ toYaml $value | nindent 16 | trim }}
@ -130,7 +130,7 @@ spec:
{{- range $key, $value := .Values.global.extraEnvironmentVars }} {{- range $key, $value := .Values.global.extraEnvironmentVars }}
- name: {{ $key }} - name: {{ $key }}
{{- if kindIs "string" $value }} {{- if kindIs "string" $value }}
value: {{ $value | quote }}
value: {{ tpl $value $ | quote }}
{{- else }} {{- else }}
valueFrom: valueFrom:
{{ toYaml $value | nindent 16 | trim }} {{ toYaml $value | nindent 16 | trim }}

4
k8s/charts/seaweedfs/templates/all-in-one/all-in-one-deployment.yaml
View File

@ -104,7 +104,7 @@ spec:
{{- if and (ne $key $clusterMasterKey) (ne $key $clusterFilerKey) }} {{- if and (ne $key $clusterMasterKey) (ne $key $clusterFilerKey) }}
- name: {{ $key }} - name: {{ $key }}
{{- if kindIs "string" $value }} {{- if kindIs "string" $value }}
value: {{ $value | quote }}
value: {{ tpl $value $ | quote }}
{{- else }} {{- else }}
valueFrom: valueFrom:
{{ toYaml $value | nindent 16 }} {{ toYaml $value | nindent 16 }}
@ -117,7 +117,7 @@ spec:
{{- if and (ne $key $clusterMasterKey) (ne $key $clusterFilerKey) }} {{- if and (ne $key $clusterMasterKey) (ne $key $clusterFilerKey) }}
- name: {{ $key }} - name: {{ $key }}
{{- if kindIs "string" $value }} {{- if kindIs "string" $value }}
value: {{ $value | quote }}
value: {{ tpl $value $ | quote }}
{{- else }} {{- else }}
valueFrom: valueFrom:
{{ toYaml $value | nindent 16 }} {{ toYaml $value | nindent 16 }}

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

@ -100,7 +100,7 @@ spec:
{{- range $key, $value := .Values.cosi.extraEnvironmentVars }} {{- range $key, $value := .Values.cosi.extraEnvironmentVars }}
- name: {{ $key }} - name: {{ $key }}
{{- if kindIs "string" $value }} {{- if kindIs "string" $value }}
value: {{ $value | quote }}
value: {{ tpl $value $ | quote }}
{{- else }} {{- else }}
valueFrom: valueFrom:
{{ toYaml $value | nindent 16 | trim }} {{ toYaml $value | nindent 16 | trim }}
@ -111,7 +111,7 @@ spec:
{{- range $key, $value := .Values.global.extraEnvironmentVars }} {{- range $key, $value := .Values.global.extraEnvironmentVars }}
- name: {{ $key }} - name: {{ $key }}
{{- if kindIs "string" $value }} {{- if kindIs "string" $value }}
value: {{ $value | quote }}
value: {{ tpl $value $ | quote }}
{{- else }} {{- else }}
valueFrom: valueFrom:
{{ toYaml $value | nindent 16 | trim }} {{ toYaml $value | nindent 16 | trim }}

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

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

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

@ -102,7 +102,7 @@ spec:
{{- range $key, $value := .Values.master.extraEnvironmentVars }} {{- range $key, $value := .Values.master.extraEnvironmentVars }}
- name: {{ $key }} - name: {{ $key }}
{{- if kindIs "string" $value }} {{- if kindIs "string" $value }}
value: {{ $value | quote }}
value: {{ tpl $value $ | quote }}
{{- else }} {{- else }}
valueFrom: valueFrom:
{{ toYaml $value | nindent 16 | trim }} {{ toYaml $value | nindent 16 | trim }}
@ -113,7 +113,7 @@ spec:
{{- range $key, $value := .Values.global.extraEnvironmentVars }} {{- range $key, $value := .Values.global.extraEnvironmentVars }}
- name: {{ $key }} - name: {{ $key }}
{{- if kindIs "string" $value }} {{- if kindIs "string" $value }}
value: {{ $value | quote }}
value: {{ tpl $value $ | quote }}
{{- else }} {{- else }}
valueFrom: valueFrom:
{{ toYaml $value | nindent 16 | trim }} {{ toYaml $value | nindent 16 | trim }}

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

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

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

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

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

@ -122,7 +122,7 @@ spec:
{{- range $key, $value := $volume.extraEnvironmentVars }} {{- range $key, $value := $volume.extraEnvironmentVars }}
- name: {{ $key }} - name: {{ $key }}
{{- if kindIs "string" $value }} {{- if kindIs "string" $value }}
value: {{ $value | quote }}
value: {{ tpl $value $ | quote }}
{{- else }} {{- else }}
valueFrom: valueFrom:
{{ toYaml $value | nindent 16 | trim }} {{ toYaml $value | nindent 16 | trim }}
@ -133,7 +133,7 @@ spec:
{{- range $key, $value := $.Values.global.extraEnvironmentVars }} {{- range $key, $value := $.Values.global.extraEnvironmentVars }}
- name: {{ $key }} - name: {{ $key }}
{{- if kindIs "string" $value }} {{- if kindIs "string" $value }}
value: {{ $value | quote }}
value: {{ tpl $value $ | quote }}
{{- else }} {{- else }}
valueFrom: valueFrom:
{{ toYaml $value | nindent 16 | trim }} {{ toYaml $value | nindent 16 | trim }}

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

@ -97,7 +97,7 @@ spec:
{{- range $key, $value := .Values.worker.extraEnvironmentVars }} {{- range $key, $value := .Values.worker.extraEnvironmentVars }}
- name: {{ $key }} - name: {{ $key }}
{{- if kindIs "string" $value }} {{- if kindIs "string" $value }}
value: {{ $value | quote }}
value: {{ tpl $value $ | quote }}
{{- else }} {{- else }}
valueFrom: valueFrom:
{{ toYaml $value | nindent 16 | trim }} {{ toYaml $value | nindent 16 | trim }}
@ -108,7 +108,7 @@ spec:
{{- range $key, $value := .Values.global.extraEnvironmentVars }} {{- range $key, $value := .Values.global.extraEnvironmentVars }}
- name: {{ $key }} - name: {{ $key }}
{{- if kindIs "string" $value }} {{- if kindIs "string" $value }}
value: {{ $value | quote }}
value: {{ tpl $value $ | quote }}
{{- else }} {{- else }}
valueFrom: valueFrom:
{{ toYaml $value | nindent 16 | trim }} {{ toYaml $value | nindent 16 | trim }}

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

@ -39,8 +39,8 @@ global:
replicationPlacement: "001" replicationPlacement: "001"
extraEnvironmentVars: extraEnvironmentVars:
WEED_CLUSTER_DEFAULT: "sw" WEED_CLUSTER_DEFAULT: "sw"
WEED_CLUSTER_SW_MASTER: "seaweedfs-master.seaweedfs:9333"
WEED_CLUSTER_SW_FILER: "seaweedfs-filer-client.seaweedfs:8888"
WEED_CLUSTER_SW_MASTER: "{{ include \"seaweedfs.cluster.masterAddress\" . }}"
WEED_CLUSTER_SW_FILER: "{{ include \"seaweedfs.cluster.filerAddress\" . }}"
# WEED_JWT_SIGNING_KEY: # WEED_JWT_SIGNING_KEY:
# secretKeyRef: # secretKeyRef:
# name: seaweedfs-signing-key # name: seaweedfs-signing-key

Write Preview
Loading…
Cancel
Save