From 50d0760a36d537955280c55c04f73a4e7ee44696 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 16 Jan 2025 17:06:29 +0000 Subject: [PATCH] Bump MetalLB This commit bumps MetalLB: from: eeb320f15b70603ec6b93fe8ec3c290384b8a2a0 website: fix L2Advertisement doc example (2024-12-13) to: 123811788f040395469c73ea70ad77e8eca80141 Bump frrk8s to 0.0.17 (2025-01-13) Signed-off-by: github-actions[bot] --- bin/metallb-operator.yaml | 12 +++++++++--- bindata/deployment/helm/frr-k8s/Chart.lock | 6 +++--- bindata/deployment/helm/frr-k8s/Chart.yaml | 4 ++-- bindata/deployment/helm/frr-k8s/README.md | 4 ++-- bindata/deployment/helm/metallb/Chart.lock | 6 +++--- bindata/deployment/helm/metallb/README.md | 2 +- .../helm/metallb/templates/servicemonitor.yaml | 4 ++++ .../frrk8s.metallb.io_frrconfigurations.yaml | 10 ++++++++-- .../metallb-operator.clusterserviceversion.yaml | 4 ++-- .../bases/frrk8s.metallb.io_frrconfigurations.yaml | 10 ++++++++-- config/manager/env.yaml | 2 +- hack/metallb_ref.txt | 2 +- pkg/helm/testdata/ocp-metrics-frr-k8s-daemon.golden | 4 ++-- pkg/helm/testdata/ocp-metrics-frr-k8s-monitor.golden | 4 ++-- pkg/helm/testdata/ocp-metrics-frr-k8s-webhook.golden | 4 ++-- 15 files changed, 50 insertions(+), 28 deletions(-) diff --git a/bin/metallb-operator.yaml b/bin/metallb-operator.yaml index cbb154965..2359fbe7b 100644 --- a/bin/metallb-operator.yaml +++ b/bin/metallb-operator.yaml @@ -986,6 +986,14 @@ spec: HoldTime is the requested BGP hold time, per RFC4271. Defaults to 180s. type: string + interface: + description: |- + Interface is the node interface over which the unnumbered BGP peering will + be established. No API validation takes place as that string value + represents an interface name on the host and if user provides an invalid + value, only the actual BGP session will not be established. + Address and Interface are mutually exclusive and one of them must be specified. + type: string keepaliveTime: description: |- KeepaliveTime is the requested BGP keepalive time, per RFC4271. @@ -1147,8 +1155,6 @@ spec: type: array type: object type: object - required: - - address type: object type: array prefixes: @@ -4024,7 +4030,7 @@ spec: - name: DEPLOY_KUBE_RBAC_PROXIES value: "false" - name: FRRK8S_IMAGE - value: quay.io/metallb/frr-k8s:v0.0.16 + value: quay.io/metallb/frr-k8s:v0.0.17 - 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 index 913833f7d..2e7be9df4 100644 --- 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.16 -digest: sha256:b54ee64c5e61f1dd38e89efc87ebd1e36cdb7c4dd7c897d9985040dccd713dba -generated: "2024-11-22T11:40:47.152053909+01:00" + version: 0.0.17 +digest: sha256:8f233f695efb015d5aaad9bb1e8f8ee0b0b24c13356b15d40b96b40cd7eb2b25 +generated: "2025-01-10T10:23:08.228305485+01:00" diff --git a/bindata/deployment/helm/frr-k8s/Chart.yaml b/bindata/deployment/helm/frr-k8s/Chart.yaml index 31bb571ce..26951b38d 100644 --- 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.16 +version: 0.0.17 # 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.16 +appVersion: v0.0.17 diff --git a/bindata/deployment/helm/frr-k8s/README.md b/bindata/deployment/helm/frr-k8s/README.md index c90d3531b..212054d83 100644 --- 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.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) +![Version: 0.0.17](https://img.shields.io/badge/Version-0.0.17-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.0.17](https://img.shields.io/badge/AppVersion-v0.0.17-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.16 | +| | crds | 0.0.17 | ## Values diff --git a/bindata/deployment/helm/metallb/Chart.lock b/bindata/deployment/helm/metallb/Chart.lock index 16c17afed..6c6bf6398 100644 --- 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.16 -digest: sha256:ad791f4e4099df79fe2b2f2ac0c462b1d263de64a06a4f3356a262a9077a6763 -generated: "2024-11-22T12:44:09.002830722+01:00" + version: 0.0.17 +digest: sha256:1e128afb9157c71a2217e88694612ba074fdd2168366d1747b36095d741e4808 +generated: "2025-01-10T13:24:27.191428406+01:00" diff --git a/bindata/deployment/helm/metallb/README.md b/bindata/deployment/helm/metallb/README.md index 43f51ef7c..7a104ba05 100644 --- 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.16 | +| https://metallb.github.io/frr-k8s | frr-k8s | 0.0.17 | ## Values 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/frrk8s.metallb.io_frrconfigurations.yaml b/bundle/manifests/frrk8s.metallb.io_frrconfigurations.yaml index 4bffe9ec8..47cbf15e6 100644 --- a/bundle/manifests/frrk8s.metallb.io_frrconfigurations.yaml +++ b/bundle/manifests/frrk8s.metallb.io_frrconfigurations.yaml @@ -215,6 +215,14 @@ spec: HoldTime is the requested BGP hold time, per RFC4271. Defaults to 180s. type: string + interface: + description: |- + Interface is the node interface over which the unnumbered BGP peering will + be established. No API validation takes place as that string value + represents an interface name on the host and if user provides an invalid + value, only the actual BGP session will not be established. + Address and Interface are mutually exclusive and one of them must be specified. + type: string keepaliveTime: description: |- KeepaliveTime is the requested BGP keepalive time, per RFC4271. @@ -376,8 +384,6 @@ spec: type: array type: object type: object - required: - - address type: object type: array prefixes: diff --git a/bundle/manifests/metallb-operator.clusterserviceversion.yaml b/bundle/manifests/metallb-operator.clusterserviceversion.yaml index a70fa75e2..753cb6505 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: "2025-01-16T17:05:37Z" 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.16 + value: quay.io/metallb/frr-k8s:v0.0.17 - name: FRRK8S_EXTERNAL_NAMESPACE value: frr-k8s-system - name: OPERATOR_NAMESPACE diff --git a/config/crd/bases/frrk8s.metallb.io_frrconfigurations.yaml b/config/crd/bases/frrk8s.metallb.io_frrconfigurations.yaml index 98a661e3b..73fd41c2d 100644 --- a/config/crd/bases/frrk8s.metallb.io_frrconfigurations.yaml +++ b/config/crd/bases/frrk8s.metallb.io_frrconfigurations.yaml @@ -214,6 +214,14 @@ spec: HoldTime is the requested BGP hold time, per RFC4271. Defaults to 180s. type: string + interface: + description: |- + Interface is the node interface over which the unnumbered BGP peering will + be established. No API validation takes place as that string value + represents an interface name on the host and if user provides an invalid + value, only the actual BGP session will not be established. + Address and Interface are mutually exclusive and one of them must be specified. + type: string keepaliveTime: description: |- KeepaliveTime is the requested BGP keepalive time, per RFC4271. @@ -375,8 +383,6 @@ spec: type: array type: object type: object - required: - - address type: object type: array prefixes: diff --git a/config/manager/env.yaml b/config/manager/env.yaml index 7733bb6ea..d303dc6ea 100644 --- 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.16" + value: "quay.io/metallb/frr-k8s:v0.0.17" - name: FRRK8S_EXTERNAL_NAMESPACE value: "frr-k8s-system" diff --git a/hack/metallb_ref.txt b/hack/metallb_ref.txt index 3f2ecb4ec..0f0298424 100644 --- a/hack/metallb_ref.txt +++ b/hack/metallb_ref.txt @@ -1 +1 @@ -eeb320f15b70603ec6b93fe8ec3c290384b8a2a0 +123811788f040395469c73ea70ad77e8eca80141 diff --git a/pkg/helm/testdata/ocp-metrics-frr-k8s-daemon.golden b/pkg/helm/testdata/ocp-metrics-frr-k8s-daemon.golden index 9cc44b7fc..792b5cbdb 100644 --- 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.16", + "app.kubernetes.io/version": "v0.0.17", "component": "frr-k8s", - "helm.sh/chart": "frr-k8s-0.0.16" + "helm.sh/chart": "frr-k8s-0.0.17" }, "name": "frr-k8s", "namespace": "metallb-test-namespace" diff --git a/pkg/helm/testdata/ocp-metrics-frr-k8s-monitor.golden b/pkg/helm/testdata/ocp-metrics-frr-k8s-monitor.golden index fc106e92b..a7a656b79 100644 --- 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.16", + "app.kubernetes.io/version": "v0.0.17", "component": "frr-k8s", - "helm.sh/chart": "frr-k8s-0.0.16" + "helm.sh/chart": "frr-k8s-0.0.17" }, "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 index 089f43dba..3d9856f10 100644 --- 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.16", + "app.kubernetes.io/version": "v0.0.17", "component": "frr-k8s-webhook-server", - "helm.sh/chart": "frr-k8s-0.0.16" + "helm.sh/chart": "frr-k8s-0.0.17" }, "name": "frr-k8s-webhook-server", "namespace": "metallb-test-namespace"