From 22d63d0ad045114146e7eadb2779e91ebfa78bc2 Mon Sep 17 00:00:00 2001
From: Manuel de Brito Fontes <aledbf@gmail.com>
Date: Tue, 16 May 2017 16:06:33 -0400
Subject: [PATCH] Auto stash before merge of "master" and "master/master"

Remove go-reap and use tini as process reaper
---
 controllers/nginx/pkg/cmd/controller/main.go  | 4 ----
 controllers/nginx/pkg/cmd/controller/nginx.go | 4 +---
 controllers/nginx/pkg/template/template.go    | 8 ++------
 controllers/nginx/rootfs/Dockerfile           | 5 +++++
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/controllers/nginx/pkg/cmd/controller/main.go b/controllers/nginx/pkg/cmd/controller/main.go
index a8d1032f9..8086d413f 100644
--- a/controllers/nginx/pkg/cmd/controller/main.go
+++ b/controllers/nginx/pkg/cmd/controller/main.go
@@ -23,14 +23,10 @@ import (
 	"time"
 
 	"github.com/golang/glog"
-	go_reap "github.com/hashicorp/go-reap"
-
 	"k8s.io/ingress/core/pkg/ingress/controller"
 )
 
 func main() {
-	go go_reap.ReapChildren(nil, nil, nil, nil)
-
 	// start a new nginx controller
 	ngx := newNGINXController()
 	// create a custom Ingress controller using NGINX as backend
diff --git a/controllers/nginx/pkg/cmd/controller/nginx.go b/controllers/nginx/pkg/cmd/controller/nginx.go
index 6f4981700..1a47e1d64 100644
--- a/controllers/nginx/pkg/cmd/controller/nginx.go
+++ b/controllers/nginx/pkg/cmd/controller/nginx.go
@@ -53,8 +53,6 @@ const (
 
 	defaultStatusModule statusModule = "default"
 	vtsStatusModule     statusModule = "vts"
-
-	errNoChild = "wait: no child processes"
 )
 
 var (
@@ -354,7 +352,7 @@ func (n NGINXController) testTemplate(cfg []byte) error {
 		return err
 	}
 	out, err := exec.Command(n.binary, "-t", "-c", tmpfile.Name()).CombinedOutput()
-	if err != nil && err.Error() != errNoChild {
+	if err != nil {
 		// this error is different from the rest because it must be clear why nginx is not working
 		oe := fmt.Sprintf(`
 -------------------------------------------------------------------------------
diff --git a/controllers/nginx/pkg/template/template.go b/controllers/nginx/pkg/template/template.go
index edaa3456a..dea4ed310 100644
--- a/controllers/nginx/pkg/template/template.go
+++ b/controllers/nginx/pkg/template/template.go
@@ -40,7 +40,6 @@ import (
 const (
 	slash         = "/"
 	defBufferSize = 65535
-	errNoChild    = "wait: no child processes"
 )
 
 // Template ...
@@ -102,7 +101,7 @@ func (t *Template) Write(conf config.TemplateConfig) ([]byte, error) {
 	}
 
 	err := t.tmpl.Execute(t.tmplBuf, conf)
-	if err != nil && err.Error() != errNoChild {
+	if err != nil {
 		return nil, err
 	}
 
@@ -112,10 +111,7 @@ func (t *Template) Write(conf config.TemplateConfig) ([]byte, error) {
 	cmd.Stdin = t.tmplBuf
 	cmd.Stdout = t.outCmdBuf
 	if err := cmd.Run(); err != nil {
-		if err.Error() != errNoChild {
-			glog.Warningf("unexpected error cleaning template: %v", err)
-		}
-
+		glog.Warningf("unexpected error cleaning template: %v", err)
 		return t.tmplBuf.Bytes(), nil
 	}
 
diff --git a/controllers/nginx/rootfs/Dockerfile b/controllers/nginx/rootfs/Dockerfile
index 6651764f2..3b1ee255a 100644
--- a/controllers/nginx/rootfs/Dockerfile
+++ b/controllers/nginx/rootfs/Dockerfile
@@ -19,6 +19,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y \
   --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
+RUN curl -sSL -o /sbin/tini https://github.com/krallin/tini/releases/download/v0.14.0/tini-amd64 && \
+  chmod +x /sbin/tini
+		
+ENTRYPOINT ["/sbin/tini", "--"]
+
 COPY . /
 
 CMD ["/nginx-ingress-controller"]