Skip to content

move more stuff to configmap-env, remove configmap, bump appVersion, add externalValkey.existingSecretKeys.port, regenerate docs, clean up deployment.yaml #20

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 4 commits into from
Jan 19, 2025
Merged

move more stuff to configmap-env, remove configmap, bump appVersion, add externalValkey.existingSecretKeys.port, regenerate docs, clean up deployment.yaml #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da9fb3a
move more stuff to configmap-env, remove configmap, bump appVersion, …
jessebot Jan 19, 2025
84372fb
helm-docs: automated action
github-actions[bot] Jan 19, 2025
68260d4
mail and valkey secrets now use helm chart name in names
jessebot Jan 19, 2025
4b3b44d
clean up valkey secret to allow only sourcing one or two secret keys …
jessebot Jan 19, 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
4 changes: 2 additions & 2 deletions charts/pixelfed/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ 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.7.0
version: 0.8.0

# This is the version number of the application being deployed.
# renovate:image=ghcr.io/mattlqx/docker-pixelfed
appVersion: "v0.12.3-nginx"
appVersion: "v0.12.4-nginx"

maintainers:
- name: "jessebot"
Expand Down
3 changes: 2 additions & 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.7.0](https://img.shields.io/badge/Version-0.7.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.8.0](https://img.shields.io/badge/Version-0.8.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

Expand Down Expand Up @@ -43,6 +43,7 @@ A Helm chart for deploying Pixelfed on Kubernetes
| externalValkey.existingSecret | string | `""` | get valkey credentials from an existing Kubernetes Secret |
| externalValkey.existingSecretKeys.host | string | `""` | key in existing Kubernetes Secret for host. If set, ignores externalValkey.host |
| externalValkey.existingSecretKeys.password | string | `""` | key in existing Kubernetes Secret for password. If set, ignores externalValkey.password |
| externalValkey.existingSecretKeys.port | string | `""` | key in existing Kubernetes Secret for port. If set, ignores externalValkey.port |
| externalValkey.host | string | `"valkey"` | |
| externalValkey.password | string | `"null"` | |
| externalValkey.port | string | `"6379"` | |
Expand Down
21 changes: 21 additions & 0 deletions charts/pixelfed/templates/configmap-env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,28 @@ data:
# mail
MAIL_DRIVER: "{{ .Values.pixelfed.mail.driver }}"
MAIL_ENCRYPTION: "{{ .Values.pixelfed.mail.encryption }}"
MAIL_FROM_ADDRESS: "{{ .Values.pixelfed.mail.from_address }}"
MAIL_FROM_NAME: "{{ .Values.pixelfed.mail.from_name }}"

# database configuration
DB_CONNECTION: {{ .Values.pixelfed.db.connection }}
DB_APPLY_NEW_MIGRATIONS_AUTOMATICALLY: "{{ .Values.pixelfed.db.apply_new_migrations_automatically }}"
{{- if .Values.postgresql.enabled }}
DB_PORT: {{ .Values.postgresql.primary.service.ports.postgresql | quote }}
DB_HOST: {{ .Values.postgresql.fullnameOverride }}
DB_USERNAME: postgres
DB_DATABASE: postgres
{{- end }}

# redis
{{- if .Values.valkey.enabled }}
REDIS_HOST: {{ printf "%s-primary" (.Values.valkey.fullnameOverride) }}
{{- else if and .Values.externalValkey.enabled (not .Values.externalValkey.existingSecret) (not .Values.externalValkey.existingSecretKeys.host) }}
REDIS_HOST: {{ .Values.externalValkey.port | quote }}
{{- end }}

{{- if .Values.valkey.enabled }}
REDIS_PORT: {{ .Values.valkey.primary.service.ports.valkey | quote }}
{{- else if .Values.externalValkey.enabled (not .Values.externalValkey.existingSecret) (not .Values.externalValkey.existingSecretKeys.port) }}
REDIS_PORT: {{ .Values.externalValkey.port | quote }}
{{- end }}
116 changes: 0 additions & 116 deletions charts/pixelfed/templates/configmap.yaml
View file
Open in desktop

This file was deleted.

127 changes: 70 additions & 57 deletions charts/pixelfed/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,16 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "pixelfed.serviceAccountName" . }}
{{- with .Values.podSecurityContext }}
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: {{ .Chart.Name }}
{{- with .Values.securityContext }}
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
{{- end }}
image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
ports:
Expand All @@ -44,35 +48,42 @@ spec:
- configMapRef:
name: {{ include "pixelfed.fullname" . }}-env
env:
# redis
# valkey AKA redis
{{- if and .Values.externalValkey.enabled .Values.externalValkey.existingSecretKeys.host }}
- name: REDIS_HOST
{{- if .Values.externalValkey.existingSecret }}
valueFrom:
secretKeyRef:
{{- if and .Values.externalValkey.existingSecret .Values.externalValkey.existingSecretKeys.host }}
name: {{ .Values.externalValkey.existingSecret }}
key: {{ .Values.externalValkey.existingSecretKeys.host }}
{{- else }}
value: {{ printf "%s-primary" (.Values.valkey.fullnameOverride) }}
{{- end }}
{{- else }}
name: {{ include "pixelfed.fullname" . }}-valkey
key: host
{{- end }}
{{- end }}

