From 06dc7a140f0f8d16a24765a7496d3aaa31ad97ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Sobczyk?=
 <30727091+sopeal@users.noreply.github.com>
Date: Fri, 14 Feb 2020 20:27:06 +0100
Subject: [PATCH] [incubator/schema-registry] Template health check (#19699)

* [incubator/schema-registry] template whole readiness and liveness

Signed-off-by: Michal Sobczyk <micsobczyk@gmail.com>

* Bump chart version

Signed-off-by: Michal Sobczyk <micsobczyk@gmail.com>

* bum chart version to 1.1.9

Signed-off-by: sopeal <micsobczyk@gmail.com>
---
 incubator/schema-registry/Chart.yaml          |  2 +-
 .../schema-registry/templates/deployment.yaml | 29 ++-----------------
 incubator/schema-registry/values.yaml         | 11 ++++++-
 3 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/incubator/schema-registry/Chart.yaml b/incubator/schema-registry/Chart.yaml
index 80e505ccba..3d0da06789 100644
--- a/incubator/schema-registry/Chart.yaml
+++ b/incubator/schema-registry/Chart.yaml
@@ -1,6 +1,6 @@
 name: schema-registry
 home: https://docs.confluent.io/current/schema-registry/docs/index.html
-version: 1.1.8
+version: 1.1.9
 appVersion: 5.0.1
 keywords:
   - confluent
diff --git a/incubator/schema-registry/templates/deployment.yaml b/incubator/schema-registry/templates/deployment.yaml
index 30397a8796..4d23c18ac1 100644
--- a/incubator/schema-registry/templates/deployment.yaml
+++ b/incubator/schema-registry/templates/deployment.yaml
@@ -107,34 +107,9 @@ spec:
               name: jmx
             {{- end }}
           livenessProbe:
-            httpGet:
-              path: /
-              port: {{ .Values.servicePort }}
-            {{- if not .Values.livenessProbe }}
-            initialDelaySeconds: 10
-            timeoutSeconds: 5
-            {{- else }}
-            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds | default 10}}
-            {{- if .Values.livenessProbe.periodSeconds }}
-            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
-            {{- end }}
-            timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds | default 5}}
-            {{- if .Values.livenessProbe.successThreshold }}
-            successThreshold: {{ .Values.livenessProbe.successThreshold }}
-            {{- end }}
-            {{- if .Values.livenessProbe.failureThreshold }}
-            failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
-            {{- end }}
-            {{- end }}
+{{ toYaml .Values.livenessProbe | indent 12 }}
           readinessProbe:
-            httpGet:
-              path: /
-              port: {{ .Values.servicePort }}
-            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds | default 10}}
-            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-            timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds | default 5}}
-            successThreshold: {{ .Values.readinessProbe.successThreshold }}
-            failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+{{ toYaml .Values.readinessProbe | indent 12 }}
           env:
           - name: SCHEMA_REGISTRY_HOST_NAME
             valueFrom:
diff --git a/incubator/schema-registry/values.yaml b/incubator/schema-registry/values.yaml
index 3c80f9a68a..8651c1c8ae 100644
--- a/incubator/schema-registry/values.yaml
+++ b/incubator/schema-registry/values.yaml
@@ -59,10 +59,19 @@ kafkaStore:
   ## Additional Java arguments to pass to Kafka.
   # schemaRegistryOpts: -Dfoo=bar
 
-## Readiness probe config.
+## Liveness and readiness probe config.
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/
 ##
+livenessProbe:
+  httpGet:
+    path: /
+    port: 8081
+  initialDelaySeconds: 10
+  timeoutSeconds: 5
 readinessProbe:
+  httpGet:
+    path: /
+    port: 8081
   initialDelaySeconds: 10
   periodSeconds: 10
   timeoutSeconds: 5