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 #384

Merged
merged 1 commit into from
Feb 27, 2024
Merged
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
1 change: 1 addition & 0 deletions bindata/deployment/helm/metallb/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ Kubernetes: `>= 1.19.0-0`
| speaker.frr.metricsPort | int | `7473` | |
| speaker.frr.resources | object | `{}` | |
| speaker.frrMetrics.resources | object | `{}` | |
| speaker.ignoreExcludeLB | bool | `false` | |
| speaker.image.pullPolicy | string | `nil` | |
| speaker.image.repository | string | `"quay.io/metallb/speaker"` | |
| speaker.image.tag | string | `nil` | |
Expand Down
7 changes: 5 additions & 2 deletions bindata/deployment/helm/metallb/templates/speaker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,9 @@ spec:
{{- if .Values.speaker.wanConfig }}
- --ml-wan-config
{{- end }}
{{- if .Values.speaker.ignoreExcludeLB}}
- --ignore-exclude-lb
{{- end }}
env:
- name: METALLB_NODE_NAME
valueFrom:
Expand Down Expand Up @@ -330,7 +333,7 @@ spec:
{{- if or .Values.speaker.frr.enabled .Values.speaker.memberlist.enabled .Values.speaker.excludeInterfaces.enabled }}
volumeMounts:
{{- if .Values.speaker.memberlist.enabled }}
- name: memberlist
- name: memberlist
mountPath: {{ .Values.speaker.memberlist.mlSecretKeyPath }}
{{- end }}
{{- if .Values.speaker.frr.enabled }}
Expand Down Expand Up @@ -525,7 +528,7 @@ spec:
operator: Exists
- key: node-role.kubernetes.io/control-plane
effect: NoSchedule
operator: Exists
operator: Exists
{{- end }}
{{- with .Values.speaker.tolerations }}
{{- toYaml . | nindent 6 }}
Expand Down
7 changes: 5 additions & 2 deletions bindata/deployment/helm/metallb/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@
},
"required": [ "podMonitor", "prometheusRule" ]
},
"controller": {
"controller": {
"allOf": [
{ "$ref": "#/definitions/component" },
{ "description": "MetalLB Controller",
Expand Down Expand Up @@ -330,7 +330,7 @@
}
]
},
"speaker": {
"speaker": {
"allOf": [
{ "$ref": "#/definitions/component" },
{ "description": "MetalLB Speaker",
Expand Down Expand Up @@ -364,6 +364,9 @@
}
}
},
"ignoreExcludeLB": {
"type": "boolean"
},
"updateStrategy": {
"type": "object",
"properties": {
Expand Down
3 changes: 3 additions & 0 deletions bindata/deployment/helm/metallb/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,9 @@ speaker:
mlSecretKeyPath: "/etc/ml_secret_key"
excludeInterfaces:
enabled: true
# ignore the exclude-from-external-loadbalancer label
ignoreExcludeLB: false

image:
repository: quay.io/metallb/speaker
tag:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ metadata:
categories: Networking
certified: "false"
containerImage: quay.io/metallb/metallb-operator
createdAt: "2024-02-16T16:37:35Z"
createdAt: "2024-02-26T17:05:26Z"
description: An operator for deploying MetalLB on a kubernetes cluster.
operators.operatorframework.io/builder: operator-sdk-v1.26.1
operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
Expand Down
2 changes: 1 addition & 1 deletion hack/metallb_ref.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cd0b6fe9ae1375e0e696c40d040cfc6f86465e42
887db69e1a4f998926c8e19d1e8531b0e3dc97f6
Loading