From ad91938bbf75c6ab032b19e0064f1d712eacfdb4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 21 Jun 2024 05:06:54 +0000 Subject: [PATCH] Bump MetalLB This commit bumps MetalLB: from: fe385845877a9ef48ef6b519896854e7ca5c4615 CI: don't run the labeler job on dependabot prs (2024-04-08) to: 62822a4a17e3f2dafcd7699693de6db82011297d Bump the crd documentation generator (2024-06-19) Signed-off-by: github-actions[bot] --- bin/metallb-operator.yaml | 24 +++++++++++++++++++ .../metallb/templates/servicemonitor.yaml | 1 + .../helm/metallb/templates/speaker.yaml | 7 ++++-- ...etallb-operator.clusterserviceversion.yaml | 2 +- .../metallb.io_bgpadvertisements.yaml | 4 ++++ bundle/manifests/metallb.io_bgppeers.yaml | 12 ++++++++++ .../manifests/metallb.io_ipaddresspools.yaml | 4 ++++ .../metallb.io_l2advertisements.yaml | 4 ++++ .../bases/metallb.io_bgpadvertisements.yaml | 4 ++++ config/crd/bases/metallb.io_bgppeers.yaml | 12 ++++++++++ .../crd/bases/metallb.io_ipaddresspools.yaml | 4 ++++ .../bases/metallb.io_l2advertisements.yaml | 4 ++++ hack/metallb_ref.txt | 2 +- pkg/helm/testdata/ocp-metrics-speaker.golden | 18 +++++++++----- .../testdata/vanilla-metrics-speaker.golden | 18 +++++++++----- 15 files changed, 104 insertions(+), 16 deletions(-) diff --git a/bin/metallb-operator.yaml b/bin/metallb-operator.yaml index 086cfe20a..7ac7c8378 100644 --- a/bin/metallb-operator.yaml +++ b/bin/metallb-operator.yaml @@ -242,11 +242,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string @@ -306,11 +308,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string @@ -550,6 +554,16 @@ spec: description: To set if the BGPPeer is multi-hops away. Needed for FRR mode only. 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. + type: boolean + x-kubernetes-validations: + - message: EnableGracefulRestart cannot be changed after creation + rule: self == oldSelf holdTime: description: Requested BGP hold time, per RFC4271. type: string @@ -598,11 +612,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string @@ -1344,11 +1360,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string @@ -1406,11 +1424,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string @@ -1536,11 +1556,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string @@ -1594,11 +1616,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string diff --git a/bindata/deployment/helm/metallb/templates/servicemonitor.yaml b/bindata/deployment/helm/metallb/templates/servicemonitor.yaml index 4e98f7f03..0a93fa876 100644 --- a/bindata/deployment/helm/metallb/templates/servicemonitor.yaml +++ b/bindata/deployment/helm/metallb/templates/servicemonitor.yaml @@ -70,6 +70,7 @@ metadata: {{- end }} labels: name: speaker-monitor-service + {{- include "metallb.labels" . | nindent 4 }} name: speaker-monitor-service namespace: {{ .Release.Namespace | quote }} spec: diff --git a/bindata/deployment/helm/metallb/templates/speaker.yaml b/bindata/deployment/helm/metallb/templates/speaker.yaml index 6e5436665..8171d0931 100644 --- a/bindata/deployment/helm/metallb/templates/speaker.yaml +++ b/bindata/deployment/helm/metallb/templates/speaker.yaml @@ -210,14 +210,14 @@ spec: # Copies the reloader to the shared volume between the speaker and reloader. - name: cp-reloader image: {{ .Values.speaker.image.repository }}:{{ .Values.speaker.image.tag | default .Chart.AppVersion }} - command: ["/bin/sh", "-c", "cp -f /frr-reloader.sh /etc/frr_reloader/"] + command: ["/cp-tool","/frr-reloader.sh","/etc/frr_reloader/frr-reloader.sh"] volumeMounts: - name: reloader mountPath: /etc/frr_reloader # Copies the metrics exporter - name: cp-metrics image: {{ .Values.speaker.image.repository }}:{{ .Values.speaker.image.tag | default .Chart.AppVersion }} - command: ["/bin/sh", "-c", "cp -f /frr-metrics /etc/frr_metrics/"] + command: ["/cp-tool","/frr-metrics","/etc/frr_metrics/frr-metrics"] volumeMounts: - name: metrics mountPath: /etc/frr_metrics @@ -443,6 +443,9 @@ spec: {{- if .Values.prometheus.secureMetricsPort }} - --host=localhost {{- end }} + env: + - name: VTYSH_HISTFILE + value: /dev/null ports: - containerPort: {{ .Values.speaker.frr.metricsPort }} name: monitoring diff --git a/bundle/manifests/metallb-operator.clusterserviceversion.yaml b/bundle/manifests/metallb-operator.clusterserviceversion.yaml index 24350a939..11bb8271b 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-04-23T11:43:43Z" + createdAt: "2024-06-21T05:06:01Z" 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/bundle/manifests/metallb.io_bgpadvertisements.yaml b/bundle/manifests/metallb.io_bgpadvertisements.yaml index 2742e33d3..088cf0129 100644 --- a/bundle/manifests/metallb.io_bgpadvertisements.yaml +++ b/bundle/manifests/metallb.io_bgpadvertisements.yaml @@ -115,11 +115,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string @@ -179,11 +181,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string diff --git a/bundle/manifests/metallb.io_bgppeers.yaml b/bundle/manifests/metallb.io_bgppeers.yaml index 5fb3513e2..f2dcd0945 100644 --- a/bundle/manifests/metallb.io_bgppeers.yaml +++ b/bundle/manifests/metallb.io_bgppeers.yaml @@ -210,6 +210,16 @@ spec: description: To set if the BGPPeer is multi-hops away. Needed for FRR mode only. 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. + type: boolean + x-kubernetes-validations: + - message: EnableGracefulRestart cannot be changed after creation + rule: self == oldSelf holdTime: description: Requested BGP hold time, per RFC4271. type: string @@ -258,11 +268,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string diff --git a/bundle/manifests/metallb.io_ipaddresspools.yaml b/bundle/manifests/metallb.io_ipaddresspools.yaml index b8c0fa74e..9e8b7a1f3 100644 --- a/bundle/manifests/metallb.io_ipaddresspools.yaml +++ b/bundle/manifests/metallb.io_ipaddresspools.yaml @@ -118,11 +118,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string @@ -180,11 +182,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string diff --git a/bundle/manifests/metallb.io_l2advertisements.yaml b/bundle/manifests/metallb.io_l2advertisements.yaml index 1c1248606..e5a80e30c 100644 --- a/bundle/manifests/metallb.io_l2advertisements.yaml +++ b/bundle/manifests/metallb.io_l2advertisements.yaml @@ -98,11 +98,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string @@ -156,11 +158,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string diff --git a/config/crd/bases/metallb.io_bgpadvertisements.yaml b/config/crd/bases/metallb.io_bgpadvertisements.yaml index 7246fd712..55ed92103 100644 --- a/config/crd/bases/metallb.io_bgpadvertisements.yaml +++ b/config/crd/bases/metallb.io_bgpadvertisements.yaml @@ -114,11 +114,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string @@ -178,11 +180,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string diff --git a/config/crd/bases/metallb.io_bgppeers.yaml b/config/crd/bases/metallb.io_bgppeers.yaml index a23fe9423..e533f0a26 100644 --- a/config/crd/bases/metallb.io_bgppeers.yaml +++ b/config/crd/bases/metallb.io_bgppeers.yaml @@ -197,6 +197,16 @@ spec: description: To set if the BGPPeer is multi-hops away. Needed for FRR mode only. 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. + type: boolean + x-kubernetes-validations: + - message: EnableGracefulRestart cannot be changed after creation + rule: self == oldSelf holdTime: description: Requested BGP hold time, per RFC4271. type: string @@ -245,11 +255,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string diff --git a/config/crd/bases/metallb.io_ipaddresspools.yaml b/config/crd/bases/metallb.io_ipaddresspools.yaml index 879d357ea..06cba9c95 100644 --- a/config/crd/bases/metallb.io_ipaddresspools.yaml +++ b/config/crd/bases/metallb.io_ipaddresspools.yaml @@ -117,11 +117,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string @@ -179,11 +181,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string diff --git a/config/crd/bases/metallb.io_l2advertisements.yaml b/config/crd/bases/metallb.io_l2advertisements.yaml index 2ff172cfd..9273bcb8d 100644 --- a/config/crd/bases/metallb.io_l2advertisements.yaml +++ b/config/crd/bases/metallb.io_l2advertisements.yaml @@ -97,11 +97,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string @@ -155,11 +157,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string diff --git a/hack/metallb_ref.txt b/hack/metallb_ref.txt index 51f929fca..f9bac5f12 100644 --- a/hack/metallb_ref.txt +++ b/hack/metallb_ref.txt @@ -1 +1 @@ -fe385845877a9ef48ef6b519896854e7ca5c4615 +62822a4a17e3f2dafcd7699693de6db82011297d diff --git a/pkg/helm/testdata/ocp-metrics-speaker.golden b/pkg/helm/testdata/ocp-metrics-speaker.golden index 95711744e..2592cd004 100644 --- a/pkg/helm/testdata/ocp-metrics-speaker.golden +++ b/pkg/helm/testdata/ocp-metrics-speaker.golden @@ -241,6 +241,12 @@ "command": [ "/etc/frr_metrics/frr-metrics" ], + "env": [ + { + "name": "VTYSH_HISTFILE", + "value": "/dev/null" + } + ], "image": "frrouting/frr:v7.5.1", "name": "frr-metrics", "ports": [ @@ -368,9 +374,9 @@ }, { "command": [ - "/bin/sh", - "-c", - "cp -f /frr-reloader.sh /etc/frr_reloader/" + "/cp-tool", + "/frr-reloader.sh", + "/etc/frr_reloader/frr-reloader.sh" ], "image": "quay.io/metallb/speaker:v0.0.0", "name": "cp-reloader", @@ -383,9 +389,9 @@ }, { "command": [ - "/bin/sh", - "-c", - "cp -f /frr-metrics /etc/frr_metrics/" + "/cp-tool", + "/frr-metrics", + "/etc/frr_metrics/frr-metrics" ], "image": "quay.io/metallb/speaker:v0.0.0", "name": "cp-metrics", diff --git a/pkg/helm/testdata/vanilla-metrics-speaker.golden b/pkg/helm/testdata/vanilla-metrics-speaker.golden index fc8d7ccec..4a4fe3285 100644 --- a/pkg/helm/testdata/vanilla-metrics-speaker.golden +++ b/pkg/helm/testdata/vanilla-metrics-speaker.golden @@ -241,6 +241,12 @@ "command": [ "/etc/frr_metrics/frr-metrics" ], + "env": [ + { + "name": "VTYSH_HISTFILE", + "value": "/dev/null" + } + ], "image": "frrouting/frr:v7.5.1", "name": "frr-metrics", "ports": [ @@ -350,9 +356,9 @@ }, { "command": [ - "/bin/sh", - "-c", - "cp -f /frr-reloader.sh /etc/frr_reloader/" + "/cp-tool", + "/frr-reloader.sh", + "/etc/frr_reloader/frr-reloader.sh" ], "image": "quay.io/metallb/speaker:v0.0.0", "name": "cp-reloader", @@ -365,9 +371,9 @@ }, { "command": [ - "/bin/sh", - "-c", - "cp -f /frr-metrics /etc/frr_metrics/" + "/cp-tool", + "/frr-metrics", + "/etc/frr_metrics/frr-metrics" ], "image": "quay.io/metallb/speaker:v0.0.0", "name": "cp-metrics",