Fix FRR manifests
When cherry-picking some
changes needed for enabling FRR were overridden. This amends bringing
back the right environment variables and bumping the frr version.
@@ -401,31 +401,13 @@ data:
# or you can use "all_wrap" for all daemons, e.g. to use perf record:
# all_wrap="/usr/bin/perf record --call-graph -"
# the normal daemon command is added to this at the end.
- vtysh.conf: ""
- zebra.conf: |+
- ! -*- zebra -*-
- !
- ! zebra sample configuration file
- !
+ vtysh.conf: |+
+ service integrated-vtysh-config
+ frr.conf: |+
+ frr version 8.0.1
+ frr defaults traditional
hostname Router
- password zebra
- enable password zebra
- !
- ! Interface's description.
- !
- !interface lo
- ! description test of desc.
- !
- !interface sit0
- ! multicast
-
- !
- ! Static default route sample.
- !
- !ip route 0.0.0.0/0 203.181.89.241
- !
-
- !log file zebra.log
+ line vty
---
apiVersion: apps/v1
@@ -466,7 +448,7 @@ spec:
securityContext:
runAsUser: 100
runAsGroup: 101
- image: frrouting/frr:v7.5.1
+ image: frrouting/frr:v8.0.1
command: ["/bin/sh", "-c", "cp -rLf /tmp/frr/* /etc/frr/"]
volumeMounts:
- name: frr-startup
@@ -485,7 +467,7 @@ spec:
securityContext:
capabilities:
add: ["NET_ADMIN", "NET_RAW", "SYS_ADMIN", "NET_BIND_SERVICE"]
- image: frrouting/frr:v7.5.1
+ image: frrouting/frr:v8.0.1
env:
- name: TINI_SUBREAPER
value: "true"
@@ -495,7 +477,7 @@ spec:
- name: frr-conf
mountPath: /etc/frr
- name: reloader
- image: frrouting/frr:v7.5.1
+ image: frrouting/frr:v8.0.1
command: ["/etc/frr_reloader/frr-reloader.sh"]
volumeMounts:
- name: frr-sockets
@@ -509,6 +491,12 @@ spec:
- --config=config
- --log-level=info
env:
+ - name: FRR_CONFIG_FILE
+ value: /etc/frr_reloader/frr.conf
+ - name: FRR_RELOADER_PID_FILE
+ value: /etc/frr_reloader/reloader.pid
+ - name: METALLB_BGP_TYPE
+ value: frr
- name: METALLB_NODE_NAME
valueFrom:
fieldRef:
