DevOps/helm-pixelfed
2
0
Fork 0
Code Issues Pull Requests Actions 30 Packages Projects Releases 1 Wiki Activity

Merge pull request #14 from small-hack/fix-more-templating-issues

Browse Source 
fix more env var quoting and allow plain text values for external Database config
This commit is contained in:
Jesse Hitch
2025-01-18 11:39:48 +01:00
committed by GitHub
parent 5f65e926fe f0f9240bc4
commit 74e3f92239
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/pixelfed/Chart.yaml
+1 -1
View File
@@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes # 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. # to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/) # Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.4.0 version: 0.4.1
# This is the version number of the application being deployed. # This is the version number of the application being deployed.
# renovate:image=ghcr.io/mattlqx/docker-pixelfed # renovate:image=ghcr.io/mattlqx/docker-pixelfed
charts/pixelfed/README.md
+1 -1
View File
@@ -1,6 +1,6 @@
# pixelfed # pixelfed
![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.12.3-nginx](https://img.shields.io/badge/AppVersion-v0.12.3--nginx-informational?style=flat-square) ![Version: 0.4.1](https://img.shields.io/badge/Version-0.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.12.3-nginx](https://img.shields.io/badge/AppVersion-v0.12.3--nginx-informational?style=flat-square)
A Helm chart for deploying Pixelfed on Kubernetes A Helm chart for deploying Pixelfed on Kubernetes
charts/pixelfed/templates/deployment.yaml
+20 -5
View File
@@ -95,7 +95,7 @@ spec:
# instance config # instance config
- name: INSTANCE_DESCRIPTION - name: INSTANCE_DESCRIPTION
value: {{ .Values.pixelfed.instance.description }} value: {{ .Values.pixelfed.instance.description | quote }}
- name: INSTANCE_CONTACT_FORM - name: INSTANCE_CONTACT_FORM
value: {{ .Values.pixelfed.instance.contact_form | quote }} value: {{ .Values.pixelfed.instance.contact_form | quote }}
- name: INSTANCE_DISCOVER_PUBLIC - name: INSTANCE_DISCOVER_PUBLIC
@@ -197,7 +197,7 @@ spec:
name: {{ .Values.externalValkey.existingSecret }} name: {{ .Values.externalValkey.existingSecret }}
key: {{ .Values.externalValkey.existingSecretKeys.port }} key: {{ .Values.externalValkey.existingSecretKeys.port }}
{{- else }} {{- else }}
value: {{ .Values.externalValkey.port }} value: {{ .Values.externalValkey.port | quote }}
{{- end }} {{- end }}
{{- else }} {{- else }}
value: {{ .Values.valkey.primary.service.ports.valkey | quote }} value: {{ .Values.valkey.primary.service.ports.valkey | quote }}
@@ -270,27 +270,37 @@ spec:
- name: DB_CONNECTION - name: DB_CONNECTION
value: {{ .Values.externalDatabase.connection }} value: {{ .Values.externalDatabase.connection }}
- name: DB_HOST - name: DB_HOST
{{- if .Values.externalDatabase.enabled }}
{{- if .Values.externalDatabase.existingSecret }} {{- if .Values.externalDatabase.existingSecret }}
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ .Values.externalDatabase.existingSecret }} name: {{ .Values.externalDatabase.existingSecret }}
key: {{ .Values.externalDatabase.existingSecretKeys.host }} key: {{ .Values.externalDatabase.existingSecretKeys.host }}
{{- else }} {{- else }}
value: {{ .Values.externalDatabase.host }}
{{- end }}
value: {{ .Values.postgresql.fullnameOverride }} value: {{ .Values.postgresql.fullnameOverride }}
{{- end }} {{- end }}
- name: DB_USERNAME - name: DB_USERNAME
{{- if .Values.externalDatabase.enabled }}
{{- if .Values.externalDatabase.existingSecret }} {{- if .Values.externalDatabase.existingSecret }}
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ .Values.externalDatabase.existingSecret }} name: {{ .Values.externalDatabase.existingSecret }}
key: {{ .Values.externalDatabase.existingSecretKeys.username }} key: {{ .Values.externalDatabase.existingSecretKeys.username }}
{{- else }} {{- else }}
value: {{ .Values.externalDatabase.username }}
{{- end }}
{{- else }}
value: postgres value: postgres
{{- end }} {{- end }}
- name: DB_PASSWORD - name: DB_PASSWORD
{{- if and .Values.externalDatabase.enabled (not .Values.externalDatabase.existingSecret) }}
value: {{ .Values.externalDatabase.password }}
{{- else }}
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
{{- if .Values.externalDatabase.existingSecret }} {{- if and .Values.externalDatabase.enabled .Values.externalDatabase.existingSecret }}
name: {{ .Values.externalDatabase.existingSecret }} name: {{ .Values.externalDatabase.existingSecret }}
key: {{ .Values.externalDatabase.existingSecretKeys.password }} key: {{ .Values.externalDatabase.existingSecretKeys.password }}
{{- else if .Values.postgresql.auth.existingSecret }} {{- else if .Values.postgresql.auth.existingSecret }}
@@ -300,17 +310,22 @@ spec:
name: {{ .Values.postgresql.fullnameOverride }} name: {{ .Values.postgresql.fullnameOverride }}
key: postgres-password key: postgres-password
{{- end }} {{- end }}
{{- end }}
- name: DB_DATABASE - name: DB_DATABASE
{{- if .Values.externalDatabase.existingSecret }} {{- if and .Values.externalDatabase.enabled .Values.externalDatabase.existingSecret }}
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ .Values.externalDatabase.existingSecret }} name: {{ .Values.externalDatabase.existingSecret }}
key: {{ .Values.externalDatabase.existingSecretKeys.database }} key: {{ .Values.externalDatabase.existingSecretKeys.database }}
{{- else if and .Values.externalDatabase.enabled (not .Values.externalDatabase.existingSecret) }}
value: {{ .Values.externalDatabase.database }}
{{- else }} {{- else }}
value: postgres value: postgres
{{- end }} {{- end }}
- name: DB_PORT - name: DB_PORT
{{- if .Values.externalDatabase.existingSecret }} {{- if and .Values.externalDatabase.enabled (not .Values.externalDatabase.existingSecret) }}
value: {{ .Values.externalDatabase.port }}
{{- else if and .Values.externalDatabase.enabled .Values.externalDatabase.existingSecret }}
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ .Values.externalDatabase.existingSecret }} name: {{ .Values.externalDatabase.existingSecret }}