Merge pull request #25 from small-hack/allow-updating-php-configs

update extra volumes to allow php config updates; also reload deployment on configmap changes

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.10.0
+version: 0.11.0
 
 # This is the version number of the application being deployed.
 # renovate:image=ghcr.io/mattlqx/docker-pixelfed

charts/pixelfed/README.md

@@ -1,6 +1,6 @@
 # pixelfed
 
-![Version: 0.10.0](https://img.shields.io/badge/Version-0.10.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)
+![Version: 0.11.0](https://img.shields.io/badge/Version-0.11.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)
 
 A Helm chart for deploying Pixelfed on Kubernetes
 
@@ -52,6 +52,8 @@ A Helm chart for deploying Pixelfed on Kubernetes
 | extraEnv | list | `[]` | template out extra environment variables from ConfigMaps or Secrets |
 | extraEnvFrom | list | `[]` | template out extra enviornment variables |
 | extraInitContainers | list | `[]` | set extra init containers |
+| extraVolumeMounts | list | `[]` | Additional volumeMounts on the output Deployment definition |
+| extraVolumes | list | `[]` | Additional volumes on the output Deployment definition |
 | fullnameOverride | string | `""` | This is to override the chart name, but used in more places |
 | image.pullPolicy | string | `"IfNotPresent"` | This sets the pull policy for images. |
 | image.registry | string | `"ghcr.io"` |  |
@@ -68,6 +70,7 @@ A Helm chart for deploying Pixelfed on Kubernetes
 | livenessProbe | object | `{}` | 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/ |
 | nameOverride | string | `""` | This is to override the chart name. |
 | nodeSelector | object | `{}` | put the pixelfed pod on a specific node/nodegroup |
+| phpConfigs | object | `{}` | PHP Configuration files Will be injected in /usr/local/etc/php-fpm.d |
 | pixelfed.account_deletion | bool | `true` | Enable account deletion (may be a requirement in some jurisdictions) |
 | pixelfed.activity_pub.enabled | bool | `false` | enable ActivityPub |
 | pixelfed.activity_pub.inbox | bool | `false` |  |
@@ -194,8 +197,6 @@ A Helm chart for deploying Pixelfed on Kubernetes
 | valkey.tls.authClients | bool | `true` |  |
 | valkey.tls.autoGenerated | bool | `false` |  |
 | valkey.tls.enabled | bool | `false` |  |
-| volumeMounts | list | `[]` | Additional volumeMounts on the output Deployment definition. |
-| volumes | list | `[]` | Additional volumes on the output Deployment definition. |
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)

charts/pixelfed/templates/configmap_php.yaml

@@ -0,0 +1,12 @@
+{{- if .Values.phpConfigs -}}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "pixelfed.fullname" . }}-phpconfig
+data:
+  {{- range $key, $value := .Values.phpConfigs }}
+  {{ $key }}: |-
+    {{- $value | nindent 4 }}
+  {{- end }}
+{{- end }}

charts/pixelfed/templates/deployment.yaml

@@ -14,8 +14,11 @@ spec:
   revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
   template:
     metadata:
-      {{- with .Values.podAnnotations }}
       annotations:
+        # reload deployment if config files change
+        php-config-hash: {{ toJson .Values.phpConfigs | sha256sum }}
+        checksum/config: {{ include (print $.Template.BasePath "/configmap_env.yaml") . | sha256sum }}
+        {{- with .Values.podAnnotations }}
           {{- toYaml . | nindent 8 }}
         {{- end }}
       labels:
@@ -228,20 +231,40 @@ spec:
           livenessProbe:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+
           {{- with .Values.readinessProbe }}
           readinessProbe:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+
+          {{- with .Values.resources }}
           resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-          {{- with .Values.volumeMounts }}
-          volumeMounts:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-      {{- with .Values.volumes }}
+
+          {{- if or .Values.extraVolumeMounts .Values.phpConfigs }}
+          volumeMounts:
+            {{- with .Values.extraVolumeMounts }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
+            {{- range $key, $value := .Values.phpConfigs }}
+            - name: phpconfig
+              mountPath: {{ "/usr/local/etc/php-fpm.d/%s" $key | quote }}
+              subPath: {{ $key }}
+            {{- end }}
+          {{- end }}{{/* end volumeMounts */}}
+
+      {{- if or .Values.phpConfigs .Values.extraVolumes }}
       volumes:
+        {{- with .Values.extraVolumes }}
           {{- toYaml . | nindent 8 }}
         {{- end }}
+        {{- if .Values.phpConfigs }}
+        - name: phpconfig
+          configMap:
+            name: {{ template "pixelfed.fullname" . }}-phpconfig
+        {{- end }}
+      {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

charts/pixelfed/values.yaml

@@ -127,15 +127,15 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
-# -- Additional volumes on the output Deployment definition.
+# -- Additional volumes on the output Deployment definition
-volumes: []
+extraVolumes: []
 # - name: foo
 #   secret:
 #     secretName: mysecret
 #     optional: false
 
-# -- Additional volumeMounts on the output Deployment definition.
+# -- Additional volumeMounts on the output Deployment definition
-volumeMounts: []
+extraVolumeMounts: []
 # - name: foo
 #   mountPath: "/etc/foo"
 #   readOnly: true
@@ -266,6 +266,24 @@ postgresql:
   global:
     storageClass: ""
 
+
+# -- PHP Configuration files
+# Will be injected in /usr/local/etc/php-fpm.d
+phpConfigs: {}
+  #  www.conf: |-
+  #    [www]
+  #    user = www-data
+  #    group = www-data
+  # www.conf: |-
+  #   [www]
+  #   security.limit_extensions = .php .css .js .html
+  #   listen = 127.0.0.1:9000
+  #   pm = dynamic
+  #   pm.max_children = 350
+  #   pm.start_servers = 100
+  #   pm.min_spare_servers = 100
+  #   pm.max_spare_servers = 280
+
 pixelfed:
   db:
     # -- options: sqlite mysql pgsql sqlsrv