[stable/kong] use custom server block for health-checking (#17805)

Signed-off-by: Harry Bagdi <harrybagdi@gmail.com>

stable/kong/Chart.yaml

@@ -12,5 +12,5 @@ maintainers:
 name: kong
 sources:
 - https://github.com/Kong/kong
-version: 0.19.1
+version: 0.19.2
 appVersion: 1.3

stable/kong/templates/config-custom-server-blocks.yaml

@@ -9,11 +9,15 @@ metadata:
     heritage: "{{ .Release.Service }}"
 data:
   servers.conf: |
-    # Prometheus metrics server
+    # Prometheus metrics and health-checking server
     server {
         server_name kong_prometheus_exporter;
         listen 0.0.0.0:9542; # can be any other port as well
         access_log off;
+        location /status {
+            default_type text/plain;
+            return 200;
+        }
         location /metrics {
             default_type text/plain;
             content_by_lua_block {

stable/kong/templates/controller-deployment.yaml

@@ -41,6 +41,8 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
+        - name: KONG_NGINX_HTTP_INCLUDE
+          value: /kong/servers.conf
         - name: KONG_PROXY_LISTEN
           value: 'off'
         {{- if .Values.enterprise.enabled }}
@@ -83,9 +85,15 @@ spec:
         {{- end }}
         {{- include "kong.env" .  | indent 8 }}
         ports:
+        - name: metrics
+          containerPort: 9542
+          protocol: TCP
         - name: admin
           containerPort: {{ .Values.admin.containerPort }}
           protocol: TCP
+        volumeMounts:
+          - name: custom-nginx-template-volume
+            mountPath: /kong
         readinessProbe:
 {{ toYaml .Values.readinessProbe | indent 10 }}
         livenessProbe:
@@ -93,4 +101,8 @@ spec:
         resources:
 {{ toYaml .Values.resources | indent 10 }}
       {{- include "kong.controller-container" . | nindent 6 }}
+      volumes:
+        - name: custom-nginx-template-volume
+          configMap:
+            name: {{ template "kong.fullname" . }}-default-custom-server-blocks
 {{- end -}}

stable/kong/values.yaml

@@ -292,8 +292,8 @@ resources: {}
 readinessProbe:
   httpGet:
     path: "/status"
-    port: admin
-    scheme: HTTPS
+    port: metrics
+    scheme: HTTP
   initialDelaySeconds: 30
   timeoutSeconds: 1
   periodSeconds: 10
@@ -305,8 +305,8 @@ readinessProbe:
 livenessProbe:
   httpGet:
     path: "/status"
-    port: admin
-    scheme: HTTPS
+    port: metrics
+    scheme: HTTP
   initialDelaySeconds: 30
   timeoutSeconds: 5
   periodSeconds: 30