Skip to content

Commit 8ba545e

Browse files
jessebotjessebot
authored
Merge pull request #8 from holysoles/fix_deployment_env_value_construction
fix(chart): access subchart generated values properly
2 parents 13861f1 + b5ad15b commit 8ba545e

File tree

3 files changed

+40
-40
lines changed

3 files changed

+40
-40
lines changed

‎charts/pixelfed/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 0.3.1
18+
version: 0.3.2
1919

2020
# This is the version number of the application being deployed.
2121
# renovate:image=ghcr.io/mattlqx/docker-pixelfed

‎charts/pixelfed/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# pixelfed
22

3-
![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.12.3-nginx](https://img.shields.io/badge/AppVersion-v0.12.3--nginx-informational?style=flat-square)
3+
![Version: 0.3.2](https://img.shields.io/badge/Version-0.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.12.3-nginx](https://img.shields.io/badge/AppVersion-v0.12.3--nginx-informational?style=flat-square)
44

55
A Helm chart for deploying Pixelfed on Kubernetes
66

‎charts/pixelfed/templates/deployment.yaml‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -181,34 +181,35 @@ spec:
181181

182182
# redis
183183
- name: REDIS_HOST
184+
{{- if .Values.externalValkey.existingSecret }}
184185
valueFrom:
185186
secretKeyRef:
186-
{{- if .Values.externalValkey.existingSecret }}
187187
name: {{ .Values.externalValkey.existingSecret }}
188188
key: {{ .Values.externalValkey.existingSecretKeys.host }}
189-
{{- else }}
190-
name: pixelfed-valkey
191-
key: host
192-
{{- end }}
189+
{{- else }}
190+
value: {{ printf "%s-primary" (.Values.valkey.fullnameOverride) }}
191+
{{- end }}
193192
- name: REDIS_PORT
193+
{{- if .Values.externalValkey.existingSecret }}
194194
valueFrom:
195195
secretKeyRef:
196-
{{- if .Values.externalValkey.existingSecret }}
197196
name: {{ .Values.externalValkey.existingSecret }}
198197
key: {{ .Values.externalValkey.existingSecretKeys.port }}
199-
{{- else }}
200-
name: pixelfed-valkey
201-
key: port
202-
{{- end }}
198+
{{- else }}
199+
value: {{ .Values.valkey.primary.service.ports.valkey | quote }}
200+
{{- end }}
203201
- name: REDIS_PASSWORD
204202
valueFrom:
205203
secretKeyRef:
206204
{{- if .Values.externalValkey.existingSecret }}
207205
name: {{ .Values.externalValkey.existingSecret }}
208206
key: {{ .Values.externalValkey.existingSecretKeys.password }}
209-
{{- else }}
210-
name: pixelfed-valkey
207+
{{- else if .Values.valkey.auth.existingSecret }}
208+
name: {{ .Values.valkey.auth.existingSecret }}
211209
key: password
210+
{{- else }}
211+
name: {{ .Values.valkey.fullnameOverride }}
212+
key: valkey-password
212213
{{- end }}
213214

214215
# mail
@@ -265,55 +266,54 @@ spec:
265266
- name: DB_CONNECTION
266267
value: {{ .Values.externalDatabase.connection }}
267268
- name: DB_HOST
269+
{{- if .Values.externalDatabase.existingSecret }}
268270
valueFrom:
269271
secretKeyRef:
270-
{{- if .Values.externalDatabase.existingSecret }}
271272
name: {{ .Values.externalDatabase.existingSecret }}
272-
key: {{ .Values.externalDatabase.existingSecretKeys.username }}
273-
{{- else }}
274-
name: pixelfed-database
275-
key: host
276-
{{- end }}
273+
key: {{ .Values.externalDatabase.existingSecretKeys.host }}
274+
{{- else }}
275+
value: {{ .Values.postgresql.fullnameOverride }}
276+
{{- end }}
277277
- name: DB_USERNAME
278+
{{- if .Values.externalDatabase.existingSecret }}
278279
valueFrom:
279280
secretKeyRef:
280-
{{- if .Values.externalDatabase.existingSecret }}
281281
name: {{ .Values.externalDatabase.existingSecret }}
282282
key: {{ .Values.externalDatabase.existingSecretKeys.username }}
283-
{{- else }}
284-
name: pixelfed-database
285-
key: username
286-
{{- end }}
283+
{{- else }}
284+
value: postgres
285+
{{- end }}
287286
- name: DB_PASSWORD
288287
valueFrom:
289288
secretKeyRef:
290289
{{- if .Values.externalDatabase.existingSecret }}
291290
name: {{ .Values.externalDatabase.existingSecret }}
292-
key: {{ .Values.externalDatabase.existingSecretKeys.username }}
291+
key: {{ .Values.externalDatabase.existingSecretKeys.password }}
292+
{{- else if .Values.postgresql.auth.existingSecret }}
293+
name: {{ .Values.postgresql.auth.existingSecret }}
294+
key: postgres-password
293295
{{- else }}
294-
name: pixelfed-database
295-
key: password
296+
name: {{ .Values.postgresql.fullnameOverride }}
297+
key: postgres-password
296298
{{- end }}
297299
- name: DB_DATABASE
300+
{{- if .Values.externalDatabase.existingSecret }}
298301
valueFrom:
299302
secretKeyRef:
300-
{{- if .Values.externalDatabase.existingSecret }}
301303
name: {{ .Values.externalDatabase.existingSecret }}
302-
key: {{ .Values.externalDatabase.existingSecretKeys.username }}
303-
{{- else }}
304-
name: pixelfed-database
305-
key: database
306-
{{- end }}
304+
key: {{ .Values.externalDatabase.existingSecretKeys.database }}
305+
{{- else }}
306+
value: postgres
307+
{{- end }}
307308
- name: DB_PORT
309+
{{- if .Values.externalDatabase.existingSecret }}
308310
valueFrom:
309311
secretKeyRef:
310-
{{- if .Values.externalDatabase.existingSecret }}
311312
name: {{ .Values.externalDatabase.existingSecret }}
312-
key: {{ .Values.externalDatabase.existingSecretKeys.username }}
313-
{{- else }}
314-
name: pixelfed-database
315-
key: port
316-
{{- end }}
313+
key: {{ .Values.externalDatabase.existingSecretKeys.port }}
314+
{{- else }}
315+
value: {{ .Values.postgresql.primary.service.ports.postgresql | quote }}
316+
{{- end }}
317317
- name: DB_APPLY_NEW_MIGRATIONS_AUTOMATICALLY
318318
value: "{{ .Values.pixelfed.db_apply_new_migrations_automatically }}"
319319

0 commit comments

Comments
 (0)