FRR-K8s: make listening to incoming connections configurable

In case full mesh is not needed, always connecting results in a more predictable behavior. Signed-off-by: Federico Paolinelli <[email protected]>
metallb · Nov 22, 2024 · 12e4dd6 · 12e4dd6
1 parent bece7fd
commit 12e4dd6
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 4 deletions.
diff --git a/charts/frr-k8s/README.md b/charts/frr-k8s/README.md
@@ -27,6 +27,7 @@ Kubernetes: `>= 1.19.0-0`
 | frrk8s.affinity | object | `{}` |  |
 | frrk8s.alwaysBlock | string | `""` |  |
 | frrk8s.disableCertRotation | bool | `false` |  |
+| frrk8s.frr.acceptIncomingBGPConnections | bool | `false` |  |
 | frrk8s.frr.image.pullPolicy | string | `nil` |  |
 | frrk8s.frr.image.repository | string | `"quay.io/frrouting/frr"` |  |
 | frrk8s.frr.image.tag | string | `"9.1.0"` |  |

diff --git a/charts/frr-k8s/templates/controller.yaml b/charts/frr-k8s/templates/controller.yaml
@@ -50,7 +50,7 @@ data:
     #
     vtysh_enable=yes
     zebra_options="  -A 127.0.0.1 -s 90000000"
-    bgpd_options="   -A 127.0.0.1"
+    bgpd_options="   -A 127.0.0.1 {{ if not .Values.frrk8s.frr.acceptIncomingBGPConnections }} -p 0 {{- end }}"
     ospfd_options="  -A 127.0.0.1"
     ospf6d_options=" -A ::1"
     ripd_options="   -A 127.0.0.1"

diff --git a/charts/frr-k8s/values.yaml b/charts/frr-k8s/values.yaml
@@ -163,6 +163,7 @@ frrk8s:
     metricsPort: 7573
     resources: {}
     secureMetricsPort: 9141
+    acceptIncomingBGPConnections: false
   reloader:
     resources: {}
   frrMetrics:

diff --git a/config/all-in-one/frr-k8s-prometheus.yaml b/config/all-in-one/frr-k8s-prometheus.yaml
@@ -836,7 +836,7 @@ data:
     #
     vtysh_enable=yes
     zebra_options="  -A 127.0.0.1 -s 90000000"
-    bgpd_options="   -A 127.0.0.1"
+    bgpd_options="   -A 127.0.0.1 -p 0"
     ospfd_options="  -A 127.0.0.1"
     ospf6d_options=" -A ::1"
     ripd_options="   -A 127.0.0.1"

diff --git a/config/all-in-one/frr-k8s.yaml b/config/all-in-one/frr-k8s.yaml
@@ -805,7 +805,7 @@ data:
     #
     vtysh_enable=yes
     zebra_options="  -A 127.0.0.1 -s 90000000"
-    bgpd_options="   -A 127.0.0.1"
+    bgpd_options="   -A 127.0.0.1 -p 0"
     ospfd_options="  -A 127.0.0.1"
     ospf6d_options=" -A ::1"
     ripd_options="   -A 127.0.0.1"

diff --git a/config/frr-k8s/frr-cm.yaml b/config/frr-k8s/frr-cm.yaml
@@ -46,7 +46,7 @@ data:
     #
     vtysh_enable=yes
     zebra_options="  -A 127.0.0.1 -s 90000000"
-    bgpd_options="   -A 127.0.0.1"
+    bgpd_options="   -A 127.0.0.1 -p 0"
     ospfd_options="  -A 127.0.0.1"
     ospf6d_options=" -A ::1"
     ripd_options="   -A 127.0.0.1"