Merge pull request #23 from Financial-Times/feature/helm-improvements

Helm improvements

healthcheck.go

@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"net/http"
+	"time"
 
 	fthealth "github.com/Financial-Times/go-fthealth/v1_1"
 	"github.com/Financial-Times/message-queue-gonsumer/consumer"
@@ -35,13 +36,16 @@ func (h *HealthCheck) Health() func(w http.ResponseWriter, r *http.Request) {
 	if h.elasticsearchConf.includeElasticsearchWriter {
 		checks = append(checks, h.elasticHealthCheck())
 	}
-	hc := fthealth.HealthCheck{
-		SystemCode:  "concept-ingester",
-		Name:        "Concept Ingester",
-		Description: "Consumes Concept instances and forwards them to respective database writers for each concept type.",
-		Checks:      checks,
+	healthCheck := fthealth.TimedHealthCheck{
+		HealthCheck: fthealth.HealthCheck{
+			SystemCode:  "concept-ingester",
+			Name:        "Concept Ingester",
+			Description: "Consumes Concept instances and forwards them to respective database writers for each concept type.",
+			Checks:      checks,
+		},
+		Timeout: 10 * time.Second,
 	}
-	return fthealth.Handler(hc)
+	return fthealth.Handler(healthCheck)
 }
 
 func (h *HealthCheck) queueHealthCheck() fthealth.Check {

helm/concept-ingester/templates/deployment.yaml

@@ -20,6 +20,16 @@ spec:
         app: {{ .Values.service.name }}
         visualize: "true" 
     spec:
+      affinity:
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+              - key: app
+                operator: In
+                values:
+                - {{ .Values.service.name }}
+            topologyKey: "kubernetes.io/hostname"
       containers: 
       - name: {{ .Values.service.name }} 
         image: "{{ .Values.image.repository }}:{{ .Chart.Version }}"

helm/concept-ingester/values.yaml

@@ -9,6 +9,8 @@ image:
   repository: coco/concept-ingester
   pullPolicy: IfNotPresent
 resources:
+  requests:
+    memory: 30Mi
   limits:
     memory: 256Mi
 

vendor/vendor.json

@@ -3,12 +3,12 @@
 	"ignore": "test",
 	"package": [
 		{
-			"checksumSHA1": "fNgRM8ZlaDzdvSpuhSdGxEOrWi4=",
+			"checksumSHA1": "G8lW8pPVLieqh/MTJZkvI/i/WyM=",
 			"path": "github.com/Financial-Times/go-fthealth/v1_1",
-			"revision": "e7ccca038327a0091303a52445ec1f0fb66cb97b",
-			"revisionTime": "2017-05-25T09:50:41Z",
-			"version": "0.3.0",
-			"versionExact": "0.3.0"
+			"revision": "1b007e2b37b7936dfb6671fa17e5a29fd35a08ea",
+			"revisionTime": "2017-12-04T12:48:31Z",
+			"version": "0.4.0",
+			"versionExact": "0.4.0"
 		},
 		{
 			"checksumSHA1": "zUpINnstJChGK0LAtkt7jBc3RY0=",