Merge pull request #22 from small-hack/fix-external-valkey-reference

fix: was missing an 'and' for externalValkey conditional in configmap-env
This commit is contained in:
Jesse Hitch
2025-01-19 11:17:44 +01:00
committed by GitHub
3 changed files with 4 additions and 4 deletions
+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.8.1 version: 0.8.2
# 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
+1 -1
View File
@@ -1,6 +1,6 @@
# pixelfed # pixelfed
![Version: 0.8.1](https://img.shields.io/badge/Version-0.8.1-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.8.2](https://img.shields.io/badge/Version-0.8.2-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 A Helm chart for deploying Pixelfed on Kubernetes
+2 -2
View File
@@ -99,7 +99,7 @@ data:
DB_DATABASE: postgres DB_DATABASE: postgres
{{- end }} {{- end }}
# redis # valkey (redis)
{{- if .Values.valkey.enabled }} {{- if .Values.valkey.enabled }}
REDIS_HOST: {{ printf "%s-primary" (.Values.valkey.fullnameOverride) }} REDIS_HOST: {{ printf "%s-primary" (.Values.valkey.fullnameOverride) }}
{{- else if and .Values.externalValkey.enabled (not .Values.externalValkey.existingSecret) (not .Values.externalValkey.existingSecretKeys.host) }} {{- else if and .Values.externalValkey.enabled (not .Values.externalValkey.existingSecret) (not .Values.externalValkey.existingSecretKeys.host) }}
@@ -108,6 +108,6 @@ data:
{{- if .Values.valkey.enabled }} {{- if .Values.valkey.enabled }}
REDIS_PORT: {{ .Values.valkey.primary.service.ports.valkey | quote }} REDIS_PORT: {{ .Values.valkey.primary.service.ports.valkey | quote }}
{{- else if .Values.externalValkey.enabled (not .Values.externalValkey.existingSecret) (not .Values.externalValkey.existingSecretKeys.port) }} {{- else if and .Values.externalValkey.enabled (not .Values.externalValkey.existingSecret) (not .Values.externalValkey.existingSecretKeys.port) }}
REDIS_PORT: {{ .Values.externalValkey.port | quote }} REDIS_PORT: {{ .Values.externalValkey.port | quote }}
{{- end }} {{- end }}