Skip to content

Commit dbfdfa5

Browse files
authored
Merge branch 'main' into fix_extraenvfrom_description
2 parents d8ea247 + dec4c4c commit dbfdfa5

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

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.14.3](https://img.shields.io/badge/Version-0.14.3-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)
3+
![Version: 0.14.4](https://img.shields.io/badge/Version-0.14.4-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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{{- if not .Values.pixelfed.mail.existingSecret }}
2+
{{- $username := .Values.pixelfed.mail.username | required ".Values.pixelfed.mail.username is required" }}
3+
{{- $password := .Values.pixelfed.mail.password | required ".Values.pixelfed.mail.password is required" }}
24
---
35
apiVersion: v1
46
kind: Secret
@@ -8,9 +10,9 @@ data:
810
host: {{ .Values.pixelfed.mail.host | b64enc }}
911
port: {{ .Values.pixelfed.mail.port | quote | b64enc}}
1012
{{- if .Values.pixelfed.mail.username }}
11-
username: {{ .Values.pixelfed.mail.username | b64enc }}
13+
username: {{ $username | b64enc }}
1214
{{- end }}
1315
{{- if .Values.pixelfed.mail.password }}
14-
password: {{ .Values.pixelfed.mail.password | b64enc }}
16+
password: {{ $password | b64enc }}
1517
{{- end }}
1618
{{- end }}

charts/pixelfed/values.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,6 @@ valkey:
261261
# default: nano
262262
resourcesPreset: "small"
263263

264-
265264
postgresql:
266265
# -- enable the bundled [postgresql sub chart from Bitnami](https://github.com/bitnami/charts/blob/main/bitnami/postgresql/README.md#parameters).
267266
# Must set to true if externalDatabase.enabled=false
@@ -270,6 +269,10 @@ postgresql:
270269
global:
271270
storageClass: ""
272271

272+
volumePermissions:
273+
# -- If you get "mkdir: cannot create directory ‘/bitnami/postgresql/data’: Permission denied"
274+
# error, set these (This often happens on setups like minikube)
275+
enabled: false
273276

274277
# -- PHP Configuration files
275278
# Will be injected in /usr/local/etc/php-fpm.d

0 commit comments

Comments
 (0)