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] <[email protected]>
metallb · Dec 23, 2024 · 2b5d9f6 · 2b5d9f6
1 parent dedfed2
commit 2b5d9f6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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
@@ -1 +1 @@
-eeb320f15b70603ec6b93fe8ec3c290384b8a2a0
+474dbc727fe4047f2593e0160de66f3a925c7573
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		eeb320f15b70603ec6b93fe8ec3c290384b8a2a0
		474dbc727fe4047f2593e0160de66f3a925c7573