fix(chart): add parameter for service.targetPort, sets APP_PORT var for nginx

Author: holysoles

charts/pixelfed/README.md

@@ -162,6 +162,7 @@ A Helm chart for deploying Pixelfed on Kubernetes
 | resources | object | `{}` |  |
 | securityContext | object | `{}` |  |
 | service.port | int | `80` | This sets the ports more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#field-spec-ports |
+| service.targetPort | int | `80` | Port to attach to on the pods. Also sets what port nginx listens on inside the container. |
 | service.type | string | `"ClusterIP"` | This sets the service type more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types |
 | serviceAccount.annotations | object | `{}` | Annotations to add to the service account |
 | serviceAccount.automount | bool | `true` | Automatically mount a ServiceAccount's API credentials? |

charts/pixelfed/templates/configmap.yaml

@@ -8,6 +8,7 @@ data:
     # app config vars
     APP_NAME={{ .Values.pixelfed.app.name }}
     APP_ENV={{ .Values.pixelfed.app.env }}
+    APP_PORT={{ .Values.service.targetPort }}
     APP_URL={{ .Values.pixelfed.app.url }}
     APP_LOCALE={{ .Values.pixelfed.app.locale }}
     {{- with .Values.pixelfed.app.domain }}

charts/pixelfed/templates/deployment.yaml

@@ -38,14 +38,16 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
-              containerPort: {{ .Values.service.port }}
+              containerPort: {{ .Values.service.targetPort }}
               protocol: TCP
           env:
             # app data
             - name: APP_NAME
               value: {{ .Values.pixelfed.app.name }}
             - name: APP_ENV
               value: {{ .Values.pixelfed.app.env }}
+            - name: APP_PORT
+              value: {{ .Values.service.targetPort | quote}}
             - name: APP_URL
               value: {{ .Values.pixelfed.app.url }}
             - name: APP_LOCALE

charts/pixelfed/templates/service.yaml

@@ -8,7 +8,7 @@ spec:
   type: {{ .Values.service.type }}
   ports:
     - port: {{ .Values.service.port }}
-      targetPort: http
+      targetPort: {{ .Values.service.targetPort }}
       protocol: TCP
       name: http
   selector:

charts/pixelfed/values.yaml

@@ -56,6 +56,8 @@ service:
   type: ClusterIP
   # -- This sets the ports more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#field-spec-ports
   port: 80
+  # -- Port to attach to on the pods. Also sets what port nginx listens on inside the container.
+  targetPort: 80
 
 # This block is for setting up the ingress for more information can be found here: https://kubernetes.io/docs/concepts/services-networking/ingress/
 ingress: