Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump MetalLB #481

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 25 additions & 13 deletions bin/metallb-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.3
name: bfdprofiles.metallb.io
spec:
group: metallb.io
Expand Down Expand Up @@ -130,7 +130,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.3
name: bgpadvertisements.metallb.io
spec:
group: metallb.io
Expand Down Expand Up @@ -347,7 +347,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.3
name: bgppeers.metallb.io
spec:
conversion:
Expand Down Expand Up @@ -383,6 +383,8 @@ spec:
- jsonPath: .spec.ebgpMultiHop
name: Multi Hops
type: string
deprecated: true
deprecationWarning: v1beta1 is deprecated, please use v1beta2
name: v1beta1
schema:
openAPIV3Schema:
Expand Down Expand Up @@ -695,7 +697,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.3
name: communities.metallb.io
spec:
group: metallb.io
Expand Down Expand Up @@ -913,8 +915,9 @@ spec:
the session with.
type: string
asn:
description: ASN is the AS number to use for the local
end of the session.
description: |-
ASN is the AS number to use for the local end of the session.
ASN and DynamicASN are mutually exclusive and one of them must be specified.
format: int32
maximum: 4294967295
minimum: 0
Expand Down Expand Up @@ -944,6 +947,17 @@ spec:
will separate IPv4 and IPv6 route exchanges into
distinct BGP sessions.
type: boolean
dynamicASN:
description: |-
DynamicASN detects the AS number to use for the local end of the session
without explicitly setting it via the ASN field. Limited to:
internal - if the neighbor's ASN is different than the router's the connection is denied.
external - if the neighbor's ASN is the same as the router's the connection is denied.
ASN and DynamicASN are mutually exclusive and one of them must be specified.
enum:
- internal
- external
type: string
ebgpMultiHop:
description: EBGPMultiHop indicates if the BGPPeer
is multi-hops away.
Expand Down Expand Up @@ -1123,7 +1137,6 @@ spec:
type: object
required:
- address
- asn
type: object
type: array
prefixes:
Expand Down Expand Up @@ -1287,7 +1300,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.3
name: ipaddresspools.metallb.io
spec:
group: metallb.io
Expand Down Expand Up @@ -1503,7 +1516,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.3
name: l2advertisements.metallb.io
spec:
group: metallb.io
Expand Down Expand Up @@ -3627,7 +3640,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.3
name: servicel2statuses.metallb.io
spec:
group: metallb.io
Expand Down Expand Up @@ -3999,7 +4012,7 @@ spec:
- name: DEPLOY_KUBE_RBAC_PROXIES
value: "false"
- name: FRRK8S_IMAGE
value: quay.io/metallb/frr-k8s:v0.0.14
value: quay.io/metallb/frr-k8s:v0.0.15
- name: FRRK8S_EXTERNAL_NAMESPACE
value: frr-k8s-system
- name: OPERATOR_NAMESPACE
Expand Down Expand Up @@ -4700,7 +4713,6 @@ rules:
- metallb-webhook-configuration
resources:
- validatingwebhookconfigurations
- mutatingwebhookconfigurations
verbs:
- create
- delete
Expand All @@ -4713,7 +4725,6 @@ rules:
- admissionregistration.k8s.io
resources:
- validatingwebhookconfigurations
- mutatingwebhookconfigurations
verbs:
- list
- watch
Expand Down Expand Up @@ -4761,6 +4772,7 @@ rules:
- watch
- create
- update
- delete
- apiGroups:
- metallb.io
resources:
Expand Down
6 changes: 3 additions & 3 deletions bindata/deployment/helm/frr-k8s/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: crds
repository: ""
version: 0.0.14
digest: sha256:b8b8aa510f86db5713e75b0bc5a03df88737a5f6868aab77c513eb0bbed3b8b7
generated: "2024-07-19T12:07:59.737645816+02:00"
version: 0.0.15
digest: sha256:7c9dcf2405fb90e548b7f8c593065648385092794431b2dcb8288d957aacad2e
generated: "2024-09-17T14:17:43.040895+03:00"
4 changes: 2 additions & 2 deletions bindata/deployment/helm/frr-k8s/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.14
version: 0.0.15
# 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.14
appVersion: v0.0.15
4 changes: 2 additions & 2 deletions bindata/deployment/helm/frr-k8s/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frr-k8s

