fix(boot.go,pkg/healthsrv): add kubernetes API checks in the healthz endpoint

Author: Aaron Schlesinger

boot.go

@@ -12,7 +12,11 @@ import (
 	"github.com/deis/builder/pkg/gitreceive/storage"
 	"github.com/deis/builder/pkg/healthsrv"
 	"github.com/deis/builder/pkg/sshd"
+<<<<<<< 032d8fd56928af3492a8449e226d36d5324b8d2c
 	pkglog "github.com/deis/pkg/log"
+=======
+	kcl "k8s.io/kubernetes/pkg/client/unversioned"
+>>>>>>> fix(boot.go,pkg/healthsrv): add kubernetes API checks in the healthz endpoint
 )
 
 const (
@@ -49,10 +53,15 @@ func main() {
 					pkglog.Err("getting s3 client [%s]", err)
 					os.Exit(1)
 				}
+				kubeClient, err := kcl.NewInCluster()
+				if err != nil {
+					pkglog.Err("getting kubernetes client [%s]", err)
+					os.Exit(1)
+				}
 				pkglog.Info("starting health check server on port %d", cnf.HealthSrvPort)
 				healthSrvCh := make(chan error)
 				go func() {
-					if err := healthsrv.Start(cnf.HealthSrvPort, s3Client); err != nil {
+					if err := healthsrv.Start(cnf.HealthSrvPort, kubeClient.Namespaces(), s3Client); err != nil {
 						healthSrvCh <- err
 					}
 				}()

pkg/healthsrv/healthz_handler.go

@@ -8,6 +8,8 @@ import (
 
 	s3 "github.com/aws/aws-sdk-go/service/s3"
 	"github.com/deis/builder/pkg/gitreceive/log"
+	"k8s.io/kubernetes/pkg/fields"
+	"k8s.io/kubernetes/pkg/labels"
 )
 
 type healthZRespBucket struct {
@@ -23,28 +25,40 @@ func convertBucket(b *s3.Bucket) healthZRespBucket {
 }
 
 type healthZResp struct {
-	Buckets []healthZRespBucket `json:"buckets"`
+	Namespaces []string            `json:"k8s_namespaces"`
+	S3Buckets  []healthZRespBucket `json:"s3_buckets"`
 }
 
-func healthZHandler(s3Client *s3.S3) http.Handler {
+func healthZHandler(nsLister NamespaceLister, s3Client *s3.S3) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		lbOut, err := s3Client.ListBuckets(&s3.ListBucketsInput{})
 		if err != nil {
 			str := fmt.Sprintf("Error listing buckets (%s)", err)
-			log.Info(str)
+			log.Err(str)
 			http.Error(w, str, http.StatusInternalServerError)
 			return
 		}
 		var rsp healthZResp
 		for _, buck := range lbOut.Buckets {
-			rsp.Buckets = append(rsp.Buckets, convertBucket(buck))
+			rsp.S3Buckets = append(rsp.S3Buckets, convertBucket(buck))
 		}
+
+		nsList, err := nsLister.List(labels.Everything(), fields.Everything())
+		if err != nil {
+			str := fmt.Sprintf("Error listing buckets (%s)", err)
+			log.Err(str)
+			http.Error(w, str, http.StatusInternalServerError)
+			return
+		}
+		for _, ns := range nsList.Items {
+			rsp.Namespaces = append(rsp.Namespaces, ns.Name)
+		}
+
 		if err := json.NewEncoder(w).Encode(rsp); err != nil {
 			str := fmt.Sprintf("Error encoding JSON (%s)", err)
 			http.Error(w, str, http.StatusInternalServerError)
 			return
 		}
-		// TODO: check k8s API
 		// TODO: check server is running
 	})
 }

pkg/healthsrv/namespace_lister.go

@@ -0,0 +1,11 @@
+package healthsrv
+
+import (
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/fields"
+	"k8s.io/kubernetes/pkg/labels"
+)
+
+type NamespaceLister interface {
+	List(labels.Selector, fields.Selector) (*api.NamespaceList, error)
+}

pkg/healthsrv/server.go

@@ -13,9 +13,9 @@ const (
 )
 
 // Start starts the healthcheck server on $host:$port and blocks. It only returns if the server fails, with the indicative error
-func Start(port int, s3Client *s3.S3) error {
+func Start(port int, nsLister NamespaceLister, s3Client *s3.S3) error {
 	mux := http.NewServeMux()
-	mux.Handle("/healthz", healthZHandler(s3Client))
+	mux.Handle("/healthz", healthZHandler(nsLister, s3Client))
 
 	hostStr := fmt.Sprintf(":%d", port)
 	return http.ListenAndServe(hostStr, mux)