Skip to content

Commit

Permalink
Bump MetalLB
Browse files Browse the repository at this point in the history 
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] <[email protected]>
  • Loading branch information
@web-flow @fedepaol
web-flow authored and fedepaol committed Jun 21, 2024
1 parent 5e29cf0 commit ad91938
Show file tree
Hide file tree
Showing 15 changed files with 104 additions and 16 deletions.
24 changes: 24 additions & 0 deletions bin/metallb-operator.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions bindata/deployment/helm/metallb/templates/servicemonitor.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 5 additions & 2 deletions bindata/deployment/helm/metallb/templates/speaker.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/metallb-operator.clusterserviceversion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions bundle/manifests/metallb.io_bgpadvertisements.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 12 additions & 0 deletions bundle/manifests/metallb.io_bgppeers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions bundle/manifests/metallb.io_ipaddresspools.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions bundle/manifests/metallb.io_l2advertisements.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions config/crd/bases/metallb.io_bgpadvertisements.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 12 additions & 0 deletions config/crd/bases/metallb.io_bgppeers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions config/crd/bases/metallb.io_ipaddresspools.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions config/crd/bases/metallb.io_l2advertisements.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hack/metallb_ref.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fe385845877a9ef48ef6b519896854e7ca5c4615
62822a4a17e3f2dafcd7699693de6db82011297d
Loading

0 comments on commit ad91938

Please sign in to comment.