Merge pull request #3748 from aledbf/update-image

Update nginx image
2019-02-13 15:14:08 -08:00 · 2019-02-13 15:14:08 -08:00 · c8d30755a9
commit c8d30755a9
parent eab7f18297 80d9024fca
5 changed files with 12 additions and 13 deletions
--- a/internal/ingress/controller/util.go
+++ b/internal/ingress/controller/util.go
@ -17,11 +17,12 @@ limitations under the License.
 package controller

 import (
-	"k8s.io/apimachinery/pkg/util/intstr"
 	"os"
 	"os/exec"
 	"syscall"

+	"k8s.io/apimachinery/pkg/util/intstr"
+
 	"fmt"

 	"k8s.io/klog"
@ -108,10 +109,5 @@ func nginxExecCommand(args ...string) *exec.Cmd {
 }

 func nginxTestCommand(cfg string) *exec.Cmd {
-	ngx := os.Getenv("NGINX_BINARY")
-	if ngx == "" {
-		ngx = defBinary
-	}
-
-	return exec.Command("authbind", "--deep", ngx, "-c", cfg, "-t")
+	return exec.Command(defBinary, "-c", cfg, "-t")
 }