From 421159cda1cbc475c081ecb62a8f16a9b2f38590 Mon Sep 17 00:00:00 2001
From: karampok <karampok@gmail.com>
Date: Tue, 3 Dec 2024 10:10:33 +0100
Subject: [PATCH]  remove watchfrr debug

Signed-off-by: karampok <karampok@gmail.com>
---
 config/all-in-one/frr-k8s-prometheus.yaml | 21 +++------------------
 config/all-in-one/frr-k8s.yaml            | 21 +++------------------
 config/frr-k8s/frr-k8s.yaml               | 21 +++------------------
 e2etests/tests/graceful_restart.go        |  4 ++--
 4 files changed, 11 insertions(+), 56 deletions(-)

diff --git a/config/all-in-one/frr-k8s-prometheus.yaml b/config/all-in-one/frr-k8s-prometheus.yaml
index d39250bc..9aff3ce0 100644
--- a/config/all-in-one/frr-k8s-prometheus.yaml
+++ b/config/all-in-one/frr-k8s-prometheus.yaml
@@ -1166,25 +1166,10 @@ spec:
         - mountPath: /etc/frr_reloader
           name: reloader
       - command:
-        - /bin/bash
-        - -cx
+        - /bin/sh
+        - -c
         - |
-          if [ -r "/lib/lsb/init-functions" ]; then
-                  . /lib/lsb/init-functions
-          else
-                  log_success_msg() {
-                          echo "$@"
-                  }
-                  log_warning_msg() {
-                          echo "$@" >&2
-                  }
-                  log_failure_msg() {
-                          echo "$@" >&2
-                  }
-          fi
-
-          source /usr/lib/frr/frrcommon.sh
-          /usr/lib/frr/watchfrr -l 7 $(daemon_list) &
+          /sbin/tini -- /usr/lib/frr/docker-start &
           attempts=0
           until [[ -f /etc/frr/frr.log || $attempts -eq 60 ]]; do
             sleep 1
diff --git a/config/all-in-one/frr-k8s.yaml b/config/all-in-one/frr-k8s.yaml
index 5369d453..ee5f88f2 100644
--- a/config/all-in-one/frr-k8s.yaml
+++ b/config/all-in-one/frr-k8s.yaml
@@ -1135,25 +1135,10 @@ spec:
         - mountPath: /etc/frr_reloader
           name: reloader
       - command:
-        - /bin/bash
-        - -cx
+        - /bin/sh
+        - -c
         - |
-          if [ -r "/lib/lsb/init-functions" ]; then
-                  . /lib/lsb/init-functions
-          else
-                  log_success_msg() {
-                          echo "$@"
-                  }
-                  log_warning_msg() {
-                          echo "$@" >&2
-                  }
-                  log_failure_msg() {
-                          echo "$@" >&2
-                  }
-          fi
-
-          source /usr/lib/frr/frrcommon.sh
-          /usr/lib/frr/watchfrr -l 7 $(daemon_list) &
+          /sbin/tini -- /usr/lib/frr/docker-start &
           attempts=0
           until [[ -f /etc/frr/frr.log || $attempts -eq 60 ]]; do
             sleep 1
diff --git a/config/frr-k8s/frr-k8s.yaml b/config/frr-k8s/frr-k8s.yaml
index daf6397c..92e91ddb 100644
--- a/config/frr-k8s/frr-k8s.yaml
+++ b/config/frr-k8s/frr-k8s.yaml
@@ -113,25 +113,10 @@ spec:
         # If the log file isn't created in 60 seconds the tail fails and the container is restarted.
         # This workaround is needed to have the frr logs as part of kubectl logs -c frr < k8s-frr-podname >.
         command:
-          - /bin/bash
-          - -cx
+          - /bin/sh
+          - -c
           - |
-            if [ -r "/lib/lsb/init-functions" ]; then
-                    . /lib/lsb/init-functions
-            else
-                    log_success_msg() {
-                            echo "$@"
-                    }
-                    log_warning_msg() {
-                            echo "$@" >&2
-                    }
-                    log_failure_msg() {
-                            echo "$@" >&2
-                    }
-            fi
-
-            source /usr/lib/frr/frrcommon.sh
-            /usr/lib/frr/watchfrr -l 7 $(daemon_list) &
+            /sbin/tini -- /usr/lib/frr/docker-start &
             attempts=0
             until [[ -f /etc/frr/frr.log || $attempts -eq 60 ]]; do
               sleep 1
diff --git a/e2etests/tests/graceful_restart.go b/e2etests/tests/graceful_restart.go
index 20be8592..eb28c6e5 100644
--- a/e2etests/tests/graceful_restart.go
+++ b/e2etests/tests/graceful_restart.go
@@ -37,7 +37,7 @@ var _ = ginkgo.Describe("Establish BGP session with EnableGracefulRestart", func
 		updater    *config.Updater
 		reporter   *k8sreporter.KubernetesReporter
 		nodes      []corev1.Node
-		prefixesV4 = scaleUP(200)
+		prefixesV4 = scaleUP(100)
 	)
 
 	cleanup := func(u *config.Updater) error {
@@ -175,7 +175,7 @@ var _ = ginkgo.Describe("Establish BGP session with EnableGracefulRestart", func
 			Eventually(c, time.Minute, time.Second).Should(BeClosed(), "restart FRRK8s pods are not yet ready")
 		},
 			ginkgo.Entry("IPV4", ipfamily.IPv4, prefixesV4),
-//			ginkgo.Entry("IPV6", ipfamily.IPv6, []string{"2001:db8:5555::5/128"}),
+			//			ginkgo.Entry("IPV6", ipfamily.IPv6, []string{"2001:db8:5555::5/128"}),
 		)
 	})
 })