Bump MetalLB

This commit bumps MetalLB: from: 2e8ad2dba31bc3cd3d416b08d9e8df1f40a50a50 apply Prometheus best practices to existing alerts (2024-10-11) to: ca9b1cdf6d24d351bfc50774a71e2928900560c7 E2E: add changes to support unnumbered BGP (2024-12-11) Signed-off-by: github-actions[bot] <[email protected]>
metallb · Dec 12, 2024 · cbf4e9a · cbf4e9a
1 parent 6abf1c6
commit cbf4e9a
Show file tree

Hide file tree

Showing 17 changed files with 65 additions and 58 deletions.
diff --git a/bin/metallb-operator.yaml b/bin/metallb-operator.yaml
@@ -569,10 +569,10 @@ spec:
                 type: boolean
               enableGracefulRestart:
                 description: |-
-                  EnableGracefulRestart allows BGP peer to continue to forward data packets along
-                  known routes while the routing protocol information is being restored.
-                  This field is immutable because it requires restart of the BGP session
-                  Supported for FRR mode only.
+                  EnableGracefulRestart allows BGP peer to continue to forward data packets
+                  along known routes while the routing protocol information is being
+                  restored. This field is immutable because it requires restart of the BGP
+                  session. Supported for FRR mode only.
                 type: boolean
                 x-kubernetes-validations:
                 - message: EnableGracefulRestart cannot be changed after creation
@@ -4024,7 +4024,7 @@ spec:
         - name: DEPLOY_KUBE_RBAC_PROXIES
           value: "false"
         - name: FRRK8S_IMAGE
-          value: quay.io/metallb/frr-k8s:v0.0.15
+          value: quay.io/metallb/frr-k8s:v0.0.16
         - name: FRRK8S_EXTERNAL_NAMESPACE
           value: frr-k8s-system
         - name: OPERATOR_NAMESPACE

diff --git a/bindata/deployment/helm/frr-k8s/Chart.lock b/bindata/deployment/helm/frr-k8s/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: crds
   repository: ""
-  version: 0.0.15
-digest: sha256:7c9dcf2405fb90e548b7f8c593065648385092794431b2dcb8288d957aacad2e
-generated: "2024-09-17T14:17:43.040895+03:00"
+  version: 0.0.16
+digest: sha256:b54ee64c5e61f1dd38e89efc87ebd1e36cdb7c4dd7c897d9985040dccd713dba
+generated: "2024-11-22T11:40:47.152053909+01:00"
diff --git a/bindata/deployment/helm/frr-k8s/Chart.yaml b/bindata/deployment/helm/frr-k8s/Chart.yaml
@@ -22,9 +22,9 @@ kubeVersion: ">= 1.19.0-0"
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 # NOTE: this value is updated by the frrk8s release process
-version: 0.0.15
+version: 0.0.16
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # NOTE: this value is updated by the frrk8s release process
-appVersion: v0.0.15
+appVersion: v0.0.16
diff --git a/bindata/deployment/helm/frr-k8s/README.md b/bindata/deployment/helm/frr-k8s/README.md
@@ -1,6 +1,6 @@
 # frr-k8s
 
-![Version: 0.0.15](https://img.shields.io/badge/Version-0.0.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.0.15](https://img.shields.io/badge/AppVersion-v0.0.15-informational?style=flat-square)
+![Version: 0.0.16](https://img.shields.io/badge/Version-0.0.16-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.0.16](https://img.shields.io/badge/AppVersion-v0.0.16-informational?style=flat-square)
 
 A cloud native wrapper of FRR
 
@@ -16,7 +16,7 @@ Kubernetes: `>= 1.19.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-|  | crds | 0.0.15 |
+|  | crds | 0.0.16 |
 
 ## Values
 
@@ -27,6 +27,7 @@ Kubernetes: `>= 1.19.0-0`
 | frrk8s.affinity | object | `{}` |  |
 | frrk8s.alwaysBlock | string | `""` |  |
 | frrk8s.disableCertRotation | bool | `false` |  |
+| frrk8s.frr.acceptIncomingBGPConnections | bool | `false` |  |
 | frrk8s.frr.image.pullPolicy | string | `nil` |  |
 | frrk8s.frr.image.repository | string | `"quay.io/frrouting/frr"` |  |
 | frrk8s.frr.image.tag | string | `"9.1.0"` |  |
@@ -35,7 +36,6 @@ Kubernetes: `>= 1.19.0-0`
 | frrk8s.frr.resources | object | `{}` |  |
 | frrk8s.frr.secureMetricsPort | int | `9141` |  |
 | frrk8s.frrMetrics.resources | object | `{}` |  |
-| frrk8s.healthPort | int | `8081` |  |
 | frrk8s.image.pullPolicy | string | `nil` |  |
 | frrk8s.image.repository | string | `"quay.io/metallb/frr-k8s"` |  |
 | frrk8s.image.tag | string | `nil` |  |

diff --git a/bindata/deployment/helm/frr-k8s/templates/controller.yaml b/bindata/deployment/helm/frr-k8s/templates/controller.yaml
@@ -50,7 +50,7 @@ data:
     #
     vtysh_enable=yes
     zebra_options="  -A 127.0.0.1 -s 90000000"
-    bgpd_options="   -A 127.0.0.1"
+    bgpd_options="   -A 127.0.0.1 {{ if not .Values.frrk8s.frr.acceptIncomingBGPConnections }} -p 0 {{- end }}"
     ospfd_options="  -A 127.0.0.1"
     ospf6d_options=" -A ::1"
     ripd_options="   -A 127.0.0.1"
@@ -199,7 +199,6 @@ spec:
         {{- with .Values.frrk8s.logLevel }}
         - --log-level={{ . }}
         {{- end }}
-        - --health-probe-bind-address={{.Values.prometheus.metricsBindAddress}}:{{ .Values.frrk8s.healthPort }}
         {{- if .Values.frrk8s.alwaysBlock }}
         - --always-block={{ .Values.frrk8s.alwaysBlock }}
         {{- end }}
@@ -222,8 +221,8 @@ spec:
         {{- if .Values.frrk8s.livenessProbe.enabled }}
         livenessProbe:
           httpGet:
-            path: /healthz
-            port: {{ .Values.frrk8s.healthPort }}
+            path: /metrics
+            port: monitoring
             host: {{ .Values.prometheus.metricsBindAddress }}
           initialDelaySeconds: {{ .Values.frrk8s.livenessProbe.initialDelaySeconds }}
           periodSeconds: {{ .Values.frrk8s.livenessProbe.periodSeconds }}
@@ -234,8 +233,8 @@ spec:
         {{- if .Values.frrk8s.readinessProbe.enabled }}
         readinessProbe:
           httpGet:
-            path: /healthz
-            port: {{ .Values.frrk8s.healthPort }}
+            path: /metrics
+            port: monitoring
             host: {{ .Values.prometheus.metricsBindAddress }}
           initialDelaySeconds: {{ .Values.frrk8s.readinessProbe.initialDelaySeconds }}
           periodSeconds: {{ .Values.frrk8s.readinessProbe.periodSeconds }}

diff --git a/bindata/deployment/helm/frr-k8s/templates/webhooks.yaml b/bindata/deployment/helm/frr-k8s/templates/webhooks.yaml
@@ -42,7 +42,7 @@ spec:
         - "--restart-on-rotator-secret-refresh=true"
         {{- end }}
         - "--namespace=$(NAMESPACE)"
-        - --health-probe-bind-address=:8081
+        - "--metrics-bind-address=:{{ .Values.prometheus.metricsPort }}"
         env:
         - name: NAMESPACE
           valueFrom:
@@ -59,20 +59,23 @@ spec:
             drop:
               - ALL
           readOnlyRootFilesystem: true
+        ports:
+        - containerPort: {{ .Values.prometheus.metricsPort }}
+          name: monitoring
         {{- if .Values.frrk8s.livenessProbe.enabled }}
         livenessProbe:
           httpGet:
-            path: /healthz
-            port: 8081
+            path: /metrics
+            port: monitoring
           initialDelaySeconds: {{ .Values.frrk8s.livenessProbe.initialDelaySeconds }}
           periodSeconds: {{ .Values.frrk8s.livenessProbe.periodSeconds }}
           failureThreshold: {{ .Values.frrk8s.livenessProbe.failureThreshold }}
         {{- end }}
         {{- if .Values.frrk8s.readinessProbe.enabled }}
         readinessProbe:
           httpGet:
-            path: /readyz
-            port: 8081
+            path: /metrics
+            port: monitoring
           initialDelaySeconds: {{ .Values.frrk8s.readinessProbe.initialDelaySeconds }}
           periodSeconds: {{ .Values.frrk8s.readinessProbe.periodSeconds }}
           failureThreshold: {{ .Values.frrk8s.readinessProbe.failureThreshold }}

diff --git a/bindata/deployment/helm/frr-k8s/values.yaml b/bindata/deployment/helm/frr-k8s/values.yaml
@@ -128,7 +128,6 @@ frrk8s:
   podAnnotations: {}
   labels:
     app: frr-k8s
-  healthPort: 8081
   livenessProbe:
     enabled: true
     failureThreshold: 3
@@ -164,6 +163,7 @@ frrk8s:
     metricsPort: 7573
     resources: {}
     secureMetricsPort: 9141
+    acceptIncomingBGPConnections: false
   reloader:
     resources: {}
   frrMetrics:

diff --git a/bindata/deployment/helm/metallb/Chart.lock b/bindata/deployment/helm/metallb/Chart.lock
@@ -4,6 +4,6 @@ dependencies:
   version: 0.0.0
 - name: frr-k8s
   repository: https://metallb.github.io/frr-k8s
-  version: 0.0.15
-digest: sha256:2300c788e6c8f7d5f3b51ba37b20ed00b9e949c16f5aff880977703ac154f75f
-generated: "2024-09-17T15:14:34.977441+03:00"
+  version: 0.0.16
+digest: sha256:ad791f4e4099df79fe2b2f2ac0c462b1d263de64a06a4f3356a262a9077a6763
+generated: "2024-11-22T12:44:09.002830722+01:00"
diff --git a/bindata/deployment/helm/metallb/README.md b/bindata/deployment/helm/metallb/README.md
@@ -17,7 +17,7 @@ Kubernetes: `>= 1.19.0-0`
 | Repository | Name | Version |
 |------------|------|---------|
 |  | crds | 0.0.0 |
-| https://metallb.github.io/frr-k8s | frr-k8s | 0.0.15 |
+| https://metallb.github.io/frr-k8s | frr-k8s | 0.0.16 |
 
 ## Values
 

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-10-14T05:06:10Z"
+    createdAt: "2024-12-12T05:06:20Z"
     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
@@ -890,7 +890,7 @@ spec:
                       - name: DEPLOY_KUBE_RBAC_PROXIES
                         value: "false"
                       - name: FRRK8S_IMAGE
-                        value: quay.io/metallb/frr-k8s:v0.0.15
+                        value: quay.io/metallb/frr-k8s:v0.0.16
                       - name: FRRK8S_EXTERNAL_NAMESPACE
                         value: frr-k8s-system
                       - name: OPERATOR_NAMESPACE

diff --git a/bundle/manifests/metallb.io_bgppeers.yaml b/bundle/manifests/metallb.io_bgppeers.yaml
@@ -225,10 +225,10 @@ spec:
                 type: boolean
               enableGracefulRestart:
                 description: |-
-                  EnableGracefulRestart allows BGP peer to continue to forward data packets along
-                  known routes while the routing protocol information is being restored.
-                  This field is immutable because it requires restart of the BGP session
-                  Supported for FRR mode only.
+                  EnableGracefulRestart allows BGP peer to continue to forward data packets
+                  along known routes while the routing protocol information is being
+                  restored. This field is immutable because it requires restart of the BGP
+                  session. Supported for FRR mode only.
                 type: boolean
                 x-kubernetes-validations:
                 - message: EnableGracefulRestart cannot be changed after creation

diff --git a/config/crd/bases/metallb.io_bgppeers.yaml b/config/crd/bases/metallb.io_bgppeers.yaml
@@ -212,10 +212,10 @@ spec:
                 type: boolean
               enableGracefulRestart:
                 description: |-
-                  EnableGracefulRestart allows BGP peer to continue to forward data packets along
-                  known routes while the routing protocol information is being restored.
-                  This field is immutable because it requires restart of the BGP session
-                  Supported for FRR mode only.
+                  EnableGracefulRestart allows BGP peer to continue to forward data packets
+                  along known routes while the routing protocol information is being
+                  restored. This field is immutable because it requires restart of the BGP
+                  session. Supported for FRR mode only.
                 type: boolean
                 x-kubernetes-validations:
                 - message: EnableGracefulRestart cannot be changed after creation

diff --git a/config/manager/env.yaml b/config/manager/env.yaml
@@ -22,6 +22,6 @@ spec:
             - name: DEPLOY_KUBE_RBAC_PROXIES
               value: "false"
             - name: FRRK8S_IMAGE
-              value: "quay.io/metallb/frr-k8s:v0.0.15"
+              value: "quay.io/metallb/frr-k8s:v0.0.16"
             - name: FRRK8S_EXTERNAL_NAMESPACE
               value: "frr-k8s-system"
diff --git a/hack/metallb_ref.txt b/hack/metallb_ref.txt
@@ -1 +1 @@
-2e8ad2dba31bc3cd3d416b08d9e8df1f40a50a50
+ca9b1cdf6d24d351bfc50774a71e2928900560c7
diff --git a/pkg/helm/testdata/ocp-metrics-frr-k8s-daemon.golden b/pkg/helm/testdata/ocp-metrics-frr-k8s-daemon.golden
@@ -5,9 +5,9 @@
         "labels": {
             "app": "frr-k8s",
             "app.kubernetes.io/managed-by": "Helm",
-            "app.kubernetes.io/version": "v0.0.15",
+            "app.kubernetes.io/version": "v0.0.16",
             "component": "frr-k8s",
-            "helm.sh/chart": "frr-k8s-0.0.15"
+            "helm.sh/chart": "frr-k8s-0.0.16"
         },
         "name": "frr-k8s",
         "namespace": "metallb-test-namespace"
@@ -33,8 +33,7 @@
                             "--node-name=$(NODE_NAME)",
                             "--namespace=$(NAMESPACE)",
                             "--metrics-bind-address=127.0.0.1:7572",
-                            "--log-level=info",
-                            "--health-probe-bind-address=127.0.0.1:8081"
+                            "--log-level=info"
                         ],
                         "command": [
                             "/frr-k8s"
@@ -70,8 +69,8 @@
                             "failureThreshold": 3,
                             "httpGet": {
                                 "host": "127.0.0.1",
-                                "path": "/healthz",
-                                "port": 8081
+                                "path": "/metrics",
+                                "port": "monitoring"
                             },
                             "initialDelaySeconds": 10,
                             "periodSeconds": 10,
@@ -89,8 +88,8 @@
                             "failureThreshold": 3,
                             "httpGet": {
                                 "host": "127.0.0.1",
-                                "path": "/healthz",
-                                "port": 8081
+                                "path": "/metrics",
+                                "port": "monitoring"
                             },
                             "initialDelaySeconds": 10,
                             "periodSeconds": 10,

diff --git a/pkg/helm/testdata/ocp-metrics-frr-k8s-monitor.golden b/pkg/helm/testdata/ocp-metrics-frr-k8s-monitor.golden
@@ -8,9 +8,9 @@
         "labels": {
             "app": "frr-k8s",
             "app.kubernetes.io/managed-by": "Helm",
-            "app.kubernetes.io/version": "v0.0.15",
+            "app.kubernetes.io/version": "v0.0.16",
             "component": "frr-k8s",
-            "helm.sh/chart": "frr-k8s-0.0.15"
+            "helm.sh/chart": "frr-k8s-0.0.16"
         },
         "name": "frr-k8s-monitor",
         "namespace": "metallb-test-namespace"

diff --git a/pkg/helm/testdata/ocp-metrics-frr-k8s-webhook.golden b/pkg/helm/testdata/ocp-metrics-frr-k8s-webhook.golden
@@ -5,9 +5,9 @@
         "labels": {
             "app": "frr-k8s",
             "app.kubernetes.io/managed-by": "Helm",
-            "app.kubernetes.io/version": "v0.0.15",
+            "app.kubernetes.io/version": "v0.0.16",
             "component": "frr-k8s-webhook-server",
-            "helm.sh/chart": "frr-k8s-0.0.15"
+            "helm.sh/chart": "frr-k8s-0.0.16"
         },
         "name": "frr-k8s-webhook-server",
         "namespace": "metallb-test-namespace"
@@ -35,7 +35,7 @@
                             "--webhook-mode=onlywebhook",
                             "--disable-cert-rotation=true",
                             "--namespace=$(NAMESPACE)",
-                            "--health-probe-bind-address=:8081"
+                            "--metrics-bind-address=:7572"
                         ],
                         "command": [
                             "/frr-k8s"
@@ -54,18 +54,24 @@
                         "livenessProbe": {
                             "failureThreshold": 3,
                             "httpGet": {
-                                "path": "/healthz",
-                                "port": 8081
+                                "path": "/metrics",
+                                "port": "monitoring"
                             },
                             "initialDelaySeconds": 10,
                             "periodSeconds": 10
                         },
                         "name": "frr-k8s-webhook-server",
+                        "ports": [
+                            {
+                                "containerPort": 7572,
+                                "name": "monitoring"
+                            }
+                        ],
                         "readinessProbe": {
                             "failureThreshold": 3,
                             "httpGet": {
-                                "path": "/readyz",
-                                "port": 8081
+                                "path": "/metrics",
+                                "port": "monitoring"
                             },
                             "initialDelaySeconds": 10,
                             "periodSeconds": 10
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		2e8ad2dba31bc3cd3d416b08d9e8df1f40a50a50
		ca9b1cdf6d24d351bfc50774a71e2928900560c7