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

Jump to bottom

Make the frr generated files compatible with 8.0+ #168

Merged
merged 1 commit into from
Jul 15, 2024
Merged

Make the frr generated files compatible with 8.0+ #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion charts/frr-k8s/templates/controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ data:
frr.conf: |+
! This file gets overriden the first time the speaker renders a config.
! So anything configured here is only temporary.
frr version 7.5.1
frr version 8.0
frr defaults traditional
hostname Router
line vty
Expand Down
2 changes: 1 addition & 1 deletion config/all-in-one/frr-k8s-prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,7 @@ data:
frr.conf: |
! This file gets overriden the first time the speaker renders a config.
! So anything configured here is only temporary.
frr version 7.5.1
frr version 8.0
frr defaults traditional
hostname Router
line vty
Expand Down
2 changes: 1 addition & 1 deletion config/all-in-one/frr-k8s.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@ data:
frr.conf: |
! This file gets overriden the first time the speaker renders a config.
! So anything configured here is only temporary.
frr version 7.5.1
frr version 8.0
frr defaults traditional
hostname Router
line vty
Expand Down
2 changes: 1 addition & 1 deletion config/frr-k8s/frr-cm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ data:
frr.conf: |+
! This file gets overriden the first time the speaker renders a config.
! So anything configured here is only temporary.
frr version 7.5.1
frr version 8.0
frr defaults traditional
hostname Router
line vty
Expand Down
5 changes: 3 additions & 2 deletions internal/frr/templates/bfdprofile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@
echo-mode
{{end -}}
{{ if .profile.EchoInterval -}}
echo-interval {{.profile.EchoInterval}}
echo transmit-interval {{.profile.EchoInterval}}
echo receive-interval {{.profile.EchoInterval}}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should ideally be different commit?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nope, it's actually the core of the commit "make the generated files compatible to 8.0+".
From 8.0 frr format has separate echo-intervals, to the point that frr 9+ is throwing an error when deleting echo-interval (the ci failure I got in metallb).

Let me modify the description of the commit to make it clearer.

{{end -}}
{{ if .profile.PassiveMode -}}
passive-mode
{{end -}}
{{ if .profile.MinimumTTL -}}
minimum-ttl {{ .profile.MinimumTTL }}
{{end -}}
{{- end -}}
{{- end -}}
3 changes: 2 additions & 1 deletion internal/frr/testdata/TestSingleSessionBFD.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ bfd
transmit-interval 200
detect-multiplier 3
echo-mode
echo-interval 25
echo transmit-interval 25
echo receive-interval 25
passive-mode
minimum-ttl 20

Expand Down
3 changes: 2 additions & 1 deletion internal/frr/testdata/TestTwoRoutersTwoNeighborsBFD.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ bfd
transmit-interval 200
detect-multiplier 3
echo-mode
echo-interval 25
echo transmit-interval 25
echo receive-interval 25
passive-mode
minimum-ttl 20

Expand Down
Loading