Bump metallb

Bumping to the last version, bringin in bgp status Signed-off-by: Federico Paolinelli <[email protected]>
metallb · Feb 13, 2025 · 3d7f9d7 · 3d7f9d7
1 parent 16ac542
commit 3d7f9d7
Show file tree

Hide file tree

Showing 19 changed files with 338 additions and 28 deletions.
diff --git 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:
@@ -3650,6 +3656,92 @@ spec:
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: servicebgpstatuses.metallb.io
+spec:
+  group: metallb.io
+  names:
+    kind: ServiceBGPStatus
+    listKind: ServiceBGPStatusList
+    plural: servicebgpstatuses
+    singular: servicebgpstatus
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .status.node
+      name: Node
+      type: string
+    - jsonPath: .status.serviceName
+      name: Service Name
+      type: string
+    - jsonPath: .status.serviceNamespace
+      name: Service Namespace
+      type: string
+    name: v1beta1
+    schema:
+      openAPIV3Schema:
+        description: ServiceBGPStatus exposes the BGP peers a service is configured
+          to be advertised to, per relevant node.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: ServiceBGPStatusSpec defines the desired state of ServiceBGPStatus.
+            type: object
+          status:
+            description: MetalLBServiceBGPStatus defines the observed state of ServiceBGPStatus.
+            properties:
+              node:
+                description: Node indicates the node announcing the service.
+                type: string
+                x-kubernetes-validations:
+                - message: Value is immutable
+                  rule: self == oldSelf
+              peers:
+                description: |-
+                  Peers indicate the BGP peers for which the service is configured to be advertised to.
+                  The service being actually advertised to a given peer depends on the session state and is not indicated here.
+                items:
+                  type: string
+                type: array
+              serviceName:
+                description: ServiceName indicates the service this status represents.
+                type: string
+                x-kubernetes-validations:
+                - message: Value is immutable
+                  rule: self == oldSelf
+              serviceNamespace:
+                description: ServiceNamespace indicates the namespace of the service.
+                type: string
+                x-kubernetes-validations:
+                - message: Value is immutable
+                  rule: self == oldSelf
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.16.3
@@ -4024,7 +4116,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
@@ -4521,6 +4613,13 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - metallb.io
+  resources:
+  - servicebgpstatuses
+  - servicebgpstatuses/status
+  verbs:
+  - '*'
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role

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.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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -432,7 +432,7 @@ metadata:
     categories: Networking
     certified: "false"
     containerImage: quay.io/metallb/metallb-operator
-    createdAt: "2024-12-16T10:14:17Z"
+    createdAt: "2025-02-13T16:06:49Z"
     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
@@ -481,6 +481,9 @@ spec:
         kind: MetalLB
         name: metallbs.metallb.io
         version: v1beta1
+      - kind: ServiceBGPStatus
+        name: servicebgpstatuses.metallb.io
+        version: v1beta1
       - kind: ServiceL2Status
         name: servicel2statuses.metallb.io
         version: v1beta1
@@ -890,7 +893,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
@@ -1231,6 +1234,13 @@ spec:
                 - get
                 - list
                 - watch
+            - apiGroups:
+                - metallb.io
+              resources:
+                - servicebgpstatuses
+                - servicebgpstatuses/status
+              verbs:
+                - '*'
             - apiGroups:
                 - security.openshift.io
               resourceNames:

diff --git a/bundle/manifests/metallb.io_servicebgpstatuses.yaml b/bundle/manifests/metallb.io_servicebgpstatuses.yaml
@@ -0,0 +1,92 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  creationTimestamp: null
+  name: servicebgpstatuses.metallb.io
+spec:
+  group: metallb.io
+  names:
+    kind: ServiceBGPStatus
+    listKind: ServiceBGPStatusList
+    plural: servicebgpstatuses
+    singular: servicebgpstatus
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .status.node
+      name: Node
+      type: string
+    - jsonPath: .status.serviceName
+      name: Service Name
+      type: string
+    - jsonPath: .status.serviceNamespace
+      name: Service Namespace
+      type: string
+    name: v1beta1
+    schema:
+      openAPIV3Schema:
+        description: ServiceBGPStatus exposes the BGP peers a service is configured
+          to be advertised to, per relevant node.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: ServiceBGPStatusSpec defines the desired state of ServiceBGPStatus.
+            type: object
+          status:
+            description: MetalLBServiceBGPStatus defines the observed state of ServiceBGPStatus.
+            properties:
+              node:
+                description: Node indicates the node announcing the service.
+                type: string
+                x-kubernetes-validations:
+                - message: Value is immutable
+                  rule: self == oldSelf
+              peers:
+                description: |-
+                  Peers indicate the BGP peers for which the service is configured to be advertised to.
+                  The service being actually advertised to a given peer depends on the session state and is not indicated here.
+                items:
+                  type: string
+                type: array
+              serviceName:
+                description: ServiceName indicates the service this status represents.
+                type: string
+                x-kubernetes-validations:
+                - message: Value is immutable
+                  rule: self == oldSelf
+              serviceNamespace:
+                description: ServiceNamespace indicates the namespace of the service.
+                type: string
+                x-kubernetes-validations:
+                - message: Value is immutable
+                  rule: self == oldSelf
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: null
+  storedVersions: null
diff --git 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: