Skip to content

Commit e4cec36

Browse files
baprxxoxys
andauthored
feat(statefulset): add support for valueFrom in env (#417)
Signed-off-by: Baptiste Roux <arte.but.posix@gmail.com> Co-authored-by: Robert Kaussow <xoxys@rknet.org>
1 parent 4c1bc2a commit e4cec36

File tree

4 files changed

+24
-0
lines changed

4 files changed

+24
-0
lines changed

charts/woodpecker/charts/agent/templates/statefulset.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,14 @@ spec:
6969
env:
7070
{{- range $key, $value := .Values.env }}
7171
- name: {{ $key }}
72+
{{- if kindIs "string" $value }}
7273
value: {{ $value | quote }}
74+
{{- else if kindIs "map" $value }}
75+
{{- if $value.valueFrom }}
76+
valueFrom:
77+
{{- toYaml $value.valueFrom | nindent 16 }}
78+
{{- end }}
79+
{{- end }}
7380
{{- end }}
7481
envFrom:
7582
{{- if .Values.mapAgentSecret }}

charts/woodpecker/charts/server/templates/statefulset.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,14 @@ spec:
103103
env:
104104
{{- range $key, $value := .Values.env }}
105105
- name: {{ $key }}
106+
{{- if kindIs "string" $value }}
106107
value: {{ $value | quote }}
108+
{{- else if kindIs "map" $value }}
109+
{{- if $value.valueFrom }}
110+
valueFrom:
111+
{{- toYaml $value.valueFrom | nindent 16 }}
112+
{{- end }}
113+
{{- end }}
107114
{{- end }}
108115
{{- if .Values.metrics.enabled }}
109116
- name: WOODPECKER_METRICS_SERVER_ADDR

charts/woodpecker/charts/server/values.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ env:
3434
WOODPECKER_ADMIN: 'woodpecker,admin'
3535
WOODPECKER_HOST: 'https://xxxxxxx'
3636
# WOODPECKER_GITHUB: "true"
37+
# WOODPECKER_DATABASE_DATASOURCE:
38+
# valueFrom:
39+
# secretKeyRef:
40+
# name: woodpecker-database-secret
41+
# key: datasource
3742

3843
# -- Add extra environment variables from the secrets list
3944
extraSecretNamesForEnvFrom: []

charts/woodpecker/values.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ agent:
3535
WOODPECKER_BACKEND_K8S_POD_LABELS: ''
3636
WOODPECKER_BACKEND_K8S_POD_ANNOTATIONS: ''
3737
WOODPECKER_CONNECT_RETRY_COUNT: '1'
38+
# WOODPECKER_DATABASE_DATASOURCE:
39+
# valueFrom:
40+
# secretKeyRef:
41+
# name: woodpecker-database-secret
42+
# key: datasource
3843

3944
# -- Add extra secret that is contains environment variables
4045
extraSecretNamesForEnvFrom: []

0 commit comments

Comments
 (0)