From 64566d6ebe60c1836199e0b27eb7a6187a95801d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=83=E5=81=A5=E6=AF=85?= <2756283+huang-jy@users.noreply.github.com> Date: Wed, 22 Jan 2025 07:25:18 +0000 Subject: [PATCH 01/14] fix(NONE): Fix secrets to fail if username/password not set -- otherwise pod does not come up --- charts/pixelfed/templates/secret_mail.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/charts/pixelfed/templates/secret_mail.yaml b/charts/pixelfed/templates/secret_mail.yaml index d91618e..fe329dc 100644 --- a/charts/pixelfed/templates/secret_mail.yaml +++ b/charts/pixelfed/templates/secret_mail.yaml @@ -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 }} From 9cf1f2ca37ce8eca3d1f9d33f675b40255fc7292 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=83=E5=81=A5=E6=AF=85?= <2756283+huang-jy@users.noreply.github.com> Date: Wed, 22 Jan 2025 07:28:58 +0000 Subject: [PATCH 02/14] fix(NONE): Set volumepermissions for psql --- charts/pixelfed/values.yaml | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/charts/pixelfed/values.yaml b/charts/pixelfed/values.yaml index 546c406..60b1785 100644 --- a/charts/pixelfed/values.yaml +++ b/charts/pixelfed/values.yaml @@ -55,13 +55,15 @@ podAnnotations: {} podLabels: {} # -- securityContext for the whole pod -podSecurityContext: {} +podSecurityContext: + {} # runAsUser: 33 # runAsGroup: 33 # fsGroup: 33 # -- securityContext for the pixelfed container -securityContext: {} +securityContext: + {} # runAsUser: 33 # runAsNonRoot: true # readOnlyRootFilesystem: true @@ -98,7 +100,8 @@ ingress: # - chart-example.local # -- set resource limits and requests for cpu, memory, and ephemeral storage -resources: {} +resources: + {} # limits: # cpu: 100m # memory: 128Mi @@ -108,14 +111,16 @@ resources: {} # -- This is to setup the liveness probe # more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/ -livenessProbe: {} +livenessProbe: + {} # httpGet: # path: /api/service/health-check # port: http # -- 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/ -readinessProbe: {} +readinessProbe: + {} # httpGet: # path: /api/service/health-check # port: http @@ -261,7 +266,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,10 +274,15 @@ postgresql: global: storageClass: "" + ## If you get "mkdir: cannot create directory ‘/bitnami/postgresql/data’: Permission denied" + ## error, set these + volumePermissions: + enabled: true # -- PHP Configuration files # Will be injected in /usr/local/etc/php-fpm.d -phpConfigs: {} +phpConfigs: + {} # www.conf: |- # [www] # user = www-data From 2db145079a5a51ea5a10a7eeb85465e315b0112d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=83=E5=81=A5=E6=AF=85?= <2756283+huang-jy@users.noreply.github.com> Date: Wed, 22 Jan 2025 07:48:56 +0000 Subject: [PATCH 03/14] fix(NONE): Default volumepermissions to off --- charts/pixelfed/values.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/pixelfed/values.yaml b/charts/pixelfed/values.yaml index 60b1785..6cdd7cd 100644 --- a/charts/pixelfed/values.yaml +++ b/charts/pixelfed/values.yaml @@ -276,8 +276,9 @@ postgresql: ## If you get "mkdir: cannot create directory ‘/bitnami/postgresql/data’: Permission denied" ## error, set these - volumePermissions: - enabled: true + ## (This often happens on setups like minikube) + # volumePermissions: + # enabled: true # -- PHP Configuration files # Will be injected in /usr/local/etc/php-fpm.d From 4f7c819ac3af5e614ffd5ce81efe6ec3efe1faff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=83=E5=81=A5=E6=AF=85?= <2756283+huang-jy@users.noreply.github.com> Date: Thu, 23 Jan 2025 07:06:56 +0000 Subject: [PATCH 04/14] chore(NONE): Add .gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8e684db --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ + +TICKET.md +TASK.md +COMMITMSG.md From e6660f54de1ba6b1ffa02c3d597abfead63a4a5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=83=E5=81=A5=E6=AF=85?= <2756283+huang-jy@users.noreply.github.com> Date: Thu, 23 Jan 2025 07:23:36 +0000 Subject: [PATCH 05/14] Update charts/pixelfed/values.yaml Co-authored-by: Jesse Hitch --- charts/pixelfed/values.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/charts/pixelfed/values.yaml b/charts/pixelfed/values.yaml index 6cdd7cd..93c7bf3 100644 --- a/charts/pixelfed/values.yaml +++ b/charts/pixelfed/values.yaml @@ -282,8 +282,7 @@ postgresql: # -- PHP Configuration files # Will be injected in /usr/local/etc/php-fpm.d -phpConfigs: - {} +phpConfigs: {} # www.conf: |- # [www] # user = www-data From dd4a8bab1bc324ede0d125e6e3339bf2d51e6984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=83=E5=81=A5=E6=AF=85?= <2756283+huang-jy@users.noreply.github.com> Date: Thu, 23 Jan 2025 07:23:49 +0000 Subject: [PATCH 06/14] Update charts/pixelfed/values.yaml Co-authored-by: Jesse Hitch --- charts/pixelfed/values.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/charts/pixelfed/values.yaml b/charts/pixelfed/values.yaml index 93c7bf3..a368638 100644 --- a/charts/pixelfed/values.yaml +++ b/charts/pixelfed/values.yaml @@ -55,8 +55,7 @@ podAnnotations: {} podLabels: {} # -- securityContext for the whole pod -podSecurityContext: - {} +podSecurityContext: {} # runAsUser: 33 # runAsGroup: 33 # fsGroup: 33 From 0e8000db54e14eed99f7aa39588b4a945d8e566e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=83=E5=81=A5=E6=AF=85?= <2756283+huang-jy@users.noreply.github.com> Date: Thu, 23 Jan 2025 07:23:59 +0000 Subject: [PATCH 07/14] Update charts/pixelfed/values.yaml Co-authored-by: Jesse Hitch --- charts/pixelfed/values.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/charts/pixelfed/values.yaml b/charts/pixelfed/values.yaml index a368638..8f21614 100644 --- a/charts/pixelfed/values.yaml +++ b/charts/pixelfed/values.yaml @@ -61,8 +61,7 @@ podSecurityContext: {} # fsGroup: 33 # -- securityContext for the pixelfed container -securityContext: - {} +securityContext: {} # runAsUser: 33 # runAsNonRoot: true # readOnlyRootFilesystem: true From 4a17089d930f37ad77a116f77c35544abe9d2901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=83=E5=81=A5=E6=AF=85?= <2756283+huang-jy@users.noreply.github.com> Date: Thu, 23 Jan 2025 07:24:05 +0000 Subject: [PATCH 08/14] Update charts/pixelfed/values.yaml Co-authored-by: Jesse Hitch --- charts/pixelfed/values.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/charts/pixelfed/values.yaml b/charts/pixelfed/values.yaml index 8f21614..122ee4a 100644 --- a/charts/pixelfed/values.yaml +++ b/charts/pixelfed/values.yaml @@ -98,8 +98,7 @@ ingress: # - chart-example.local # -- set resource limits and requests for cpu, memory, and ephemeral storage -resources: - {} +resources: {} # limits: # cpu: 100m # memory: 128Mi From b8d07be92694c8d98c12b0843a573799b5452502 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=83=E5=81=A5=E6=AF=85?= <2756283+huang-jy@users.noreply.github.com> Date: Thu, 23 Jan 2025 07:24:10 +0000 Subject: [PATCH 09/14] Update charts/pixelfed/values.yaml Co-authored-by: Jesse Hitch --- charts/pixelfed/values.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/charts/pixelfed/values.yaml b/charts/pixelfed/values.yaml index 122ee4a..049cb9e 100644 --- a/charts/pixelfed/values.yaml +++ b/charts/pixelfed/values.yaml @@ -108,8 +108,7 @@ resources: {} # -- This is to setup the liveness probe # more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/ -livenessProbe: - {} +livenessProbe: {} # httpGet: # path: /api/service/health-check # port: http From 6a7d12067bb4296bcc9c034aca870db67c6fcbdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=83=E5=81=A5=E6=AF=85?= <2756283+huang-jy@users.noreply.github.com> Date: Thu, 23 Jan 2025 07:24:15 +0000 Subject: [PATCH 10/14] Update charts/pixelfed/values.yaml Co-authored-by: Jesse Hitch --- charts/pixelfed/values.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/charts/pixelfed/values.yaml b/charts/pixelfed/values.yaml index 049cb9e..62253a9 100644 --- a/charts/pixelfed/values.yaml +++ b/charts/pixelfed/values.yaml @@ -115,8 +115,7 @@ livenessProbe: {} # -- 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/ -readinessProbe: - {} +readinessProbe: {} # httpGet: # path: /api/service/health-check # port: http From 1551b1dcd28febdf292462e3c3ce225df7e1089b Mon Sep 17 00:00:00 2001 From: Jesse Hitch Date: Thu, 23 Jan 2025 08:26:21 +0100 Subject: [PATCH 11/14] Update .gitignore - remove markdown files --- .gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8e684db..8b13789 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -TICKET.md -TASK.md -COMMITMSG.md From 5ca613f6d09a574a0c2f22413cb43bca1ea3f843 Mon Sep 17 00:00:00 2001 From: Jesse Hitch Date: Thu, 23 Jan 2025 08:28:13 +0100 Subject: [PATCH 12/14] Apply suggestions from code review - fix spacing --- charts/pixelfed/values.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/pixelfed/values.yaml b/charts/pixelfed/values.yaml index 62253a9..be1fb90 100644 --- a/charts/pixelfed/values.yaml +++ b/charts/pixelfed/values.yaml @@ -61,7 +61,7 @@ podSecurityContext: {} # fsGroup: 33 # -- securityContext for the pixelfed container -securityContext: {} +securityContext: {} # runAsUser: 33 # runAsNonRoot: true # readOnlyRootFilesystem: true @@ -98,7 +98,7 @@ ingress: # - chart-example.local # -- set resource limits and requests for cpu, memory, and ephemeral storage -resources: {} +resources: {} # limits: # cpu: 100m # memory: 128Mi @@ -108,14 +108,14 @@ resources: {} # -- This is to setup the liveness probe # more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/ -livenessProbe: {} +livenessProbe: {} # httpGet: # path: /api/service/health-check # port: http # -- 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/ -readinessProbe: {} +readinessProbe: {} # httpGet: # path: /api/service/health-check # port: http @@ -277,7 +277,7 @@ postgresql: # -- PHP Configuration files # Will be injected in /usr/local/etc/php-fpm.d -phpConfigs: {} +phpConfigs: {} # www.conf: |- # [www] # user = www-data From 973749514b2a3006766057e15fc95881e24d442d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=83=E5=81=A5=E6=AF=85?= <2756283+huang-jy@users.noreply.github.com> Date: Thu, 23 Jan 2025 07:35:35 +0000 Subject: [PATCH 13/14] docs(NONE): Update docs --- charts/pixelfed/Chart.yaml | 2 +- charts/pixelfed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/pixelfed/Chart.yaml b/charts/pixelfed/Chart.yaml index 0766514..e6aca1c 100644 --- a/charts/pixelfed/Chart.yaml +++ b/charts/pixelfed/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.14.3 +version: 0.14.4 # This is the version number of the application being deployed. # renovate:image=ghcr.io/mattlqx/docker-pixelfed diff --git a/charts/pixelfed/README.md b/charts/pixelfed/README.md index 020b49e..5a9bb88 100644 --- a/charts/pixelfed/README.md +++ b/charts/pixelfed/README.md @@ -1,6 +1,6 @@ # pixelfed -![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) +![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) A Helm chart for deploying Pixelfed on Kubernetes From f671e31a9716838b5c61b0d8d1041587d7ea628d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=83=E5=81=A5=E6=AF=85?= <2756283+huang-jy@users.noreply.github.com> Date: Thu, 23 Jan 2025 07:37:01 +0000 Subject: [PATCH 14/14] Update charts/pixelfed/values.yaml Co-authored-by: Jesse Hitch --- charts/pixelfed/values.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/charts/pixelfed/values.yaml b/charts/pixelfed/values.yaml index be1fb90..a915d03 100644 --- a/charts/pixelfed/values.yaml +++ b/charts/pixelfed/values.yaml @@ -269,11 +269,10 @@ postgresql: global: storageClass: "" - ## If you get "mkdir: cannot create directory ‘/bitnami/postgresql/data’: Permission denied" - ## error, set these - ## (This often happens on setups like minikube) - # volumePermissions: - # enabled: true + 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