Merge branch 'main' into better-nodeselector

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 - Added `nodeSelector` fields for every resource type for better fine-grain tuning of where resources end up.
 
+# 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.

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 }}

values.yaml

@@ -577,7 +577,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.
 
@@ -615,7 +621,13 @@ elasticsearch:
   metrics:
     nodeSelector: {}
 
+# 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.
@@ -672,7 +684,13 @@ postgresql:
     cronjob:
       nodeSelector: {}
 
+# 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
@@ -850,23 +868,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
@@ -883,25 +901,29 @@ resources:
 # @ignored
 tolerations: []
 
-# -- Affinity for all pods unless overwritten
+# -- Affinity for all mastodon pods unless overwritten
 affinity: {}
 
+<<<<<<< HEAD
 # Node(s) on which we will deploy all resources.
 # Any node selectors specified for individual resources will override this
 # setting.
 nodeSelector: {}
 
 # -- Timezone for all pods unless overwritten
+=======
+# -- Timezone for all mastodon pods unless overwritten
+>>>>>>> main
 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: []