From 710396f66e6b9b1edaf1deb67e0d9a01c1831606 Mon Sep 17 00:00:00 2001
From: Mikhail Vladimirovich Nacharov <author@webnach.ru>
Date: Wed, 28 Oct 2020 01:04:47 +0500
Subject: [PATCH] add metrics endpoints to kubernetes specs

---
 build/package/Dockerfile.run                        |  3 +++
 .../chart/reloader/templates/deployment.yaml        | 13 +++++++++++++
 .../chart/reloader/templates/service.yaml           |  7 +++++--
 deployments/kubernetes/chart/reloader/values.yaml   |  6 +-----
 deployments/kubernetes/manifests/deployment.yaml    | 11 +++++++++++
 deployments/kubernetes/reloader.yaml                | 12 ++++++++++++
 6 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/build/package/Dockerfile.run b/build/package/Dockerfile.run
index a1e9489f..079e88f3 100644
--- a/build/package/Dockerfile.run
+++ b/build/package/Dockerfile.run
@@ -8,4 +8,7 @@ COPY Reloader /bin/Reloader
 # On alpine 'nobody' has uid 65534
 USER 65534
 
+# Port for metrics and probes
+EXPOSE 9090
+
 ENTRYPOINT ["/bin/Reloader"]
diff --git a/deployments/kubernetes/chart/reloader/templates/deployment.yaml b/deployments/kubernetes/chart/reloader/templates/deployment.yaml
index 96e3d612..c2ce956a 100644
--- a/deployments/kubernetes/chart/reloader/templates/deployment.yaml
+++ b/deployments/kubernetes/chart/reloader/templates/deployment.yaml
@@ -89,6 +89,19 @@ spec:
               fieldPath: metadata.namespace
       {{- end }}
       {{- end }}
+
+        ports:
+        - name: http
+          containerPort: 9090
+        livenessProbe:
+          httpGet:
+            path: /metrics
+            port: http
+        readinessProbe:
+          httpGet:
+            path: /metrics
+            port: http
+
       {{- if eq .Values.reloader.readOnlyRootFileSystem true }}
         volumeMounts:
           - mountPath: /tmp/
diff --git a/deployments/kubernetes/chart/reloader/templates/service.yaml b/deployments/kubernetes/chart/reloader/templates/service.yaml
index 9bb9ae9c..92a18493 100644
--- a/deployments/kubernetes/chart/reloader/templates/service.yaml
+++ b/deployments/kubernetes/chart/reloader/templates/service.yaml
@@ -22,5 +22,8 @@ spec:
 {{ toYaml .Values.reloader.matchLabels | indent 4 }}
 {{- end }}
   ports:
-{{ toYaml .Values.reloader.service.ports | indent 4 }}
-{{- end }}
\ No newline at end of file
+  - port: {{ .Values.reloader.service.port }}
+    name: http
+    protocol: TCP
+    targetPort: http
+{{- end }}
diff --git a/deployments/kubernetes/chart/reloader/values.yaml b/deployments/kubernetes/chart/reloader/values.yaml
index b1facb31..a6cd2565 100644
--- a/deployments/kubernetes/chart/reloader/values.yaml
+++ b/deployments/kubernetes/chart/reloader/values.yaml
@@ -81,11 +81,7 @@ reloader:
   service: {}
     # labels: {}
     # annotations: {}
-    # ports:
-    # - port: 9090
-    #   name: http
-    #   protocol: TCP
-    #   targetPort: 9090
+    # port: 9090
 
   rbac:
     enabled: true
diff --git a/deployments/kubernetes/manifests/deployment.yaml b/deployments/kubernetes/manifests/deployment.yaml
index 18654bdb..94b01795 100644
--- a/deployments/kubernetes/manifests/deployment.yaml
+++ b/deployments/kubernetes/manifests/deployment.yaml
@@ -41,6 +41,17 @@ spec:
       - image: "stakater/reloader:v0.0.73"
         imagePullPolicy: IfNotPresent
         name: reloader-reloader
+        ports:
+        - name: http
+          containerPort: 9090
+        livenessProbe:
+          httpGet:
+            path: /metrics
+            port: http
+        readinessProbe:
+          httpGet:
+            path: /metrics
+            port: http
       securityContext: 
         runAsNonRoot: true
         runAsUser: 65534
diff --git a/deployments/kubernetes/reloader.yaml b/deployments/kubernetes/reloader.yaml
index 0f05cbfd..93dbe3ed 100644
--- a/deployments/kubernetes/reloader.yaml
+++ b/deployments/kubernetes/reloader.yaml
@@ -116,6 +116,18 @@ spec:
       - image: "stakater/reloader:v0.0.73"
         imagePullPolicy: IfNotPresent
         name: reloader-reloader
+
+        ports:
+        - name: http
+          containerPort: 9090
+        livenessProbe:
+          httpGet:
+            path: /metrics
+            port: http
+        readinessProbe:
+          httpGet:
+            path: /metrics
+            port: http
       securityContext: 
         runAsNonRoot: true
         runAsUser: 65534