From 088b05fce8c7db87cae48206ad9d0944437d7fab Mon Sep 17 00:00:00 2001 From: holysoles Date: Fri, 17 Jan 2025 11:17:48 -0600 Subject: [PATCH 1/4] fix(chart): properly indent valkey subchart settings --- charts/pixelfed/values.yaml | 59 +++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/charts/pixelfed/values.yaml b/charts/pixelfed/values.yaml index 202b1a6..125a7ef 100644 --- a/charts/pixelfed/values.yaml +++ b/charts/pixelfed/values.yaml @@ -185,38 +185,39 @@ valkey: enabled: true existingSecret: "" existingSecretPasswordKey: "password" - # TLS settings - tls: - enabled: false - authClients: true - autoGenerated: false - - # primary (control plane) configuration - primary: - persistence: - enabled: true - existingClaim: "" - - # valkey replica configuration - replica: - persistence: - enabled: true - existingClaim: "" - - # persistnent volume retention policy for the StatefulSet - persistentVolumeClaimRetentionPolicy: + + # TLS settings + tls: + enabled: false + authClients: true + autoGenerated: false + + # primary (control plane) configuration + primary: + persistence: + enabled: true + existingClaim: "" + + # valkey replica configuration + replica: + persistence: enabled: true - whenScaled: Retain - whenDeleted: Retain + existingClaim: "" - metrics: - # we use a grafana exporter that logs into valkey directly - enabled: false + # persistnent volume retention policy for the StatefulSet + persistentVolumeClaimRetentionPolicy: + enabled: true + whenScaled: Retain + whenDeleted: Retain + + metrics: + # we use a grafana exporter that logs into valkey directly + enabled: false - # definitions: https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_resources.tpl#L15 - # Options: nano, micro, small, medium, large, xlarge, 2xlarge - # default: nano - resourcesPreset: "small" + # definitions: https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_resources.tpl#L15 + # Options: nano, micro, small, medium, large, xlarge, 2xlarge + # default: nano + resourcesPreset: "small" postgresql: From acd14f1d061767efdc160d4a92fdb4d23a0e841c Mon Sep 17 00:00:00 2001 From: holysoles Date: Fri, 17 Jan 2025 16:30:34 -0600 Subject: [PATCH 2/4] fix(chart): allow FLUSHDB in valkey, required by Laravel --- charts/pixelfed/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/pixelfed/values.yaml b/charts/pixelfed/values.yaml index 125a7ef..30846dc 100644 --- a/charts/pixelfed/values.yaml +++ b/charts/pixelfed/values.yaml @@ -194,6 +194,8 @@ valkey: # primary (control plane) configuration primary: + disableCommands: # Laravel requires the ability to call FLUSHDB, which is disabled by default + - FLUSHALL persistence: enabled: true existingClaim: "" From 1b42bf65a24cdefd46b7e122b2bcb180c9901662 Mon Sep 17 00:00:00 2001 From: Jesse Hitch Date: Sat, 18 Jan 2025 10:21:22 +0100 Subject: [PATCH 3/4] Apply suggestions from code review - fix values.yaml comments --- charts/pixelfed/values.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/charts/pixelfed/values.yaml b/charts/pixelfed/values.yaml index 30846dc..6fcb6b4 100644 --- a/charts/pixelfed/values.yaml +++ b/charts/pixelfed/values.yaml @@ -194,7 +194,8 @@ valkey: # primary (control plane) configuration primary: - disableCommands: # Laravel requires the ability to call FLUSHDB, which is disabled by default + # -- Laravel requires the ability to call FLUSHDB, which is disabled by default + disableCommands: - FLUSHALL persistence: enabled: true @@ -213,10 +214,10 @@ valkey: whenDeleted: Retain metrics: - # we use a grafana exporter that logs into valkey directly + # -- we use a grafana exporter that logs into valkey directly, but you can enable this if you don't use that enabled: false - # definitions: https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_resources.tpl#L15 + # -- definitions: https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_resources.tpl#L15 # Options: nano, micro, small, medium, large, xlarge, 2xlarge # default: nano resourcesPreset: "small" From 4fa957dad08464c677de7487e3818e46246bbcef Mon Sep 17 00:00:00 2001 From: jessebot Date: Sat, 18 Jan 2025 10:22:17 +0100 Subject: [PATCH 4/4] bump chart version and regenerate docs --- charts/pixelfed/Chart.yaml | 2 +- charts/pixelfed/README.md | 29 +++++++++++++++-------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/charts/pixelfed/Chart.yaml b/charts/pixelfed/Chart.yaml index 6f792ac..644ccf7 100644 --- a/charts/pixelfed/Chart.yaml +++ b/charts/pixelfed/Chart.yaml @@ -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.2.1 +version: 0.3.1 # This is the version number of the application being deployed. # renovate:image=ghcr.io/mattlqx/docker-pixelfed diff --git a/charts/pixelfed/README.md b/charts/pixelfed/README.md index 2e1bb3c..5f73089 100644 --- a/charts/pixelfed/README.md +++ b/charts/pixelfed/README.md @@ -1,6 +1,6 @@ # pixelfed -![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.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) +![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.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 @@ -171,23 +171,24 @@ A Helm chart for deploying Pixelfed on Kubernetes | valkey.auth.enabled | bool | `true` | | | valkey.auth.existingSecret | string | `""` | | | valkey.auth.existingSecretPasswordKey | string | `"password"` | | -| valkey.auth.metrics.enabled | bool | `false` | | -| valkey.auth.persistentVolumeClaimRetentionPolicy.enabled | bool | `true` | | -| valkey.auth.persistentVolumeClaimRetentionPolicy.whenDeleted | string | `"Retain"` | | -| valkey.auth.persistentVolumeClaimRetentionPolicy.whenScaled | string | `"Retain"` | | -| valkey.auth.primary.persistence.enabled | bool | `true` | | -| valkey.auth.primary.persistence.existingClaim | string | `""` | | -| valkey.auth.replica.persistence.enabled | bool | `true` | | -| valkey.auth.replica.persistence.existingClaim | string | `""` | | -| valkey.auth.resourcesPreset | string | `"small"` | | -| valkey.auth.tls.authClients | bool | `true` | | -| valkey.auth.tls.autoGenerated | bool | `false` | | -| valkey.auth.tls.enabled | bool | `false` | | | valkey.enabled | bool | `true` | enable the bundled valkey sub chart from Bitnami. Must set to true if externalValkey.enabled=false | | valkey.fullnameOverride | string | `"valkey"` | | | valkey.global.storageClass | string | `""` | | +| valkey.metrics.enabled | bool | `false` | we use a grafana exporter that logs into valkey directly, but you can enable this if you don't use that | +| valkey.persistentVolumeClaimRetentionPolicy.enabled | bool | `true` | | +| valkey.persistentVolumeClaimRetentionPolicy.whenDeleted | string | `"Retain"` | | +| valkey.persistentVolumeClaimRetentionPolicy.whenScaled | string | `"Retain"` | | +| valkey.primary.disableCommands | list | `["FLUSHALL"]` | Laravel requires the ability to call FLUSHDB, which is disabled by default | +| valkey.primary.persistence.enabled | bool | `true` | | +| valkey.primary.persistence.existingClaim | string | `""` | | +| valkey.replica.persistence.enabled | bool | `true` | | +| valkey.replica.persistence.existingClaim | string | `""` | | +| valkey.resourcesPreset | string | `"small"` | definitions: https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_resources.tpl#L15 Options: nano, micro, small, medium, large, xlarge, 2xlarge default: nano | +| valkey.tls.authClients | bool | `true` | | +| valkey.tls.autoGenerated | bool | `false` | | +| valkey.tls.enabled | bool | `false` | | | volumeMounts | list | `[]` | Additional volumeMounts on the output Deployment definition. | | volumes | list | `[]` | Additional volumes on the output Deployment definition. | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)