[bitnami/mastodon: Use merge helper]: (#19067)

bitnami/mastodon/Chart.yaml

@@ -12,41 +12,41 @@ annotations:
 apiVersion: v2
 appVersion: 4.1.7
 dependencies:
-- condition: redis.enabled
-  name: redis
-  repository: oci://registry-1.docker.io/bitnamicharts
-  version: 18.x.x
-- condition: postgresql.enabled
-  name: postgresql
-  repository: oci://registry-1.docker.io/bitnamicharts
-  version: 12.x.x
-- condition: elasticsearch.enabled
-  name: elasticsearch
-  repository: oci://registry-1.docker.io/bitnamicharts
-  version: 19.x.x
-- condition: minio.enabled
-  name: minio
-  repository: oci://registry-1.docker.io/bitnamicharts
-  version: 12.x.x
-- condition: apache.enabled
-  name: apache
-  repository: oci://registry-1.docker.io/bitnamicharts
-  version: 9.x.x
-- name: common
-  repository: oci://registry-1.docker.io/bitnamicharts
-  tags:
-  - bitnami-common
-  version: 2.x.x
+  - condition: redis.enabled
+    name: redis
+    repository: oci://registry-1.docker.io/bitnamicharts
+    version: 18.x.x
+  - condition: postgresql.enabled
+    name: postgresql
+    repository: oci://registry-1.docker.io/bitnamicharts
+    version: 12.x.x
+  - condition: elasticsearch.enabled
+    name: elasticsearch
+    repository: oci://registry-1.docker.io/bitnamicharts
+    version: 19.x.x
+  - condition: minio.enabled
+    name: minio
+    repository: oci://registry-1.docker.io/bitnamicharts
+    version: 12.x.x
+  - condition: apache.enabled
+    name: apache
+    repository: oci://registry-1.docker.io/bitnamicharts
+    version: 9.x.x
+  - name: common
+    repository: oci://registry-1.docker.io/bitnamicharts
+    tags:
+      - bitnami-common
+    version: 2.x.x
 description: Mastodon is self-hosted social network server based on ActivityPub. Written in Ruby, features real-time updates, multimedia attachments and no vendor lock-in.
 home: https://bitnami.com
 icon: https://bitnami.com/assets/stacks/mastodon/img/mastodon-stack-220x234.png
 keywords:
-- development
-- dashboards
+  - development
+  - dashboards
 maintainers:
-- name: VMware, Inc.
-  url: https://github.com/bitnami/charts
+  - name: VMware, Inc.
+    url: https://github.com/bitnami/charts
 name: mastodon
 sources:
-- https://github.com/bitnami/charts/tree/main/bitnami/mastodon
-version: 2.1.1
+  - https://github.com/bitnami/charts/tree/main/bitnami/mastodon
+version: 2.1.2

bitnami/mastodon/templates/init-job/init-job.yaml

@@ -19,7 +19,7 @@ spec:
   backoffLimit: {{ .Values.initJob.backoffLimit }}
   template:
     metadata:
-      {{- $podLabels := merge .Values.initJob.podLabels .Values.commonLabels }}
+      {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.initJob.podLabels .Values.commonLabels ) "context" . ) }}
       labels: {{- include "common.labels.standard" ( dict "customLabels" $podLabels "context" $ ) | nindent 8 }}
         app.kubernetes.io/component: init
       {{- if .Values.initJob.podAnnotations }}

bitnami/mastodon/templates/pvc.yaml

@@ -12,7 +12,7 @@ metadata:
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/part-of: mastodon
   {{- if or .Values.persistence.annotations .Values.commonAnnotations }}
-  {{- $annotations := merge .Values.persistence.annotations .Values.commonAnnotations }}
+  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.persistence.annotations .Values.commonAnnotations ) "context" . ) }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
   {{- end }}
 spec:

bitnami/mastodon/templates/service-account.yaml

@@ -12,7 +12,7 @@ metadata:
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/part-of: mastodon
   {{- if or .Values.serviceAccount.annotations .Values.commonAnnotations }}
-  {{- $annotations := merge .Values.serviceAccount.annotations .Values.commonAnnotations }}
+  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.serviceAccount.annotations .Values.commonAnnotations ) "context" . ) }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
   {{- end }}
 automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}

bitnami/mastodon/templates/sidekiq/deployment.yaml

@@ -20,7 +20,7 @@ spec:
   {{- if .Values.sidekiq.updateStrategy }}
   strategy: {{- toYaml .Values.sidekiq.updateStrategy | nindent 4 }}
   {{- end }}
-  {{- $podLabels := merge .Values.sidekiq.podLabels .Values.commonLabels }}
+  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.sidekiq.podLabels .Values.commonLabels ) "context" . ) }}
   selector:
     matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
       app.kubernetes.io/component: sidekiq

bitnami/mastodon/templates/streaming/deployment.yaml

@@ -20,7 +20,7 @@ spec:
   {{- if .Values.streaming.updateStrategy }}
   strategy: {{- toYaml .Values.streaming.updateStrategy | nindent 4 }}
   {{- end }}
-  {{- $podLabels := merge .Values.streaming.podLabels .Values.commonLabels }}
+  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.streaming.podLabels .Values.commonLabels ) "context" . ) }}
   selector:
     matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
       app.kubernetes.io/component: streaming

bitnami/mastodon/templates/streaming/service.yaml

@@ -12,7 +12,7 @@ metadata:
     app.kubernetes.io/part-of: mastodon
     app.kubernetes.io/component: streaming
   {{- if or .Values.streaming.service.annotations .Values.commonAnnotations }}
-  {{- $annotations := merge .Values.streaming.service.annotations .Values.commonAnnotations }}
+  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.streaming.service.annotations .Values.commonAnnotations ) "context" . ) }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
   {{- end }}
 spec:
@@ -48,6 +48,6 @@ spec:
     {{- if .Values.streaming.service.extraPorts }}
     {{- include "common.tplvalues.render" (dict "value" .Values.streaming.service.extraPorts "context" $) | nindent 4 }}
     {{- end }}
-  {{- $podLabels := merge .Values.streaming.podLabels .Values.commonLabels }}
+  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.streaming.podLabels .Values.commonLabels ) "context" . ) }}
   selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/component: streaming

bitnami/mastodon/templates/web/deployment.yaml

@@ -20,7 +20,7 @@ spec:
   {{- if .Values.web.updateStrategy }}
   strategy: {{- toYaml .Values.web.updateStrategy | nindent 4 }}
   {{- end }}
-  {{- $podLabels := merge .Values.web.podLabels .Values.commonLabels }}
+  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.web.podLabels .Values.commonLabels ) "context" . ) }}
   selector:
     matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
       app.kubernetes.io/component: web

bitnami/mastodon/templates/web/service.yaml

@@ -12,7 +12,7 @@ metadata:
     app.kubernetes.io/part-of: mastodon
     app.kubernetes.io/component: web
   {{- if or .Values.web.service.annotations .Values.commonAnnotations }}
-  {{- $annotations := merge .Values.web.service.annotations .Values.commonAnnotations }}
+  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.web.service.annotations .Values.commonAnnotations ) "context" . ) }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
   {{- end }}
 spec:
@@ -48,6 +48,6 @@ spec:
     {{- if .Values.web.service.extraPorts }}
     {{- include "common.tplvalues.render" (dict "value" .Values.web.service.extraPorts "context" $) | nindent 4 }}
     {{- end }}
-  {{- $podLabels := merge .Values.web.podLabels .Values.commonLabels }}
+  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.web.podLabels .Values.commonLabels ) "context" . ) }}
   selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/component: web