Merge pull request kubernetes#4004 from Shopify/no-valgrind

Remove valgrind
lspas-volvo · Apr 14, 2019 · 4c37e0e · 4c37e0e
2 parents ce41816 + ae59282
commit 4c37e0e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 16 deletions.
diff --git 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
@@ -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...)