Merge branch 'main' into scale_backend_seperate_from_frontend

This commit is contained in:
Jesse Hitch
2025-01-23 08:50:11 +01:00
committed by GitHub
4 changed files with 14 additions and 7 deletions
+1
View File
@@ -0,0 +1 @@
+3 -2
View File
@@ -49,8 +49,8 @@ A Helm chart for deploying Pixelfed on Kubernetes
| externalValkey.port | string | `"6379"` | |
| externalValkey.scheme | string | `"tcp"` | |
| extraContainers | list | `[]` | set sidecar containers to run along side the pixelfed container |
| extraEnv | list | `[]` | template out extra environment variables from ConfigMaps or Secrets |
| extraEnvFrom | list | `[]` | template out extra enviornment variables |
| extraEnv | list | `[]` | template out extra environment variables |
| extraEnvFrom | list | `[]` | template out extra environment variables e.g. from ConfigMaps or Secrets |
| extraInitContainers | list | `[]` | set extra init containers |
| extraVolumeMounts | list | `[]` | Additional volumeMounts on the output Deployment definition |
| extraVolumes | list | `[]` | Additional volumes on the output Deployment definition |
@@ -187,6 +187,7 @@ A Helm chart for deploying Pixelfed on Kubernetes
| 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 |
| postgresql.fullnameOverride | string | `"postgresql"` | |
| postgresql.global.storageClass | string | `""` | |
| 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) |
| 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/ |
| replicaCount | int | `1` | This will set the replicaset count more information can be found here: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/ |
| resources | object | `{}` | set resource limits and requests for cpu, memory, and ephemeral storage |
+4 -2
View File
@@ -1,4 +1,6 @@
{{- if not .Values.pixelfed.mail.existingSecret }}
{{- $username := .Values.pixelfed.mail.username | required ".Values.pixelfed.mail.username is required" }}
{{- $password := .Values.pixelfed.mail.password | required ".Values.pixelfed.mail.password is required" }}
---
apiVersion: v1
kind: Secret
@@ -8,9 +10,9 @@ data:
host: {{ .Values.pixelfed.mail.host | b64enc }}
port: {{ .Values.pixelfed.mail.port | quote | b64enc}}
{{- if .Values.pixelfed.mail.username }}
username: {{ .Values.pixelfed.mail.username | b64enc }}
username: {{ $username | b64enc }}
{{- end }}
{{- if .Values.pixelfed.mail.password }}
password: {{ .Values.pixelfed.mail.password | b64enc }}
password: {{ $password | b64enc }}
{{- end }}
{{- end }}
+6 -3
View File
@@ -28,10 +28,10 @@ fullnameOverride: ""
# -- how many revisions of the deployment to keep for rollbacks
revisionHistoryLimit: 10
# -- template out extra environment variables from ConfigMaps or Secrets
# -- template out extra environment variables
extraEnv: []
# -- template out extra enviornment variables
# -- template out extra environment variables e.g. from ConfigMaps or Secrets
extraEnvFrom: []
# 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:
# default: nano
resourcesPreset: "small"
postgresql:
# -- 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
@@ -270,6 +269,10 @@ postgresql:
global:
storageClass: ""
volumePermissions:
# -- If you get "mkdir: cannot create directory /bitnami/postgresql/data: Permission denied"
# error, set these (This often happens on setups like minikube)
enabled: false
# -- PHP Configuration files
# Will be injected in /usr/local/etc/php-fpm.d