Skip to content

Commit eb8aefb

Browse files
authored
Merge branch 'main' into scale_backend_seperate_from_frontend
2 parents fe2cd73 + 3684161 commit eb8aefb

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
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: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ A Helm chart for deploying Pixelfed on Kubernetes
4949
| externalValkey.port | string | `"6379"` | |
5050
| externalValkey.scheme | string | `"tcp"` | |
5151
| extraContainers | list | `[]` | set sidecar containers to run along side the pixelfed container |
52-
| extraEnv | list | `[]` | template out extra environment variables from ConfigMaps or Secrets |
53-
| extraEnvFrom | list | `[]` | template out extra enviornment variables |
52+
| extraEnv | list | `[]` | template out extra environment variables |
53+
| extraEnvFrom | list | `[]` | template out extra environment variables e.g. from ConfigMaps or Secrets |
5454
| extraInitContainers | list | `[]` | set extra init containers |
5555
| extraVolumeMounts | list | `[]` | Additional volumeMounts on the output Deployment definition |
5656
| extraVolumes | list | `[]` | Additional volumes on the output Deployment definition |
@@ -187,6 +187,7 @@ A Helm chart for deploying Pixelfed on Kubernetes
187187
| postgresql.enabled | bool | `true` | enable the bundled [postgresql sub chart from Bitnami](https://github.com/bitnami/charts/blob/main/bitnami/postgresql/README.md#parameters). Must set to true if externalDatabase.enabled=false |
188188
| postgresql.fullnameOverride | string | `"postgresql"` | |
189189
| postgresql.global.storageClass | string | `""` | |
190+
| postgresql.volumePermissions.enabled | bool | `false` | If you get "mkdir: cannot create directory ‘/bitnami/postgresql/data’: Permission denied" error, set these (This often happens on setups like minikube) |
190191
| readinessProbe | object | `{}` | This is to setup the readiness probe more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/ |
191192
| replicaCount | int | `1` | This will set the replicaset count more information can be found here: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/ |
192193
| resources | object | `{}` | set resource limits and requests for cpu, memory, and ephemeral storage |
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: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ fullnameOverride: ""
2828
# -- how many revisions of the deployment to keep for rollbacks
2929
revisionHistoryLimit: 10
3030

31-
# -- template out extra environment variables from ConfigMaps or Secrets
31+
# -- template out extra environment variables
3232
extraEnv: []
3333

34-
# -- template out extra enviornment variables
34+
# -- template out extra environment variables e.g. from ConfigMaps or Secrets
3535
extraEnvFrom: []
3636

3737
# This section builds out the service account more information can be found here: https://kubernetes.io/docs/concepts/security/service-accounts/
@@ -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)