{{- if and .Values.externalValkey.enabled .Values.externalValkey.existingSecret .Values.externalValkey.existingSecretKeys.port }}
- name: REDIS_PORT
{{- if .Values.externalValkey }}
{{- if .Values.externalValkey.existingSecret }}
valueFrom:
secretKeyRef:
{{- if and .Values.externalValkey.existingSecret .Values.externalValkey.existingSecretKeys.port }}
name: {{ .Values.externalValkey.existingSecret }}
key: {{ .Values.externalValkey.existingSecretKeys.port }}
{{- else }}
value: {{ .Values.externalValkey.port | quote }}
{{- end }}
{{- else }}
value: {{ .Values.valkey.primary.service.ports.valkey | quote }}
{{- end }}
{{- else }}
name: {{ include "pixelfed.fullname" . }}-valkey
key: port
{{- end }}
{{- end }}

- name: REDIS_PASSWORD
valueFrom:
secretKeyRef:
{{- if .Values.externalValkey.existingSecret }}
{{- if and .Values.externalValkey.enabled .Values.externalValkey.existingSecret }}
name: {{ .Values.externalValkey.existingSecret }}
key: {{ .Values.externalValkey.existingSecretKeys.password }}
{{- else if and .Values.externalValkey.enabled (not .Values.externalValkey.existingSecret) }}
name: {{ include "pixelfed.fullname" . }}-valkey
key: password
{{- else if .Values.valkey.auth.existingSecret }}
name: {{ .Values.valkey.auth.existingSecret }}
key: password
Expand All @@ -89,7 +100,7 @@ spec:
name: {{ .Values.pixelfed.mail.existingSecret }}
key: {{ .Values.pixelfed.mail.existingSecretKeys.host }}
{{- else }}
name: pixelfed-mail
name: {{ include "pixelfed.fullname" . }}-mail
key: host
{{- end }}
- name: MAIL_PORT
Expand All @@ -99,21 +110,17 @@ spec:
name: {{ .Values.pixelfed.mail.existingSecret }}
key: {{ .Values.pixelfed.mail.existingSecretKeys.port }}
{{- else }}
name: pixelfed-mail
name: {{ include "pixelfed.fullname" . }}-mail
key: port
{{- end }}
- name: MAIL_FROM_ADDRESS
value: "{{ .Values.pixelfed.mail.from_address }}"
- name: MAIL_FROM_NAME
value: "{{ .Values.pixelfed.mail.from_name }}"
- name: MAIL_USERNAME
valueFrom:
secretKeyRef:
{{- if .Values.pixelfed.mail.existingSecret }}
name: {{ .Values.pixelfed.mail.existingSecret }}
key: {{ .Values.pixelfed.mail.existingSecretKeys.username }}
{{- else }}
name: pixelfed-mail
name: {{ include "pixelfed.fullname" . }}-mail
key: username
{{- end }}
- name: MAIL_PASSWORD
Expand All @@ -123,35 +130,63 @@ spec:
name: {{ .Values.pixelfed.mail.existingSecret }}
key: {{ .Values.pixelfed.mail.existingSecretKeys.password }}
{{- else }}
name: pixelfed-mail
name: {{ include "pixelfed.fullname" . }}-mail
key: password
{{- end }}

