DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove valgrind

Browse source
This commit is contained in:
Alex Kursell 2019-04-12 12:09:52 -04:00
parent ac043771ff
commit ae592821c6
2 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
images/nginx/rootfs/build.sh
View file

@ -94,7 +94,6 @@ clean-install \
libmaxminddb-dev \ libmaxminddb-dev \
dumb-init \ dumb-init \
gdb \ gdb \
valgrind \
bc \ bc \
|| exit 1 || exit 1

15
internal/ingress/controller/util.go
View file

@ -18,7 +18,6 @@ package controller
import ( import (
"fmt" "fmt"
"os"
"os/exec" "os/exec"
"syscall" "syscall"
@ -80,23 +79,9 @@ const (
cfgPath = "/etc/nginx/nginx.conf" 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 { func nginxExecCommand(args ...string) *exec.Cmd {
cmdArgs := []string{} 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, "-c", cfgPath)
cmdArgs = append(cmdArgs, args...) cmdArgs = append(cmdArgs, args...)
return exec.Command(defBinary, cmdArgs...) return exec.Command(defBinary, cmdArgs...)