cmd/contour: add readinessProbe support to contour container

Fixes projectcontour#86 Updates projectcontour#10 This PR adds healthz support to contour using the heptiolabs/healthcheck library. The envoy container's heathcheck is not done, yet. Signed-off-by: Dave Cheney <dave@cheney.net>
davecheney · Jan 29, 2018 · 17dd27d · 17dd27d
1 parent 783aeb2
commit 17dd27d
Show file tree

Hide file tree

Showing 9 changed files with 106 additions and 1 deletion.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/cmd/contour/contour.go b/cmd/contour/contour.go
@@ -14,12 +14,15 @@
 package main
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"io"
 	"net"
+	"net/http"
 	"os"
 	"path/filepath"
+	"time"
 
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 
@@ -33,6 +36,7 @@ import (
 	"github.com/heptio/contour/internal/k8s"
 	"github.com/heptio/contour/internal/log/stdlog"
 	"github.com/heptio/contour/internal/workgroup"
+	"github.com/heptiolabs/healthcheck"
 )
 
 const (
@@ -92,6 +96,21 @@ func main() {
 		k8s.WatchIngress(&g, client, logger, buf)
 		k8s.WatchSecrets(&g, client, logger, buf)
 
+		g.Add(func(stop <-chan struct{}) {
+			logger := logger.WithPrefix("healthcheck")
+			srv := &http.Server{
+				Handler:      healthcheck.NewHandler(),
+				Addr:         "0.0.0.0:8086",
+				WriteTimeout: 15 * time.Second,
+				ReadTimeout:  15 * time.Second,
+			}
+			go srv.ListenAndServe() // run server in another goroutine
+			logger.Infof("started, listening on %v", srv.Addr)
+			defer logger.Infof("stopped")
+			<-stop                             // wait for stop signal
+			srv.Shutdown(context.Background()) // shutdown and wait for server to exit
+		})
+
 		g.Add(func(stop <-chan struct{}) {
 			logger := logger.WithPrefix("gRPCAPI")
 			l, err := net.Listen("tcp", V2_API_ADDRESS)

diff --git a/deployment/deployment-grpc-v2/02-contour.yaml b/deployment/deployment-grpc-v2/02-contour.yaml
@@ -36,6 +36,11 @@ spec:
         volumeMounts:
         - name: contour-config
           mountPath: /config
+        readinessProbe:
+          httpGet:
+            path: /ready
+            port: 8086
+          periodSeconds: 5
       initContainers:
       - image: gcr.io/heptio-images/contour:master
         imagePullPolicy: Always

diff --git a/deployment/ds-grpc-v2/02-contour.yaml b/deployment/ds-grpc-v2/02-contour.yaml
@@ -35,6 +35,11 @@ spec:
         volumeMounts:
         - name: contour-config
           mountPath: /config
+        readinessProbe:
+          httpGet:
+            path: /ready
+            port: 8086
+         periodSeconds: 5
       initContainers:
       - image: gcr.io/heptio-images/contour:master
         imagePullPolicy: Always

diff --git a/deployment/ds-hostnet/02-contour.yaml b/deployment/ds-hostnet/02-contour.yaml
@@ -36,6 +36,11 @@ spec:
         name: contour
         command: ["contour"]
         args: ["serve", "--incluster"]
+        readinessProbe:
+          httpGet:
+            path: /ready
+            port: 8086
+          periodSeconds: 5
       initContainers:
       - image: gcr.io/heptio-images/contour:master
         imagePullPolicy: Always

diff --git a/deployment/render/daemonset-norbac.yaml b/deployment/render/daemonset-norbac.yaml
@@ -49,6 +49,11 @@ spec:
         volumeMounts:
         - name: contour-config
           mountPath: /config
+        readinessProbe:
+          httpGet:
+            path: /ready
+            port: 8086
+         periodSeconds: 5
       initContainers:
       - image: gcr.io/heptio-images/contour:master
         imagePullPolicy: Always

diff --git a/deployment/render/daemonset-rbac.yaml b/deployment/render/daemonset-rbac.yaml
@@ -49,6 +49,11 @@ spec:
         volumeMounts:
         - name: contour-config
           mountPath: /config
+        readinessProbe:
+          httpGet:
+            path: /ready
+            port: 8086
+         periodSeconds: 5
       initContainers:
       - image: gcr.io/heptio-images/contour:master
         imagePullPolicy: Always

diff --git a/deployment/render/deployment-norbac.yaml b/deployment/render/deployment-norbac.yaml
@@ -50,6 +50,11 @@ spec:
         volumeMounts:
         - name: contour-config
           mountPath: /config
+        readinessProbe:
+          httpGet:
+            path: /ready
+            port: 8086
+          periodSeconds: 5
       initContainers:
       - image: gcr.io/heptio-images/contour:master
         imagePullPolicy: Always

diff --git a/deployment/render/deployment-rbac.yaml b/deployment/render/deployment-rbac.yaml
@@ -50,6 +50,11 @@ spec:
         volumeMounts:
         - name: contour-config
           mountPath: /config
+        readinessProbe:
+          httpGet:
+            path: /ready
+            port: 8086
+          periodSeconds: 5
       initContainers:
       - image: gcr.io/heptio-images/contour:master
         imagePullPolicy: Always