update & bump

Clivern · Mar 21, 2020 · e8313f4 · e8313f4
1 parent 0d7a74e
commit e8313f4
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 FROM golang:1.14.1
 
-ARG TOAD_VERSION=0.1.5
+ARG TOAD_VERSION=0.1.6
 
 ENV GO111MODULE=on
 
@@ -20,4 +20,7 @@ RUN ./toad --get=release
 
 EXPOSE 8080
 
+HEALTHCHECK --interval=5s --timeout=2s --retries=5 --start-period=2s \
+  CMD ./toad --get health
+
 CMD ["./toad", "--port", "8080"]
diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 <p align="center">
-    <img alt="Toad Logo" src="https://raw.githubusercontent.com/clivern/Toad/master/assets/img/gopher.png?v=0.1.5" width="150" />
+    <img alt="Toad Logo" src="https://raw.githubusercontent.com/clivern/Toad/master/assets/img/gopher.png?v=0.1.6" width="150" />
     <h3 align="center">Toad</h3>
     <p align="center">Containerized Application for Testing Purposes</p>
     <p align="center">
         <a href="https://travis-ci.com/Clivern/Toad"><img src="https://travis-ci.com/Clivern/Toad.svg?branch=master"></a>
-        <a href="https://github.com/Clivern/Toad/releases"><img src="https://img.shields.io/badge/Version-0.1.5-red.svg"></a>
-        <a href="https://goreportcard.com/report/github.com/Clivern/Toad"><img src="https://goreportcard.com/badge/github.com/clivern/Toad?v=0.1.5"></a>
+        <a href="https://github.com/Clivern/Toad/releases"><img src="https://img.shields.io/badge/Version-0.1.6-red.svg"></a>
+        <a href="https://goreportcard.com/report/github.com/Clivern/Toad"><img src="https://goreportcard.com/badge/github.com/clivern/Toad?v=0.1.6"></a>
         <a href="https://hub.docker.com/r/clivern/toad"><img src="https://img.shields.io/badge/Docker-Latest-green"></a>
         <a href="https://github.com/Clivern/Toad/blob/master/LICENSE"><img src="https://img.shields.io/badge/LICENSE-MIT-orange.svg"></a>
     </p>

diff --git a/deployment/k8s/deployment.yaml b/deployment/k8s/deployment.yaml
@@ -17,6 +17,6 @@ spec:
     spec:
       containers:
       - name: toad
-        image: clivern/toad:release-0.1.5
+        image: clivern/toad:release-0.1.6
         ports:
         - containerPort: 8080
diff --git a/toad.go b/toad.go
@@ -37,6 +37,11 @@ func main() {
 	flag.StringVar(&get, "get", "", "get")
 	flag.Parse()
 
+	if get == "health" {
+		fmt.Println("i am ok")
+		return
+	}
+
 	if get == "release" {
 		fmt.Println(
 			fmt.Sprintf(
@@ -59,6 +64,23 @@ func main() {
 		c.String(http.StatusNoContent, "")
 	})
 
+	r.GET("/_health", func(c *gin.Context) {
+		u := uuid.Must(uuid.NewV4(), nil)
+		host, _ := os.Hostname()
+
+		log.WithFields(log.Fields{
+			"time":          time.Now().Format("Mon Jan 2 15:04:05 2006"),
+			"host":          host,
+			"uri":           c.Request.URL.Path,
+			"method":        c.Request.Method,
+			"correlationId": u.String(),
+		}).Info("Incoming Request")
+
+		c.JSON(http.StatusOK, gin.H{
+			"status": "ok",
+		})
+	})
+
 	r.GET("/", func(c *gin.Context) {
 		u := uuid.Must(uuid.NewV4(), nil)
 		host, _ := os.Hostname()