# database configuration
{{- if .Values.externalDatabase.enabled }}
- name: DB_HOST
{{- if and .Values.externalDatabase.enabled .Values.externalDatabase.existingSecret }}
valueFrom:
secretKeyRef:
{{- if and .Values.externalDatabase.enabled .Values.externalDatabase.existingSecret .Values.externalDatabase.existingSecretKeys.host }}
name: {{ .Values.externalDatabase.existingSecret }}
key: {{ .Values.externalDatabase.existingSecretKeys.host }}
{{- else if and .Values.externalDatabase.enabled (not .Values.externalDatabase.existingSecret) }}
value: {{ .Values.externalDatabase.host }}
{{- else }}
value: {{ .Values.postgresql.fullnameOverride }}
{{- end }}
{{- else if and .Values.externalDatabase.enabled (not .Values.externalDatabase.existingSecretKeys.host) }}
name: {{ include "pixelfed.fullname" . }}-database
key: host
{{- end }}
{{- end }}

{{- if .Values.externalDatabase.enabled }}
- name: DB_USERNAME
{{- if .Values.externalDatabase.enabled }}
{{- if .Values.externalDatabase.existingSecret }}
valueFrom:
secretKeyRef:
{{- if and .Values.externalDatabase.enabled .Values.externalDatabase.existingSecret .Values.externalDatabase.existingSecretKeys.username }}
name: {{ .Values.externalDatabase.existingSecret }}
key: {{ .Values.externalDatabase.existingSecretKeys.username }}
{{- else }}
value: {{ .Values.externalDatabase.username }}
{{- else if and .Values.externalDatabase.enabled (not .Values.externalDatabase.existingSecretKeys.username) }}
name: {{ include "pixelfed.fullname" . }}-database
key: username
{{- end }}
{{- end }}
{{- else }}
value: postgres

{{- if .Values.externalDatabase.enabled }}
- name: DB_DATABASE
valueFrom:
secretKeyRef:
{{- if and .Values.externalDatabase.enabled .Values.externalDatabase.existingSecret .Values.externalDatabase.existingSecretKeys.database }}
name: {{ .Values.externalDatabase.existingSecret }}
key: {{ .Values.externalDatabase.existingSecretKeys.database }}
{{- else if and .Values.externalDatabase.enabled (not .Values.externalDatabase.existingSecretKeys.database) }}
name: {{ include "pixelfed.fullname" . }}-database
key: database
{{- end }}
{{- end }}

{{- if .Values.externalDatabase.enabled }}
- name: DB_PORT
valueFrom:
secretKeyRef:
{{- if and .Values.externalDatabase.enabled .Values.externalDatabase.existingSecret .Values.externalDatabase.existingSecretKeys.port }}
name: {{ .Values.externalDatabase.existingSecret }}
key: {{ .Values.externalDatabase.existingSecretKeys.port }}
{{- else if and .Values.externalDatabase.enabled (not .Values.externalDatabase.existingSecretKeys.port) }}
name: {{ include "pixelfed.fullname" . }}-database
key: port
{{- end }}
{{- end }}

- name: DB_PASSWORD
{{- if and .Values.externalDatabase.enabled (not .Values.externalDatabase.existingSecret) }}
value: {{ .Values.externalDatabase.password }}
Expand All @@ -169,28 +204,6 @@ spec:
key: postgres-password
{{- end }}
{{- end }}
- name: DB_DATABASE
{{- 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 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 }}
key: {{ .Values.externalDatabase.existingSecretKeys.port }}
{{- else }}
value: {{ .Values.postgresql.primary.service.ports.postgresql | quote }}
{{- end }}

{{- with .Values.livenessProbe }}
livenessProbe:
Expand Down
Loading
Loading