diff --git a/bitnami/metallb/Chart.yaml b/bitnami/metallb/Chart.yaml index 3f5fd8073b..ef51f4b7cb 100644 --- a/bitnami/metallb/Chart.yaml +++ b/bitnami/metallb/Chart.yaml @@ -12,27 +12,27 @@ annotations: apiVersion: v2 appVersion: 0.13.11 dependencies: -- name: common - repository: oci://registry-1.docker.io/bitnamicharts - tags: - - bitnami-common - version: 2.x.x + - name: common + repository: oci://registry-1.docker.io/bitnamicharts + tags: + - bitnami-common + version: 2.x.x description: MetalLB is a load-balancer implementation for bare metal Kubernetes clusters, using standard routing protocols. home: https://bitnami.com icon: https://bitnami.com/assets/stacks/metallb-speaker/img/metallb-speaker-stack-220x234.png keywords: -- load-balancer -- balancer -- lb -- bgp -- arp -- vrrp -- vip + - load-balancer + - balancer + - lb + - bgp + - arp + - vrrp + - vip kubeVersion: '>= 1.19.0-0' maintainers: -- name: VMware, Inc. - url: https://github.com/bitnami/charts + - name: VMware, Inc. + url: https://github.com/bitnami/charts name: metallb sources: -- https://github.com/bitnami/charts/tree/main/bitnami/metallb -version: 4.7.1 + - https://github.com/bitnami/charts/tree/main/bitnami/metallb +version: 4.7.2 diff --git a/bitnami/metallb/templates/controller/deployment.yaml b/bitnami/metallb/templates/controller/deployment.yaml index 0d94ff7b0c..3391555558 100644 --- a/bitnami/metallb/templates/controller/deployment.yaml +++ b/bitnami/metallb/templates/controller/deployment.yaml @@ -19,7 +19,7 @@ spec: strategy: {{- toYaml .Values.controller.updateStrategy | nindent 4 }} {{- end }} revisionHistoryLimit: {{ .Values.controller.revisionHistoryLimit }} - {{- $podLabels := merge .Values.controller.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.controller.podLabels .Values.commonLabels ) "context" . ) }} selector: matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }} app.kubernetes.io/component: controller diff --git a/bitnami/metallb/templates/controller/networkpolicy.yaml b/bitnami/metallb/templates/controller/networkpolicy.yaml index 5802186cbb..4824dbb044 100644 --- a/bitnami/metallb/templates/controller/networkpolicy.yaml +++ b/bitnami/metallb/templates/controller/networkpolicy.yaml @@ -15,7 +15,7 @@ metadata: annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- end }} spec: - {{- $podLabels := merge .Values.controller.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.controller.podLabels .Values.commonLabels ) "context" . ) }} podSelector: matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }} app.kubernetes.io/component: controller diff --git a/bitnami/metallb/templates/controller/service.yaml b/bitnami/metallb/templates/controller/service.yaml index a717e64546..f26171656a 100644 --- a/bitnami/metallb/templates/controller/service.yaml +++ b/bitnami/metallb/templates/controller/service.yaml @@ -12,13 +12,13 @@ metadata: labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: controller {{- if or .Values.controller.metrics.service.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.controller.metrics.service.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.controller.metrics.service.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: type: ClusterIP clusterIP: "None" - {{- $podLabels := merge .Values.controller.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.controller.podLabels .Values.commonLabels ) "context" . ) }} selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: controller ports: diff --git a/bitnami/metallb/templates/controller/serviceaccount.yaml b/bitnami/metallb/templates/controller/serviceaccount.yaml index ee952f03eb..2c4c57cab7 100644 --- a/bitnami/metallb/templates/controller/serviceaccount.yaml +++ b/bitnami/metallb/templates/controller/serviceaccount.yaml @@ -12,7 +12,7 @@ metadata: labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: controller {{- if or .Values.controller.serviceAccount.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.controller.serviceAccount.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.controller.serviceAccount.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} automountServiceAccountToken: {{ .Values.controller.serviceAccount.automountServiceAccountToken }} diff --git a/bitnami/metallb/templates/controller/servicemonitor.yaml b/bitnami/metallb/templates/controller/servicemonitor.yaml index d61bf21d2e..9bcc342afa 100644 --- a/bitnami/metallb/templates/controller/servicemonitor.yaml +++ b/bitnami/metallb/templates/controller/servicemonitor.yaml @@ -9,7 +9,7 @@ kind: ServiceMonitor metadata: name: {{ printf "%s-controller" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }} namespace: {{ default .Release.Namespace .Values.controller.metrics.serviceMonitor.namespace | quote }} - {{- $labels := merge .Values.controller.metrics.serviceMonitor.labels .Values.commonLabels }} + {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.controller.metrics.serviceMonitor.labels .Values.commonLabels ) "context" . ) }} labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }} app.kubernetes.io/component: controller {{- if .Values.commonAnnotations }} diff --git a/bitnami/metallb/templates/controller/webhooks.yaml b/bitnami/metallb/templates/controller/webhooks.yaml index 039bef5f99..787c80561d 100644 --- a/bitnami/metallb/templates/controller/webhooks.yaml +++ b/bitnami/metallb/templates/controller/webhooks.yaml @@ -159,7 +159,7 @@ spec: ports: - port: 443 targetPort: 9443 - {{- $podLabels := merge .Values.controller.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.controller.podLabels .Values.commonLabels ) "context" . ) }} selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: controller --- diff --git a/bitnami/metallb/templates/speaker/daemonset.yaml b/bitnami/metallb/templates/speaker/daemonset.yaml index a3f4da7af8..aacc0c96da 100644 --- a/bitnami/metallb/templates/speaker/daemonset.yaml +++ b/bitnami/metallb/templates/speaker/daemonset.yaml @@ -18,7 +18,7 @@ spec: {{- if .Values.speaker.updateStrategy }} updateStrategy: {{- toYaml .Values.speaker.updateStrategy | nindent 4 }} {{- end }} - {{- $podLabels := merge .Values.speaker.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.speaker.podLabels .Values.commonLabels ) "context" . ) }} selector: matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }} app.kubernetes.io/component: speaker diff --git a/bitnami/metallb/templates/speaker/service.yaml b/bitnami/metallb/templates/speaker/service.yaml index 14dd73433e..0bc22dfd38 100644 --- a/bitnami/metallb/templates/speaker/service.yaml +++ b/bitnami/metallb/templates/speaker/service.yaml @@ -12,13 +12,13 @@ metadata: labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: speaker {{- if or .Values.speaker.metrics.service.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.speaker.metrics.service.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.speaker.metrics.service.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: type: ClusterIP clusterIP: "None" - {{- $podLabels := merge .Values.speaker.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.speaker.podLabels .Values.commonLabels ) "context" . ) }} selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: speaker ports: diff --git a/bitnami/metallb/templates/speaker/serviceaccount.yaml b/bitnami/metallb/templates/speaker/serviceaccount.yaml index 957a01a815..838444b64f 100644 --- a/bitnami/metallb/templates/speaker/serviceaccount.yaml +++ b/bitnami/metallb/templates/speaker/serviceaccount.yaml @@ -12,7 +12,7 @@ metadata: labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: speaker {{- if or .Values.speaker.serviceAccount.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.speaker.serviceAccount.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.speaker.serviceAccount.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} automountServiceAccountToken: {{ .Values.speaker.serviceAccount.automountServiceAccountToken }} diff --git a/bitnami/metallb/templates/speaker/servicemonitor.yaml b/bitnami/metallb/templates/speaker/servicemonitor.yaml index f2caacb029..53f1ea85b5 100644 --- a/bitnami/metallb/templates/speaker/servicemonitor.yaml +++ b/bitnami/metallb/templates/speaker/servicemonitor.yaml @@ -9,7 +9,7 @@ kind: ServiceMonitor metadata: name: {{ printf "%s-speaker" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }} namespace: {{ default .Release.Namespace .Values.speaker.metrics.serviceMonitor.namespace | quote }} - {{- $labels := merge .Values.speaker.metrics.serviceMonitor.labels .Values.commonLabels }} + {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.speaker.metrics.serviceMonitor.labels .Values.commonLabels ) "context" . ) }} labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }} app.kubernetes.io/component: speaker {{- if .Values.commonAnnotations }}