From ae592821c6dcfb459add7ba127d835fe0195086f Mon Sep 17 00:00:00 2001 From: Alex Kursell Date: Fri, 12 Apr 2019 12:09:52 -0400 Subject: [PATCH] Remove valgrind --- images/nginx/rootfs/build.sh | 1 - internal/ingress/controller/util.go | 15 --------------- 2 files changed, 16 deletions(-) diff --git a/images/nginx/rootfs/build.sh b/images/nginx/rootfs/build.sh index 28aefc6a53..306f1f418a 100755 --- a/images/nginx/rootfs/build.sh +++ b/images/nginx/rootfs/build.sh @@ -94,7 +94,6 @@ clean-install \ libmaxminddb-dev \ dumb-init \ gdb \ - valgrind \ bc \ || exit 1 diff --git a/internal/ingress/controller/util.go b/internal/ingress/controller/util.go index d7e88ec7ec..5479d47a79 100644 --- a/internal/ingress/controller/util.go +++ b/internal/ingress/controller/util.go @@ -18,7 +18,6 @@ package controller import ( "fmt" - "os" "os/exec" "syscall" @@ -80,23 +79,9 @@ const ( cfgPath = "/etc/nginx/nginx.conf" ) -var valgrind = []string{ - "--tool=memcheck", - "--leak-check=full", - "--show-leak-kinds=all", - "--leak-check=yes", -} - func nginxExecCommand(args ...string) *exec.Cmd { cmdArgs := []string{} - if os.Getenv("RUN_WITH_VALGRIND") == "true" { - cmdArgs = append(cmdArgs, valgrind...) - cmdArgs = append(cmdArgs, defBinary, "-c", cfgPath) - cmdArgs = append(cmdArgs, args...) - return exec.Command("valgrind", cmdArgs...) - } - cmdArgs = append(cmdArgs, "-c", cfgPath) cmdArgs = append(cmdArgs, args...) return exec.Command(defBinary, cmdArgs...)