![Version: 0.0.14](https://img.shields.io/badge/Version-0.0.14-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.0.14](https://img.shields.io/badge/AppVersion-v0.0.14-informational?style=flat-square)
![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)

A cloud native wrapper of FRR

Expand All @@ -16,7 +16,7 @@ Kubernetes: `>= 1.19.0-0`

| Repository | Name | Version |
|------------|------|---------|
| | crds | 0.0.14 |
| | crds | 0.0.15 |

## Values

Expand Down
6 changes: 3 additions & 3 deletions bindata/deployment/helm/metallb/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ dependencies:
version: 0.0.0
- name: frr-k8s
repository: https://metallb.github.io/frr-k8s
version: 0.0.14
digest: sha256:727b303ca5008e171345d7a257142f2fc2e68d14b3e04a1176c7434501af8200
generated: "2024-07-19T12:19:14.171245879+02:00"
version: 0.0.15
digest: sha256:2300c788e6c8f7d5f3b51ba37b20ed00b9e949c16f5aff880977703ac154f75f
generated: "2024-09-17T15:14:34.977441+03:00"
2 changes: 1 addition & 1 deletion bindata/deployment/helm/metallb/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.14 |
| https://metallb.github.io/frr-k8s | frr-k8s | 0.0.15 |

## Values

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ spec:
- name: METALLB_DEPLOYMENT
value: controller
{{- end }}
{{- if .Values.speaker.frr.enabled }}
{{- if and .Values.speaker.enabled .Values.speaker.frr.enabled }}
- name: METALLB_BGP_TYPE
value: frr
{{- end }}
Expand Down
2 changes: 2 additions & 0 deletions bindata/deployment/helm/metallb/templates/podmonitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ spec:
relabelings:
{{- toYaml .Values.prometheus.podMonitor.relabelings | nindent 4 }}
{{- end }}
{{- if .Values.speaker.enabled }}
---
apiVersion: monitoring.coreos.com/v1
kind: PodMonitor
Expand Down Expand Up @@ -74,6 +75,7 @@ spec:
relabelings:
{{- toYaml .Values.prometheus.podMonitor.relabelings | nindent 4 }}
{{- end }}
{{- end }}
---
{{- if .Values.prometheus.rbacPrometheus }}
apiVersion: rbac.authorization.k8s.io/v1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- if .Values.prometheus.serviceMonitor.enabled }}
{{- if .Values.speaker.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
Expand Down Expand Up @@ -89,6 +90,7 @@ spec:
{{- end }}
sessionAffinity: None
type: ClusterIP
{{- end }}
---
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
Expand All @@ -97,7 +99,6 @@ metadata:
namespace: {{ .Release.Namespace | quote }}
labels:
{{- include "metallb.labels" . | nindent 4 }}
component: speaker
{{- if .Values.prometheus.serviceMonitor.controller.additionalLabels }}
{{ toYaml .Values.prometheus.serviceMonitor.controller.additionalLabels | indent 4 }}
{{- end }}
Expand Down
6 changes: 3 additions & 3 deletions bindata/deployment/helm/metallb/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ prometheus:
# certificate to be used.
controllerMetricsTLSSecret: ""

# prometheus doens't have the permission to scrape all namespaces so we give it permission to scrape metallb's one
# prometheus doesn't have the permission to scrape all namespaces so we give it permission to scrape metallb's one
rbacPrometheus: true

# the service account used by prometheus
Expand All @@ -64,7 +64,7 @@ prometheus:
# enable support for Prometheus Operator
enabled: false

# optional additionnal labels for podMonitors
# optional additional labels for podMonitors
additionalLabels: {}

# optional annotations for podMonitors
Expand Down Expand Up @@ -143,7 +143,7 @@ prometheus:
# enable alertmanager alerts
enabled: false

# optional additionnal labels for prometheusRules
# optional additional labels for prometheusRules
additionalLabels: {}

# optional annotations for prometheusRules
Expand Down
17 changes: 14 additions & 3 deletions bundle/manifests/frrk8s.metallb.io_frrconfigurations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,9 @@ spec:
the session with.
type: string
asn:
description: ASN is the AS number to use for the local
end of the session.
description: |-
ASN is the AS number to use for the local end of the session.
ASN and DynamicASN are mutually exclusive and one of them must be specified.
format: int32
maximum: 4294967295
minimum: 0
Expand Down Expand Up @@ -187,6 +188,17 @@ spec:
will separate IPv4 and IPv6 route exchanges into
distinct BGP sessions.
type: boolean
dynamicASN:
description: |-
DynamicASN detects the AS number to use for the local end of the session
without explicitly setting it via the ASN field. Limited to:
internal - if the neighbor's ASN is different than the router's the connection is denied.
external - if the neighbor's ASN is the same as the router's the connection is denied.
ASN and DynamicASN are mutually exclusive and one of them must be specified.
enum:
- internal
- external
type: string
ebgpMultiHop:
description: EBGPMultiHop indicates if the BGPPeer
is multi-hops away.
Expand Down Expand Up @@ -366,7 +378,6 @@ spec:
type: object
required:
- address
- asn
type: object
type: array
prefixes:
Expand Down
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-07-22T10:18:02Z"
createdAt: "2024-10-01T17:05:21Z"
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 Expand Up @@ -547,7 +547,6 @@ spec:
- metallb-webhook-configuration
resources:
- validatingwebhookconfigurations
- mutatingwebhookconfigurations
verbs:
- create
- delete
Expand All @@ -560,7 +559,6 @@ spec:
- admissionregistration.k8s.io
resources:
- validatingwebhookconfigurations
- mutatingwebhookconfigurations
verbs:
- list
- watch
Expand Down Expand Up @@ -814,6 +812,7 @@ spec:
- watch
- create
- update
- delete
- apiGroups:
- metallb.io
resources:
Expand Down Expand Up @@ -891,7 +890,7 @@ spec:
- name: DEPLOY_KUBE_RBAC_PROXIES
value: "false"
- name: FRRK8S_IMAGE
value: quay.io/metallb/frr-k8s:v0.0.14
value: quay.io/metallb/frr-k8s:v0.0.15
- name: FRRK8S_EXTERNAL_NAMESPACE
value: frr-k8s-system
- name: OPERATOR_NAMESPACE
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/metallb.io_bfdprofiles.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.3
creationTimestamp: null
name: bfdprofiles.metallb.io
spec:
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/metallb.io_bgpadvertisements.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.3
creationTimestamp: null
name: bgpadvertisements.metallb.io
spec:
Expand Down
4 changes: 3 additions & 1 deletion bundle/manifests/metallb.io_bgppeers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.3
creationTimestamp: null
name: bgppeers.metallb.io
spec:
Expand Down Expand Up @@ -39,6 +39,8 @@ spec:
- jsonPath: .spec.ebgpMultiHop
name: Multi Hops
type: string
deprecated: true
deprecationWarning: v1beta1 is deprecated, please use v1beta2
name: v1beta1
schema:
openAPIV3Schema:
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/metallb.io_communities.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.3
creationTimestamp: null
name: communities.metallb.io
spec:
Expand Down
Loading
Loading