From 26cada1ee121121571b586a90dfad5145ff18a42 Mon Sep 17 00:00:00 2001 From: Federico Paolinelli Date: Thu, 27 Jun 2024 10:43:28 +0200 Subject: [PATCH] Bump FRR to 9.1.0 Bumping FRR to the 9.1.0 version. Among others, this fixes importing VRFs when a network is defined in a router belonging to a vrf and another router imports that VRF. Signed-off-by: Federico Paolinelli --- charts/frr-k8s/README.md | 2 +- charts/frr-k8s/values.yaml | 2 +- config/all-in-one/frr-k8s-prometheus.yaml | 8 ++++---- config/all-in-one/frr-k8s.yaml | 8 ++++---- config/frr-k8s/frr-k8s.yaml | 8 ++++---- e2etests/e2etest_suite_test.go | 2 +- hack/demo/demo.sh | 2 +- internal/frr/docker_test.go | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/charts/frr-k8s/README.md b/charts/frr-k8s/README.md index 8a045bff..afb6fbe7 100644 --- a/charts/frr-k8s/README.md +++ b/charts/frr-k8s/README.md @@ -29,7 +29,7 @@ Kubernetes: `>= 1.19.0-0` | frrk8s.disableCertRotation | bool | `false` | | | frrk8s.frr.image.pullPolicy | string | `nil` | | | frrk8s.frr.image.repository | string | `"quay.io/frrouting/frr"` | | -| frrk8s.frr.image.tag | string | `"9.0.2"` | | +| frrk8s.frr.image.tag | string | `"9.1.0"` | | | frrk8s.frr.metricsBindAddress | string | `"127.0.0.1"` | | | frrk8s.frr.metricsPort | int | `7573` | | | frrk8s.frr.resources | object | `{}` | | diff --git a/charts/frr-k8s/values.yaml b/charts/frr-k8s/values.yaml index 32d118b9..2cefcaa2 100644 --- a/charts/frr-k8s/values.yaml +++ b/charts/frr-k8s/values.yaml @@ -158,7 +158,7 @@ frrk8s: frr: image: repository: quay.io/frrouting/frr - tag: 9.0.2 + tag: 9.1.0 pullPolicy: metricsBindAddress: 127.0.0.1 metricsPort: 7573 diff --git a/config/all-in-one/frr-k8s-prometheus.yaml b/config/all-in-one/frr-k8s-prometheus.yaml index 300e3e38..37a8c688 100644 --- a/config/all-in-one/frr-k8s-prometheus.yaml +++ b/config/all-in-one/frr-k8s-prometheus.yaml @@ -1147,7 +1147,7 @@ spec: env: - name: TINI_SUBREAPER value: "true" - image: quay.io/frrouting/frr:9.0.2 + image: quay.io/frrouting/frr:9.1.0 livenessProbe: failureThreshold: 3 httpGet: @@ -1180,7 +1180,7 @@ spec: - --metrics-bind-address=127.0.0.1 command: - /etc/frr_metrics/frr-metrics - image: quay.io/frrouting/frr:9.0.2 + image: quay.io/frrouting/frr:9.1.0 name: frr-metrics ports: - containerPort: 7573 @@ -1194,7 +1194,7 @@ spec: name: metrics - command: - /etc/frr_reloader/frr-reloader.sh - image: quay.io/frrouting/frr:9.0.2 + image: quay.io/frrouting/frr:9.1.0 name: reloader volumeMounts: - mountPath: /var/run/frr @@ -1209,7 +1209,7 @@ spec: - /bin/sh - -c - cp -rLf /tmp/frr/* /etc/frr/ - image: quay.io/frrouting/frr:9.0.2 + image: quay.io/frrouting/frr:9.1.0 name: cp-frr-files securityContext: runAsGroup: 101 diff --git a/config/all-in-one/frr-k8s.yaml b/config/all-in-one/frr-k8s.yaml index d547e40f..207344c8 100644 --- a/config/all-in-one/frr-k8s.yaml +++ b/config/all-in-one/frr-k8s.yaml @@ -1116,7 +1116,7 @@ spec: env: - name: TINI_SUBREAPER value: "true" - image: quay.io/frrouting/frr:9.0.2 + image: quay.io/frrouting/frr:9.1.0 livenessProbe: failureThreshold: 3 httpGet: @@ -1149,7 +1149,7 @@ spec: - --metrics-bind-address=127.0.0.1 command: - /etc/frr_metrics/frr-metrics - image: quay.io/frrouting/frr:9.0.2 + image: quay.io/frrouting/frr:9.1.0 name: frr-metrics ports: - containerPort: 7573 @@ -1163,7 +1163,7 @@ spec: name: metrics - command: - /etc/frr_reloader/frr-reloader.sh - image: quay.io/frrouting/frr:9.0.2 + image: quay.io/frrouting/frr:9.1.0 name: reloader volumeMounts: - mountPath: /var/run/frr @@ -1178,7 +1178,7 @@ spec: - /bin/sh - -c - cp -rLf /tmp/frr/* /etc/frr/ - image: quay.io/frrouting/frr:9.0.2 + image: quay.io/frrouting/frr:9.1.0 name: cp-frr-files securityContext: runAsGroup: 101 diff --git a/config/frr-k8s/frr-k8s.yaml b/config/frr-k8s/frr-k8s.yaml index 7ed98e47..b1dddd84 100644 --- a/config/frr-k8s/frr-k8s.yaml +++ b/config/frr-k8s/frr-k8s.yaml @@ -98,7 +98,7 @@ spec: securityContext: capabilities: add: ["NET_ADMIN", "NET_RAW", "SYS_ADMIN", "NET_BIND_SERVICE"] - image: quay.io/frrouting/frr:9.0.2 + image: quay.io/frrouting/frr:9.1.0 env: - name: TINI_SUBREAPER value: "true" @@ -136,7 +136,7 @@ spec: failureThreshold: 30 periodSeconds: 5 - name: frr-metrics - image: quay.io/frrouting/frr:9.0.2 + image: quay.io/frrouting/frr:9.1.0 command: ["/etc/frr_metrics/frr-metrics"] args: - --metrics-port=7573 @@ -152,7 +152,7 @@ spec: - name: metrics mountPath: /etc/frr_metrics - name: reloader - image: quay.io/frrouting/frr:9.0.2 + image: quay.io/frrouting/frr:9.1.0 command: ["/etc/frr_reloader/frr-reloader.sh"] volumeMounts: - name: frr-sockets @@ -186,7 +186,7 @@ spec: securityContext: runAsUser: 100 runAsGroup: 101 - image: quay.io/frrouting/frr:9.0.2 + image: quay.io/frrouting/frr:9.1.0 command: ["/bin/sh", "-c", "cp -rLf /tmp/frr/* /etc/frr/"] volumeMounts: - name: frr-startup diff --git a/e2etests/e2etest_suite_test.go b/e2etests/e2etest_suite_test.go index 8e9ec622..6be6632b 100644 --- a/e2etests/e2etest_suite_test.go +++ b/e2etests/e2etest_suite_test.go @@ -34,8 +34,8 @@ func handleFlags() { flag.StringVar(&reportPath, "report-path", "/tmp/report", "the path to be used to dump test failure information") flag.StringVar(&prometheusNamespace, "prometheus-namespace", "monitoring", "the namespace prometheus is running in (if running)") flag.StringVar(&externalContainers, "external-containers", "", "a comma separated list of external containers names to use for the test. (valid parameters are: ibgp-single-hop / ibgp-multi-hop / ebgp-single-hop / ebgp-multi-hop)") - flag.StringVar(&frrImage, "frr-image", "quay.io/frrouting/frr:9.0.2", "the image to use for the external frr containers") flag.StringVar(&executor.Kubectl, "kubectl", "kubectl", "the path for the kubectl binary") + flag.StringVar(&frrImage, "frr-image", "quay.io/frrouting/frr:9.1.0", "the image to use for the external frr containers") flag.Parse() diff --git a/hack/demo/demo.sh b/hack/demo/demo.sh index 4f06a826..ee777297 100755 --- a/hack/demo/demo.sh +++ b/hack/demo/demo.sh @@ -13,7 +13,7 @@ cp frr/daemons $FRR_CONFIG chmod a+rw $FRR_CONFIG/* docker rm -f frr -docker run -d --privileged --network kind --rm --ulimit core=-1 --name frr --volume "$FRR_CONFIG":/etc/frr quay.io/frrouting/frr:9.0.2 +docker run -d --privileged --network kind --rm --ulimit core=-1 --name frr --volume "$FRR_CONFIG":/etc/frr quay.io/frrouting/frr:9.1.0 FRR_IP=$(docker inspect -f "{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}" frr) diff --git a/internal/frr/docker_test.go b/internal/frr/docker_test.go index 317c0767..9b616cdc 100644 --- a/internal/frr/docker_test.go +++ b/internal/frr/docker_test.go @@ -24,7 +24,7 @@ var ( ) const ( - frrImageTag = "9.0.2" + frrImageTag = "9.1.0" ) func TestMain(m *testing.M) {