diff --git a/bitnami/metallb/Chart.yaml b/bitnami/metallb/Chart.yaml index ebf140236..9a0e88b56 100644 --- a/bitnami/metallb/Chart.yaml +++ b/bitnami/metallb/Chart.yaml @@ -30,4 +30,4 @@ sources: - https://github.com/metallb/metallb - https://github.com/bitnami/containers/tree/main/bitnami/metallb - https://metallb.universe.tf -version: 4.1.2 +version: 4.1.3 diff --git a/bitnami/metallb/templates/controller/deployment.yaml b/bitnami/metallb/templates/controller/deployment.yaml index 30c3fc203..9145fcb5a 100644 --- a/bitnami/metallb/templates/controller/deployment.yaml +++ b/bitnami/metallb/templates/controller/deployment.yaml @@ -127,28 +127,28 @@ spec: {{- include "common.tplvalues.render" (dict "value" .Values.controller.extraVolumeMounts "context" $) | nindent 12 }} {{- end }} {{- if not .Values.diagnosticMode.enabled }} - {{- if .Values.controller.livenessProbe.enabled }} + {{- if .Values.controller.customLivenessProbe }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.controller.customLivenessProbe "context" $) | nindent 12 }} + {{- else if .Values.controller.livenessProbe.enabled }} livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.controller.livenessProbe "enabled") "context" $) | nindent 12 }} httpGet: path: /metrics port: metrics - {{- else if .Values.controller.customLivenessProbe }} - livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.controller.customLivenessProbe "context" $) | nindent 12 }} {{- end }} - {{- if .Values.controller.readinessProbe.enabled }} + {{- if .Values.controller.customReadinessProbe }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.controller.customReadinessProbe "context" $) | nindent 12 }} + {{- else if .Values.controller.readinessProbe.enabled }} readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.controller.readinessProbe "enabled") "context" $) | nindent 12 }} httpGet: path: /metrics port: metrics - {{- else if .Values.controller.customReadinessProbe }} - readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.controller.customReadinessProbe "context" $) | nindent 12 }} {{- end }} - {{- if .Values.controller.startupProbe.enabled }} + {{- if .Values.controller.customStartupProbe }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.controller.customStartupProbe "context" $) | nindent 12 }} + {{- else if .Values.controller.startupProbe.enabled }} startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.controller.startupProbe "enabled") "context" $) | nindent 12 }} tcpSocket: port: metrics - {{- else if .Values.controller.customStartupProbe }} - startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.controller.customStartupProbe "context" $) | nindent 12 }} {{- end }} {{- end }} {{- if .Values.controller.resources }} diff --git a/bitnami/metallb/templates/speaker/daemonset.yaml b/bitnami/metallb/templates/speaker/daemonset.yaml index a72c8e638..8ab39d29d 100644 --- a/bitnami/metallb/templates/speaker/daemonset.yaml +++ b/bitnami/metallb/templates/speaker/daemonset.yaml @@ -126,28 +126,28 @@ spec: - name: metrics containerPort: {{ .Values.speaker.containerPorts.metrics }} {{- if not .Values.diagnosticMode.enabled }} - {{- if .Values.speaker.livenessProbe.enabled }} + {{- if .Values.speaker.customLivenessProbe }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.speaker.customLivenessProbe "context" $) | nindent 12 }} + {{- else if .Values.speaker.livenessProbe.enabled }} livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.speaker.livenessProbe "enabled") "context" $) | nindent 12 }} httpGet: path: /metrics port: metrics - {{- else if .Values.speaker.customLivenessProbe }} - livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.speaker.customLivenessProbe "context" $) | nindent 12 }} {{- end }} - {{- if .Values.speaker.readinessProbe.enabled }} + {{- if .Values.speaker.customReadinessProbe }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.speaker.customReadinessProbe "context" $) | nindent 12 }} + {{- else if .Values.speaker.readinessProbe.enabled }} readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.speaker.readinessProbe "enabled") "context" $) | nindent 12 }} httpGet: path: /metrics port: metrics - {{- else if .Values.speaker.customReadinessProbe }} - readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.speaker.customReadinessProbe "context" $) | nindent 12 }} {{- end }} - {{- if .Values.speaker.startupProbe.enabled }} + {{- if .Values.speaker.customStartupProbe }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.speaker.customStartupProbe "context" $) | nindent 12 }} + {{- else if .Values.speaker.startupProbe.enabled }} startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.speaker.startupProbe "enabled") "context" $) | nindent 12 }} tcpSocket: port: metrics - {{- else if .Values.speaker.customStartupProbe }} - startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.speaker.customStartupProbe "context" $) | nindent 12 }} {{- end }} {{- end }} {{- if .Values.speaker.resources }}