Bump MetalLB

This commit bumps MetalLB: from: 417f016c4870f6c90b66c935ea97e1706d51dd86 Bump frrk8s to 0.0.14 (2024-07-19) to: 8e31dc95e06f2a2c96e48093417982d3664a2cda dev-env: Add missing parts to support dual stack (#2517) (2024-09-18) Signed-off-by: github-actions[bot] <[email protected]>
metallb · Sep 18, 2024 · e6385c0 · e6385c0
1 parent 7d8418f
commit e6385c0
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 15 deletions.
diff --git a/bin/metallb-operator.yaml b/bin/metallb-operator.yaml
@@ -383,6 +383,8 @@ spec:
     - jsonPath: .spec.ebgpMultiHop
       name: Multi Hops
       type: string
+    deprecated: true
+    deprecationWarning: v1beta1 is deprecated, please use v1beta2
     name: v1beta1
     schema:
       openAPIV3Schema:
@@ -4700,7 +4702,6 @@ rules:
   - metallb-webhook-configuration
   resources:
   - validatingwebhookconfigurations
-  - mutatingwebhookconfigurations
   verbs:
   - create
   - delete
@@ -4713,7 +4714,6 @@ rules:
   - admissionregistration.k8s.io
   resources:
   - validatingwebhookconfigurations
-  - mutatingwebhookconfigurations
   verbs:
   - list
   - watch

diff --git a/bindata/deployment/helm/metallb/templates/controller.yaml b/bindata/deployment/helm/metallb/templates/controller.yaml
@@ -84,7 +84,7 @@ spec:
         - name: METALLB_DEPLOYMENT
           value: controller
         {{- end }}
-        {{- if .Values.speaker.frr.enabled }}
+        {{- if and .Values.speaker.enabled .Values.speaker.frr.enabled }}
         - name: METALLB_BGP_TYPE
           value: frr
         {{- end }}

diff --git a/bindata/deployment/helm/metallb/templates/podmonitor.yaml b/bindata/deployment/helm/metallb/templates/podmonitor.yaml
@@ -36,6 +36,7 @@ spec:
     relabelings:
 {{- toYaml .Values.prometheus.podMonitor.relabelings | nindent 4 }}
 {{- end }}
+{{- if .Values.speaker.enabled }}
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
@@ -74,6 +75,7 @@ spec:
     relabelings:
 {{- toYaml .Values.prometheus.podMonitor.relabelings | nindent 4 }}
 {{- end }}
+{{- end }}
 ---
 {{- if .Values.prometheus.rbacPrometheus }}
 apiVersion: rbac.authorization.k8s.io/v1

diff --git a/bindata/deployment/helm/metallb/templates/servicemonitor.yaml b/bindata/deployment/helm/metallb/templates/servicemonitor.yaml
@@ -1,4 +1,5 @@
 {{- if .Values.prometheus.serviceMonitor.enabled }}
+{{- if .Values.speaker.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
@@ -89,6 +90,7 @@ spec:
 {{- end }}
   sessionAffinity: None
   type: ClusterIP
+{{- end }}
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -97,7 +99,6 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "metallb.labels" . | nindent 4 }}
-    component: speaker
     {{- if .Values.prometheus.serviceMonitor.controller.additionalLabels }}
 {{ toYaml .Values.prometheus.serviceMonitor.controller.additionalLabels | indent 4 }}
     {{- end }}

diff --git a/bindata/deployment/helm/metallb/values.yaml b/bindata/deployment/helm/metallb/values.yaml
@@ -42,7 +42,7 @@ prometheus:
   # certificate to be used.
   controllerMetricsTLSSecret: ""
 
-  # prometheus doens't have the permission to scrape all namespaces so we give it permission to scrape metallb's one
+  # prometheus doesn't have the permission to scrape all namespaces so we give it permission to scrape metallb's one
   rbacPrometheus: true
 
   # the service account used by prometheus
@@ -64,7 +64,7 @@ prometheus:
     # enable support for Prometheus Operator
     enabled: false
 
-    # optional additionnal labels for podMonitors
+    # optional additional labels for podMonitors
     additionalLabels: {}
 
     # optional annotations for podMonitors
@@ -143,7 +143,7 @@ prometheus:
     # enable alertmanager alerts
     enabled: false
 
-    # optional additionnal labels for prometheusRules
+    # optional additional labels for prometheusRules
     additionalLabels: {}
 
     # optional annotations for prometheusRules

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-07-22T10:18:02Z"
+    createdAt: "2024-09-18T17:05:13Z"
     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
@@ -547,7 +547,6 @@ spec:
                 - metallb-webhook-configuration
               resources:
                 - validatingwebhookconfigurations
-                - mutatingwebhookconfigurations
               verbs:
                 - create
                 - delete
@@ -560,7 +559,6 @@ spec:
                 - admissionregistration.k8s.io
               resources:
                 - validatingwebhookconfigurations
-                - mutatingwebhookconfigurations
               verbs:
                 - list
                 - watch

diff --git a/bundle/manifests/metallb.io_bgppeers.yaml b/bundle/manifests/metallb.io_bgppeers.yaml
@@ -39,6 +39,8 @@ spec:
     - jsonPath: .spec.ebgpMultiHop
       name: Multi Hops
       type: string
+    deprecated: true
+    deprecationWarning: v1beta1 is deprecated, please use v1beta2
     name: v1beta1
     schema:
       openAPIV3Schema:

diff --git a/config/crd/bases/metallb.io_bgppeers.yaml b/config/crd/bases/metallb.io_bgppeers.yaml
@@ -26,6 +26,8 @@ spec:
     - jsonPath: .spec.ebgpMultiHop
       name: Multi Hops
       type: string
+    deprecated: true
+    deprecationWarning: v1beta1 is deprecated, please use v1beta2
     name: v1beta1
     schema:
       openAPIV3Schema:

diff --git a/config/metallb_rbac/metallb.yaml b/config/metallb_rbac/metallb.yaml
@@ -376,7 +376,6 @@ rules:
       - metallb-webhook-configuration
     resources:
       - validatingwebhookconfigurations
-      - mutatingwebhookconfigurations
     verbs:
       - create
       - delete
@@ -389,7 +388,6 @@ rules:
       - admissionregistration.k8s.io
     resources:
       - validatingwebhookconfigurations
-      - mutatingwebhookconfigurations
     verbs:
       - list
       - watch

diff --git a/hack/metallb_ref.txt b/hack/metallb_ref.txt
@@ -1 +1 @@
-417f016c4870f6c90b66c935ea97e1706d51dd86
+8e31dc95e06f2a2c96e48093417982d3664a2cda
diff --git a/pkg/helm/testdata/ocp-metrics-controller-monitor.golden b/pkg/helm/testdata/ocp-metrics-controller-monitor.golden
@@ -9,7 +9,6 @@
             "app": "metallb",
             "app.kubernetes.io/managed-by": "Helm",
             "app.kubernetes.io/version": "v0.0.0",
-            "component": "speaker",
             "helm.sh/chart": "metallb-0.0.0"
         },
         "name": "controller-monitor",

diff --git a/pkg/helm/testdata/vanilla-metrics-controller-monitor.golden b/pkg/helm/testdata/vanilla-metrics-controller-monitor.golden
@@ -6,7 +6,6 @@
             "app": "metallb",
             "app.kubernetes.io/managed-by": "Helm",
             "app.kubernetes.io/version": "v0.0.0",
-            "component": "speaker",
             "helm.sh/chart": "metallb-0.0.0"
         },
         "name": "controller-monitor",