Skip to content

Commit c28217f

Browse files
jessebotjessebot
authored
Merge pull request #20 from small-hack/more-configmap-env-updates
move more stuff to configmap-env, remove configmap, bump appVersion, add externalValkey.existingSecretKeys.port, regenerate docs, clean up deployment.yaml
2 parents 61ff732 + 4b3b44d commit c28217f

File tree

9 files changed

+108
-181
lines changed

9 files changed

+108
-181
lines changed

‎charts/pixelfed/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ 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.7.0
18+
version: 0.8.0
1919

2020
# This is the version number of the application being deployed.
2121
# renovate:image=ghcr.io/mattlqx/docker-pixelfed
22-
appVersion: "v0.12.3-nginx"
22+
appVersion: "v0.12.4-nginx"
2323

2424
maintainers:
2525
- name: "jessebot"

‎charts/pixelfed/README.md‎

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

3-
![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-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.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.12.4-nginx](https://img.shields.io/badge/AppVersion-v0.12.4--nginx-informational?style=flat-square)
44

55
A Helm chart for deploying Pixelfed on Kubernetes
66

@@ -43,6 +43,7 @@ A Helm chart for deploying Pixelfed on Kubernetes
4343
| externalValkey.existingSecret | string | `""` | get valkey credentials from an existing Kubernetes Secret |
4444
| externalValkey.existingSecretKeys.host | string | `""` | key in existing Kubernetes Secret for host. If set, ignores externalValkey.host |
4545
| externalValkey.existingSecretKeys.password | string | `""` | key in existing Kubernetes Secret for password. If set, ignores externalValkey.password |
46+
| externalValkey.existingSecretKeys.port | string | `""` | key in existing Kubernetes Secret for port. If set, ignores externalValkey.port |
4647
| externalValkey.host | string | `"valkey"` | |
4748
| externalValkey.password | string | `"null"` | |
4849
| externalValkey.port | string | `"6379"` | |

‎charts/pixelfed/templates/configmap-env.yaml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,28 @@ data:
8686
# mail
8787
MAIL_DRIVER: "{{ .Values.pixelfed.mail.driver }}"
8888
MAIL_ENCRYPTION: "{{ .Values.pixelfed.mail.encryption }}"
89+
MAIL_FROM_ADDRESS: "{{ .Values.pixelfed.mail.from_address }}"
90+
MAIL_FROM_NAME: "{{ .Values.pixelfed.mail.from_name }}"
8991

9092
# database configuration
9193
DB_CONNECTION: {{ .Values.pixelfed.db.connection }}
9294
DB_APPLY_NEW_MIGRATIONS_AUTOMATICALLY: "{{ .Values.pixelfed.db.apply_new_migrations_automatically }}"
95+
{{- if .Values.postgresql.enabled }}
96+
DB_PORT: {{ .Values.postgresql.primary.service.ports.postgresql | quote }}
97+
DB_HOST: {{ .Values.postgresql.fullnameOverride }}
98+
DB_USERNAME: postgres
99+
DB_DATABASE: postgres
100+
{{- end }}
101+
102+
# redis
103+
{{- if .Values.valkey.enabled }}
104+
REDIS_HOST: {{ printf "%s-primary" (.Values.valkey.fullnameOverride) }}
105+
{{- else if and .Values.externalValkey.enabled (not .Values.externalValkey.existingSecret) (not .Values.externalValkey.existingSecretKeys.host) }}
106+
REDIS_HOST: {{ .Values.externalValkey.port | quote }}
107+
{{- end }}
108+
109+
{{- if .Values.valkey.enabled }}
110+
REDIS_PORT: {{ .Values.valkey.primary.service.ports.valkey | quote }}
111+
{{- else if .Values.externalValkey.enabled (not .Values.externalValkey.existingSecret) (not .Values.externalValkey.existingSecretKeys.port) }}
112+
REDIS_PORT: {{ .Values.externalValkey.port | quote }}
113+
{{- end }}

‎charts/pixelfed/templates/configmap.yaml‎

Lines changed: 0 additions & 116 deletions
This file was deleted.

‎charts/pixelfed/templates/deployment.yaml‎

Lines changed: 70 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,16 @@ spec:
2828
{{- toYaml . | nindent 8 }}
2929
{{- end }}
3030
serviceAccountName: {{ include "pixelfed.serviceAccountName" . }}
31+
{{- with .Values.podSecurityContext }}
3132
securityContext:
32-
{{- toYaml .Values.podSecurityContext | nindent 8 }}
33+
{{- toYaml . | nindent 8 }}
34+
{{- end }}
3335
containers:
3436
- name: {{ .Chart.Name }}
37+
{{- with .Values.securityContext }}
3538
securityContext:
3639
{{- toYaml .Values.securityContext | nindent 12 }}
40+
{{- end }}
3741
image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
3842
imagePullPolicy: {{ .Values.image.pullPolicy }}
3943
ports:
@@ -44,35 +48,42 @@ spec:
4448
- configMapRef:
4549
name: {{ include "pixelfed.fullname" . }}-env
4650
env:
47-
# redis
51+
# valkey AKA redis
52+
{{- if and .Values.externalValkey.enabled .Values.externalValkey.existingSecretKeys.host }}
4853
- name: REDIS_HOST
49-
{{- if .Values.externalValkey.existingSecret }}
5054
valueFrom:
5155
secretKeyRef:
56+
{{- if and .Values.externalValkey.existingSecret .Values.externalValkey.existingSecretKeys.host }}
5257
name: {{ .Values.externalValkey.existingSecret }}
5358
key: {{ .Values.externalValkey.existingSecretKeys.host }}
54-
{{- else }}
55-
value: {{ printf "%s-primary" (.Values.valkey.fullnameOverride) }}
56-
{{- end }}
59+
{{- else }}
60+
name: {{ include "pixelfed.fullname" . }}-valkey
61+
key: host
62+
{{- end }}
63+
{{- end }}
64+
65+
{{- if and .Values.externalValkey.enabled .Values.externalValkey.existingSecret .Values.externalValkey.existingSecretKeys.port }}
5766
- name: REDIS_PORT
58-
{{- if .Values.externalValkey }}
59-
{{- if .Values.externalValkey.existingSecret }}
6067
valueFrom:
6168
secretKeyRef:
69+
{{- if and .Values.externalValkey.existingSecret .Values.externalValkey.existingSecretKeys.port }}
6270
name: {{ .Values.externalValkey.existingSecret }}
6371
key: {{ .Values.externalValkey.existingSecretKeys.port }}
64-
{{- else }}
65-
value: {{ .Values.externalValkey.port | quote }}
66-
{{- end }}
67-
{{- else }}
68-
value: {{ .Values.valkey.primary.service.ports.valkey | quote }}
69-
{{- end }}
72+
{{- else }}
73+
name: {{ include "pixelfed.fullname" . }}-valkey
74+
key: port
75+
{{- end }}
76+
{{- end }}
77+
7078
- name: REDIS_PASSWORD
7179
valueFrom:
7280
secretKeyRef:
73-
{{- if .Values.externalValkey.existingSecret }}
81+
{{- if and .Values.externalValkey.enabled .Values.externalValkey.existingSecret }}
7482
name: {{ .Values.externalValkey.existingSecret }}
7583
key: {{ .Values.externalValkey.existingSecretKeys.password }}
84+
{{- else if and .Values.externalValkey.enabled (not .Values.externalValkey.existingSecret) }}
85+
name: {{ include "pixelfed.fullname" . }}-valkey
86+
key: password
7687
{{- else if .Values.valkey.auth.existingSecret }}
7788
name: {{ .Values.valkey.auth.existingSecret }}
7889
key: password
@@ -89,7 +100,7 @@ spec:
89100
name: {{ .Values.pixelfed.mail.existingSecret }}
90101
key: {{ .Values.pixelfed.mail.existingSecretKeys.host }}
91102
{{- else }}
92-
name: pixelfed-mail
103+
name: {{ include "pixelfed.fullname" . }}-mail
93104
key: host
94105
{{- end }}
95106
- name: MAIL_PORT
@@ -99,21 +110,17 @@ spec:
99110
name: {{ .Values.pixelfed.mail.existingSecret }}
100111
key: {{ .Values.pixelfed.mail.existingSecretKeys.port }}
101112
{{- else }}
102-
name: pixelfed-mail
113+
name: {{ include "pixelfed.fullname" . }}-mail
103114
key: port
104115
{{- end }}
105-
- name: MAIL_FROM_ADDRESS
106-
value: "{{ .Values.pixelfed.mail.from_address }}"
107-
- name: MAIL_FROM_NAME
108-
value: "{{ .Values.pixelfed.mail.from_name }}"
109116
- name: MAIL_USERNAME
110117
valueFrom:
111118
secretKeyRef:
112119
{{- if .Values.pixelfed.mail.existingSecret }}
113120
name: {{ .Values.pixelfed.mail.existingSecret }}
114121
key: {{ .Values.pixelfed.mail.existingSecretKeys.username }}
115122
{{- else }}
116-
name: pixelfed-mail
123+
name: {{ include "pixelfed.fullname" . }}-mail
117124
key: username
118125
{{- end }}
119126
- name: MAIL_PASSWORD
@@ -123,35 +130,63 @@ spec:
123130
name: {{ .Values.pixelfed.mail.existingSecret }}
124131
key: {{ .Values.pixelfed.mail.existingSecretKeys.password }}
125132
{{- else }}
126-
name: pixelfed-mail
133+
name: {{ include "pixelfed.fullname" . }}-mail
127134
key: password
128135
{{- end }}
129136

130137
# database configuration
138+
{{- if .Values.externalDatabase.enabled }}
131139
- name: DB_HOST
132-
{{- if and .Values.externalDatabase.enabled .Values.externalDatabase.existingSecret }}
133140
valueFrom:
134141
secretKeyRef:
142+
{{- if and .Values.externalDatabase.enabled .Values.externalDatabase.existingSecret .Values.externalDatabase.existingSecretKeys.host }}
135143
name: {{ .Values.externalDatabase.existingSecret }}
136144
key: {{ .Values.externalDatabase.existingSecretKeys.host }}
137-
{{- else if and .Values.externalDatabase.enabled (not .Values.externalDatabase.existingSecret) }}
138-
value: {{ .Values.externalDatabase.host }}
139-
{{- else }}
140-
value: {{ .Values.postgresql.fullnameOverride }}
141-
{{- end }}
145+
{{- else if and .Values.externalDatabase.enabled (not .Values.externalDatabase.existingSecretKeys.host) }}
146+
name: {{ include "pixelfed.fullname" . }}-database
147+
key: host
148+
{{- end }}
149+
{{- end }}
150+
151+
{{- if .Values.externalDatabase.enabled }}
142152
- name: DB_USERNAME
143-
{{- if .Values.externalDatabase.enabled }}
144-
{{- if .Values.externalDatabase.existingSecret }}
145153
valueFrom:
146154
secretKeyRef:
155+
{{- if and .Values.externalDatabase.enabled .Values.externalDatabase.existingSecret .Values.externalDatabase.existingSecretKeys.username }}
147156
name: {{ .Values.externalDatabase.existingSecret }}
148157
key: {{ .Values.externalDatabase.existingSecretKeys.username }}
149-
{{- else }}
150-
value: {{ .Values.externalDatabase.username }}
158+
{{- else if and .Values.externalDatabase.enabled (not .Values.externalDatabase.existingSecretKeys.username) }}
159+
name: {{ include "pixelfed.fullname" . }}-database
160+
key: username
161+
{{- end }}
151162
{{- end }}
152-
{{- else }}
153-
value: postgres
163+
164+
{{- if .Values.externalDatabase.enabled }}
165+
- name: DB_DATABASE
166+
valueFrom:
167+
secretKeyRef:
168+
{{- if and .Values.externalDatabase.enabled .Values.externalDatabase.existingSecret .Values.externalDatabase.existingSecretKeys.database }}
169+
name: {{ .Values.externalDatabase.existingSecret }}
170+
key: {{ .Values.externalDatabase.existingSecretKeys.database }}
171+
{{- else if and .Values.externalDatabase.enabled (not .Values.externalDatabase.existingSecretKeys.database) }}
172+
name: {{ include "pixelfed.fullname" . }}-database
173+
key: database
174+
{{- end }}
154175
{{- end }}
176+
177+
{{- if .Values.externalDatabase.enabled }}
178+
- name: DB_PORT
179+
valueFrom:
180+
secretKeyRef:
181+
{{- if and .Values.externalDatabase.enabled .Values.externalDatabase.existingSecret .Values.externalDatabase.existingSecretKeys.port }}
182+
name: {{ .Values.externalDatabase.existingSecret }}
183+
key: {{ .Values.externalDatabase.existingSecretKeys.port }}
184+
{{- else if and .Values.externalDatabase.enabled (not .Values.externalDatabase.existingSecretKeys.port) }}
185+
name: {{ include "pixelfed.fullname" . }}-database
186+
key: port
187+
{{- end }}
188+
{{- end }}
189+
155190
- name: DB_PASSWORD
156191
{{- if and .Values.externalDatabase.enabled (not .Values.externalDatabase.existingSecret) }}
157192
value: {{ .Values.externalDatabase.password }}
@@ -169,28 +204,6 @@ spec:
169204
key: postgres-password
170205
{{- end }}
171206
{{- end }}
172-
- name: DB_DATABASE
173-
{{- if and .Values.externalDatabase.enabled .Values.externalDatabase.existingSecret }}
174-
valueFrom:
175-
secretKeyRef:
176-
name: {{ .Values.externalDatabase.existingSecret }}
177-
key: {{ .Values.externalDatabase.existingSecretKeys.database }}
178-
{{- else if and .Values.externalDatabase.enabled (not .Values.externalDatabase.existingSecret) }}
179-
value: {{ .Values.externalDatabase.database }}
180-
{{- else }}
181-
value: postgres
182-
{{- end }}
183-
- name: DB_PORT
184-
{{- if and .Values.externalDatabase.enabled (not .Values.externalDatabase.existingSecret) }}
185-
value: {{ .Values.externalDatabase.port }}
186-
{{- else if and .Values.externalDatabase.enabled .Values.externalDatabase.existingSecret }}
187-
valueFrom:
188-
secretKeyRef:
189-
name: {{ .Values.externalDatabase.existingSecret }}
190-
key: {{ .Values.externalDatabase.existingSecretKeys.port }}
191-
{{- else }}
192-
value: {{ .Values.postgresql.primary.service.ports.postgresql | quote }}
193-
{{- end }}
194207

195208
{{- with .Values.livenessProbe }}
196209
livenessProbe:

0 commit comments

Comments
 (0)