From 2b5d9f6aa8d35eaa578a39293a5698f46222647e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <noreply@github.com>
Date: Mon, 23 Dec 2024 05:07:03 +0000
Subject: [PATCH] Bump MetalLB

This commit bumps MetalLB:
from: eeb320f15b70603ec6b93fe8ec3c290384b8a2a0
website: fix L2Advertisement doc example (2024-12-13)

to:  474dbc727fe4047f2593e0160de66f3a925c7573
Prepare the 0.14.9 release notes (2024-12-17)

Signed-off-by: github-actions[bot] <noreply@github.com>
---
 bindata/deployment/helm/metallb/templates/servicemonitor.yaml | 4 ++++
 bundle/manifests/metallb-operator.clusterserviceversion.yaml  | 2 +-
 hack/metallb_ref.txt                                          | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bindata/deployment/helm/metallb/templates/servicemonitor.yaml b/bindata/deployment/helm/metallb/templates/servicemonitor.yaml
index 5dac9e11c..fe5f02847 100644
--- a/bindata/deployment/helm/metallb/templates/servicemonitor.yaml
+++ b/bindata/deployment/helm/metallb/templates/servicemonitor.yaml
@@ -1,3 +1,7 @@
+{{- if and .Values.prometheus.serviceMonitor.enabled .Values.prometheus.podMonitor.enabled }}
+{{- fail "prometheus.serviceMonitor.enabled and prometheus.podMonitor.enabled cannot both be set" }}
+{{- end }}
+
 {{- if .Values.prometheus.serviceMonitor.enabled }}
 {{- if .Values.speaker.enabled }}
 apiVersion: monitoring.coreos.com/v1
diff --git a/bundle/manifests/metallb-operator.clusterserviceversion.yaml b/bundle/manifests/metallb-operator.clusterserviceversion.yaml
index a70fa75e2..c5354a75f 100644
--- a/bundle/manifests/metallb-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/metallb-operator.clusterserviceversion.yaml
@@ -432,7 +432,7 @@ metadata:
     categories: Networking
     certified: "false"
     containerImage: quay.io/metallb/metallb-operator
-    createdAt: "2024-12-16T10:14:17Z"
+    createdAt: "2024-12-23T05:06:10Z"
     description: An operator for deploying MetalLB on a kubernetes cluster.
     operators.operatorframework.io/builder: operator-sdk-v1.34.1
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
diff --git a/hack/metallb_ref.txt b/hack/metallb_ref.txt
index 3f2ecb4ec..f974fa88c 100644
--- a/hack/metallb_ref.txt
+++ b/hack/metallb_ref.txt
@@ -1 +1 @@
-eeb320f15b70603ec6b93fe8ec3c290384b8a2a0
+474dbc727fe4047f2593e0160de66f3a925c7573