diff --git a/bitnami/metallb/Chart.yaml b/bitnami/metallb/Chart.yaml index 3d41be1609..6a3ce4ce8b 100644 --- a/bitnami/metallb/Chart.yaml +++ b/bitnami/metallb/Chart.yaml @@ -35,4 +35,4 @@ maintainers: name: metallb sources: - https://github.com/bitnami/charts/tree/main/bitnami/metallb -version: 6.1.2 +version: 6.1.3 diff --git a/bitnami/metallb/templates/speaker/daemonset.yaml b/bitnami/metallb/templates/speaker/daemonset.yaml index 0a89438f01..c35d1dfee4 100644 --- a/bitnami/metallb/templates/speaker/daemonset.yaml +++ b/bitnami/metallb/templates/speaker/daemonset.yaml @@ -153,6 +153,14 @@ spec: fieldPath: metadata.namespace - name: METALLB_ML_SECRET_KEY_PATH value: /etc/memberlist + {{- if .Values.speaker.frr.enabled }} + - name: FRR_CONFIG_FILE + value: /etc/frr_reloader/frr.conf + - name: FRR_RELOADER_PID_FILE + value: /etc/frr_reloader/reloader.pid + - name: METALLB_BGP_TYPE + value: frr + {{- end }} {{- if .Values.speaker.extraEnvVars }} {{- include "common.tplvalues.render" ( dict "value" .Values.speaker.extraEnvVars "context" $ ) | nindent 12 }} {{- end }} @@ -252,6 +260,9 @@ spec: - name: reloader image: {{ include "common.images.image" (dict "imageRoot" .Values.speaker.frr.image "global" .Values.global) }} imagePullPolicy: {{ .Values.speaker.frr.image.pullPolicy }} + {{- if .Values.speaker.frr.containerSecurityContext.enabled }} + securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.speaker.frr.containerSecurityContext "context" $) | nindent 12 }} + {{- end }} command: ["/etc/frr_reloader/frr-reloader.sh"] volumeMounts: - name: frr-sockets @@ -268,6 +279,9 @@ spec: - name: frr-metrics image: {{ include "common.images.image" (dict "imageRoot" .Values.speaker.frr.image "global" .Values.global) }} imagePullPolicy: {{ .Values.speaker.frr.image.pullPolicy }} + {{- if .Values.speaker.frr.containerSecurityContext.enabled }} + securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.speaker.frr.containerSecurityContext "context" $) | nindent 12 }} + {{- end }} command: ["/etc/frr_metrics/frr-metrics"] {{- if .Values.speaker.frr.containerSecurityContext.enabled }} securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.speaker.frr.containerSecurityContext "context" $) | nindent 12 }}