Skip to content

fix more env var quoting and allow plain text values for external Database config #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jessebot merged 2 commits into from
Jan 18, 2025
Merged

fix more env var quoting and allow plain text values for external Database config #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35aa2c5
fix more env var quoting and allow plain text values for external Dat…
jessebot Jan 18, 2025
f0f9240
helm-docs: automated action
github-actions[bot] Jan 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/pixelfed/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.0
version: 0.4.1

# This is the version number of the application being deployed.
# renovate:image=ghcr.io/mattlqx/docker-pixelfed
Expand Down
2 changes: 1 addition & 1 deletion charts/pixelfed/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# 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

Expand Down
25 changes: 20 additions & 5 deletions charts/pixelfed/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ spec:

# instance config
- name: INSTANCE_DESCRIPTION
value: {{ .Values.pixelfed.instance.description }}
value: {{ .Values.pixelfed.instance.description | quote }}
- name: INSTANCE_CONTACT_FORM
value: {{ .Values.pixelfed.instance.contact_form | quote }}
- name: INSTANCE_DISCOVER_PUBLIC
Expand Down Expand Up @@ -197,7 +197,7 @@ spec:
name: {{ .Values.externalValkey.existingSecret }}
key: {{ .Values.externalValkey.existingSecretKeys.port }}
{{- else }}
value: {{ .Values.externalValkey.port }}
value: {{ .Values.externalValkey.port | quote }}
{{- end }}
{{- else }}
value: {{ .Values.valkey.primary.service.ports.valkey | quote }}
Expand Down Expand Up @@ -270,27 +270,37 @@ spec:
- name: DB_CONNECTION
value: {{ .Values.externalDatabase.connection }}
- name: DB_HOST
{{- if .Values.externalDatabase.enabled }}
{{- if .Values.externalDatabase.existingSecret }}
valueFrom:
secretKeyRef:
name: {{ .Values.externalDatabase.existingSecret }}
key: {{ .Values.externalDatabase.existingSecretKeys.host }}
{{- else }}
value: {{ .Values.externalDatabase.host }}
{{- end }}
value: {{ .Values.postgresql.fullnameOverride }}
{{- end }}
- name: DB_USERNAME
{{- if .Values.externalDatabase.enabled }}
{{- if .Values.externalDatabase.existingSecret }}
valueFrom:
secretKeyRef:
name: {{ .Values.externalDatabase.existingSecret }}
key: {{ .Values.externalDatabase.existingSecretKeys.username }}
{{- else }}
value: {{ .Values.externalDatabase.username }}
{{- end }}
{{- else }}
value: postgres
{{- end }}
- name: DB_PASSWORD
{{- if and .Values.externalDatabase.enabled (not .Values.externalDatabase.existingSecret) }}
value: {{ .Values.externalDatabase.password }}
{{- else }}
valueFrom:
secretKeyRef:
{{- if .Values.externalDatabase.existingSecret }}
{{- if and .Values.externalDatabase.enabled .Values.externalDatabase.existingSecret }}
name: {{ .Values.externalDatabase.existingSecret }}
key: {{ .Values.externalDatabase.existingSecretKeys.password }}
{{- else if .Values.postgresql.auth.existingSecret }}
Expand All @@ -300,17 +310,22 @@ spec:
name: {{ .Values.postgresql.fullnameOverride }}
key: postgres-password
{{- end }}
{{- end }}
- name: DB_DATABASE
{{- if .Values.externalDatabase.existingSecret }}
{{- if and .Values.externalDatabase.enabled .Values.externalDatabase.existingSecret }}
valueFrom:
secretKeyRef:
name: {{ .Values.externalDatabase.existingSecret }}
key: {{ .Values.externalDatabase.existingSecretKeys.database }}
{{- else if and .Values.externalDatabase.enabled (not .Values.externalDatabase.existingSecret) }}
value: {{ .Values.externalDatabase.database }}
{{- else }}
value: postgres
{{- end }}
- 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:
secretKeyRef:
name: {{ .Values.externalDatabase.existingSecret }}
Expand Down