From 224c27047a0d84c91cccfabc3b2447d90fa684c2 Mon Sep 17 00:00:00 2001 From: Tim Campbell Date: Wed, 19 Mar 2025 08:22:46 +0100 Subject: [PATCH 1/2] Added additional clarifications for several comments (#180) --- values.yaml | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/values.yaml b/values.yaml index 26f69be..aecb48c 100644 --- a/values.yaml +++ b/values.yaml @@ -554,7 +554,13 @@ ingress: hosts: - streaming.mastodon.local -# -- https://github.com/bitnami/charts/tree/master/bitnami/elasticsearch#parameters +# Configuration for Elasticsearch. +# When enabled, the bitnami helm chart is used for Elasticsearch deployment, and +# all values here correspond to their values file. Please see the bitnami chart +# documentation: +# https://github.com/bitnami/charts/tree/master/bitnami/elasticsearch#parameters +# +# Please note that we recommend using your own deployment for better management. elasticsearch: # Elasticsearch is powering full-text search. It is optional. @@ -580,7 +586,13 @@ elasticsearch: # Name of an existing secret with a password key # existingSecret: +# Configuration for PostgreSQL. +# When enabled, the bitnami helm chart is used for PostgreSQL deployment, and +# all values here correspond to their values file. Please see the bitnami chart +# documentation: # https://github.com/bitnami/charts/tree/master/bitnami/postgresql#parameters +# +# Please note that we recommend using your own deployment for better management. postgresql: # -- disable if you want to use an existing db; in which case the values below # must match those of that external postgres instance. @@ -628,7 +640,13 @@ postgresql: password: existingSecret: +# Configuration for Redis. +# When enabled, the bitnami helm chart used for Redis deployment, and all values +# here correspond to their values file. Please see the bitnami chart +# documentation: # https://github.com/bitnami/charts/tree/master/bitnami/redis#parameters +# +# Please note that we recommend using your own deployment for better management. redis: # disable if you want to use an existing redis instance; in which case the # values below must match those of that external redis instance @@ -800,23 +818,23 @@ serviceAccount: # If not set and create is true, a name is generated using the fullname template name: "" -# Custom annotations to apply to all created deployment objects. These can be -# used to help mastodon interact with other services in the cluster. +# Custom annotations to apply to all created mastodon deployment objects. These +# can be used to help mastodon interact with other services in the cluster. deploymentAnnotations: {} # -- Kubernetes manages pods for jobs and pods for deployments differently, so you might # need to apply different annotations to the two different sets of pods. The annotations -# set with podAnnotations will be added to all deployment-managed pods. +# set with podAnnotations will be added to all mastodon deployment-managed pods. podAnnotations: {} # If set to true, an annotation with the current chart release number will be added to all mastodon pods. This will # cause all pods to be recreated every `helm upgrade` regardless of whether their config or spec changes. revisionPodAnnotation: true -# The annotations set with jobAnnotations will be added to all job pods. +# The annotations set with jobAnnotations will be added to all mastodon job pods jobAnnotations: {} -# -- Default resources for all Deployments and jobs unless overwritten +# -- Default resources for all mastodon Deployments and jobs unless overwritten resources: {} # We usually recommend not to specify default resources and to leave this as a conscious @@ -836,20 +854,20 @@ nodeSelector: {} # @ignored tolerations: [] -# -- Affinity for all pods unless overwritten +# -- Affinity for all mastodon pods unless overwritten affinity: {} -# -- Timezone for all pods unless overwritten +# -- Timezone for all mastodon pods unless overwritten timezone: UTC -# -- Topology Spread Constraints for all pods unless overwritten +# -- Topology Spread Constraints for all mastodon pods unless overwritten # Please note that you need to use `matchLabelKeys` (Kubernetes 1.25+) if you # want to spread each deployment independently, or override topologySpreadConstraints # for each deployment topologySpreadConstraints: {} -# Default volume mounts for all pods +# Default volume mounts for all mastodon pods volumeMounts: [] -# Default volumes for all pods +# Default volumes for all mastodon pods volumes: [] From 978a8569e53f06c697ef38b1b8e40f02840d07ab Mon Sep 17 00:00:00 2001 From: Tim Campbell Date: Wed, 26 Mar 2025 11:45:59 +0100 Subject: [PATCH 2/2] Shorten digest versions in app version label (#185) --- CHANGELOG.md | 4 ++++ Chart.yaml | 2 +- templates/_helpers.tpl | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4a01c5..f04ebb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 6.2.2 + +- `app.kubernetes.io/version` shortens any potential digest hash to 7 characters to avoid hitting the 63 character label limit. + # 6.2.1 - Fixed some situations where disabling all bitnami charts caused it to error. diff --git a/Chart.yaml b/Chart.yaml index 1683d61..4373419 100644 --- a/Chart.yaml +++ b/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: 6.2.1 +version: 6.2.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index 09bbb0a..d07e2ad 100644 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -48,7 +48,7 @@ helm.sh/chart: {{ include "mastodon.chart" . }} {{ include "mastodon.selectorLabels" . }} {{ include "mastodon.globalLabels" . }} {{- if .Values.image.tag }} -app.kubernetes.io/version: {{ .Values.image.tag | quote }} +app.kubernetes.io/version: {{ regexReplaceAll "@(\\w+:\\w{0,7})\\w*" .Values.image.tag "@${1}" | quote }} {{- else if .Chart.AppVersion }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }}