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.

Sign up for GitHub

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 and frr-k8s #484

Merged
merged 2 commits into from
Jul 22, 2024
Merged

Bump metallb and frr-k8s #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c027d08
Bump metallb and frr-k8s
fedepaol Jul 19, 2024
17d06e0
CI: remove the daemon running check
fedepaol Jul 19, 2024
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
7 changes: 7 additions & 0 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,9 +379,16 @@ jobs:
kubectl create ns frr-k8s-system
cd ${GITHUB_WORKSPACE}/frr-k8s
mkdir -p /tmp/kind_logs
# TODO: fix the e2e test so it checks for the current labels too and the proper namespace.
sed -i '/FRRK8isDaemonSetReady/{N;N;d;}' e2etests/e2etest_suite_test.go
sed -i '/github.com\/metallb\/frrk8stests\/pkg\/k8s\"/d' e2etests/e2etest_suite_test.go

# TODO: remove skipping the conflict test, curerntly broken for multiple namespaces
KUBECONFIG_PATH=${HOME}/.kube/config GINKGO_ARGS="--focus Webhooks --skip conflict" TEST_ARGS="--report-path=/tmp/kind_logs" make e2etests
kubectl delete ns frr-k8s-system
#TODO remove when the webhook tests do not leave resources behind
kubectl delete frrconfiguration --all -n metallb-system


- name: MetalLB E2E Tests
run: |
Expand Down
21 changes: 20 additions & 1 deletion bin/metallb-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,6 +889,18 @@ spec:
id:
description: ID is the BGP router ID
type: string
imports:
description: Imports is the list of imported VRFs we want
for this router / vrf.
items:
description: Import represents the possible imported VRFs
to a given router.
properties:
vrf:
description: Vrf is the vrf we want to import from
type: string
type: object
type: array
neighbors:
description: Neighbors is the list of neighbors we want
to establish BGP sessions with.
Expand Down Expand Up @@ -936,6 +948,13 @@ spec:
description: EBGPMultiHop indicates if the BGPPeer
is multi-hops away.
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. If
the session is already established, the configuration will have effect
after reconnecting to the peer
type: boolean
holdTime:
description: |-
HoldTime is the requested BGP hold time, per RFC4271.
Expand Down Expand Up @@ -3959,7 +3978,7 @@ spec:
- name: DEPLOY_KUBE_RBAC_PROXIES
value: "false"
- name: FRRK8S_IMAGE
value: quay.io/metallb/frr-k8s:v0.0.13
value: quay.io/metallb/frr-k8s:v0.0.14
- name: OPERATOR_NAMESPACE
valueFrom:
fieldRef:
Expand Down
6 changes: 3 additions & 3 deletions bindata/deployment/helm/frr-k8s/Chart.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: crds
repository: ""
version: 0.0.13
digest: sha256:8844ecfcd8a0a9664cb0bc4064e87a20278f7732b26bc10ef2dd7988cbb72906
generated: "2024-07-15T16:31:37.71054109+02:00"
version: 0.0.14
digest: sha256:b8b8aa510f86db5713e75b0bc5a03df88737a5f6868aab77c513eb0bbed3b8b7
generated: "2024-07-19T12:07:59.737645816+02:00"
4 changes: 2 additions & 2 deletions bindata/deployment/helm/frr-k8s/Chart.yaml
View file
Open in desktop
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.13
version: 0.0.14
# 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.13
appVersion: v0.0.14
4 changes: 2 additions & 2 deletions bindata/deployment/helm/frr-k8s/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frr-k8s

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

A cloud native wrapper of FRR

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

| Repository | Name | Version |
|------------|------|---------|
| | crds | 0.0.13 |
| | crds | 0.0.14 |

## Values

Expand Down
2 changes: 1 addition & 1 deletion bindata/deployment/helm/frr-k8s/templates/controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ data:
#
vtysh_enable=yes
zebra_options=" -A 127.0.0.1 -s 90000000"
bgpd_options=" -A 127.0.0.1 -p 0"
bgpd_options=" -A 127.0.0.1"
ospfd_options=" -A 127.0.0.1"
ospf6d_options=" -A ::1"
ripd_options=" -A 127.0.0.1"
Expand Down
6 changes: 3 additions & 3 deletions bindata/deployment/helm/metallb/Chart.lock
View file
Open in desktop
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.13
digest: sha256:d96e9df41269f6532a0f588fbf7a507ec01829645e67f935a31e41dafbb4e665
generated: "2024-07-15T16:42:22.231819736+02:00"
version: 0.0.14
digest: sha256:727b303ca5008e171345d7a257142f2fc2e68d14b3e04a1176c7434501af8200
generated: "2024-07-19T12:19:14.171245879+02:00"
2 changes: 1 addition & 1 deletion bindata/deployment/helm/metallb/README.md
View file
Open in desktop
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.13 |
| https://metallb.github.io/frr-k8s | frr-k8s | 0.0.14 |

## Values

Expand Down
19 changes: 19 additions & 0 deletions bundle/manifests/frrk8s.metallb.io_frrconfigurations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,18 @@ spec:
id:
description: ID is the BGP router ID
type: string
imports:
description: Imports is the list of imported VRFs we want
for this router / vrf.
items:
description: Import represents the possible imported VRFs
to a given router.
properties:
vrf:
description: Vrf is the vrf we want to import from
type: string
type: object
type: array
neighbors:
description: Neighbors is the list of neighbors we want
to establish BGP sessions with.
Expand Down Expand Up @@ -179,6 +191,13 @@ spec:
description: EBGPMultiHop indicates if the BGPPeer
is multi-hops away.
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. If
the session is already established, the configuration will have effect
after reconnecting to the peer
type: boolean
holdTime:
description: |-
HoldTime is the requested BGP hold time, per RFC4271.
Expand Down
4 changes: 2 additions & 2 deletions bundle/manifests/metallb-operator.clusterserviceversion.yaml
View file
Open in desktop
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-16T20:10:52Z"
createdAt: "2024-07-19T12:33:20Z"
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 @@ -874,7 +874,7 @@ spec:
- name: DEPLOY_KUBE_RBAC_PROXIES
value: "false"
- name: FRRK8S_IMAGE
value: quay.io/metallb/frr-k8s:v0.0.13
value: quay.io/metallb/frr-k8s:v0.0.14
- name: OPERATOR_NAMESPACE
valueFrom:
fieldRef:
Expand Down
19 changes: 19 additions & 0 deletions config/crd/bases/frrk8s.metallb.io_frrconfigurations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,18 @@ spec:
id:
description: ID is the BGP router ID
type: string
imports:
description: Imports is the list of imported VRFs we want
for this router / vrf.
items:
description: Import represents the possible imported VRFs
to a given router.
properties:
vrf:
description: Vrf is the vrf we want to import from
type: string
type: object
type: array
neighbors:
description: Neighbors is the list of neighbors we want
to establish BGP sessions with.
Expand Down Expand Up @@ -178,6 +190,13 @@ spec:
description: EBGPMultiHop indicates if the BGPPeer
is multi-hops away.
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. If
the session is already established, the configuration will have effect
after reconnecting to the peer
type: boolean
holdTime:
description: |-
HoldTime is the requested BGP hold time, per RFC4271.
Expand Down
2 changes: 1 addition & 1 deletion config/manager/env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ spec:
- name: DEPLOY_KUBE_RBAC_PROXIES
value: "false"
- name: FRRK8S_IMAGE
value: "quay.io/metallb/frr-k8s:v0.0.13"
value: "quay.io/metallb/frr-k8s:v0.0.14"
2 changes: 1 addition & 1 deletion hack/metallb_ref.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8d6152d02ebca7458b09b7563903f5e09037999d
417f016c4870f6c90b66c935ea97e1706d51dd86
4 changes: 2 additions & 2 deletions pkg/helm/testdata/ocp-metrics-frr-k8s-daemon.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"labels": {
"app": "frr-k8s",
"app.kubernetes.io/managed-by": "Helm",
"app.kubernetes.io/version": "v0.0.13",
"app.kubernetes.io/version": "v0.0.14",
"component": "frr-k8s",
"helm.sh/chart": "frr-k8s-0.0.13"
"helm.sh/chart": "frr-k8s-0.0.14"
},
"name": "frr-k8s",
"namespace": "metallb-test-namespace"
Expand Down
4 changes: 2 additions & 2 deletions pkg/helm/testdata/ocp-metrics-frr-k8s-monitor.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"labels": {
"app": "frr-k8s",
"app.kubernetes.io/managed-by": "Helm",
"app.kubernetes.io/version": "v0.0.13",
"app.kubernetes.io/version": "v0.0.14",
"component": "frr-k8s",
"helm.sh/chart": "frr-k8s-0.0.13"
"helm.sh/chart": "frr-k8s-0.0.14"
},
"name": "frr-k8s-monitor",
"namespace": "metallb-test-namespace"
Expand Down
4 changes: 2 additions & 2 deletions pkg/helm/testdata/ocp-metrics-frr-k8s-webhook.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"labels": {
"app": "frr-k8s",
"app.kubernetes.io/managed-by": "Helm",
"app.kubernetes.io/version": "v0.0.13",
"app.kubernetes.io/version": "v0.0.14",
"component": "frr-k8s-webhook-server",
"helm.sh/chart": "frr-k8s-0.0.13"
"helm.sh/chart": "frr-k8s-0.0.14"
},
"name": "frr-k8s-webhook-server",
"namespace": "metallb-test-namespace"
Expand Down
Loading