From 2c2bf048a44891e5b82089c96f9c1b05da346655 Mon Sep 17 00:00:00 2001
From: Briggs Elsperger <briggse@protonmail.com>
Date: Fri, 20 Oct 2023 03:54:41 -0600
Subject: [PATCH] feat: Add support for modifying edge probe values (#97)

* feat: Add support for modifying edge probe values

This allows BASE_PATH enviornment variable changes to be reflected
in the values.yaml file. Without this, k8s will attempt to hit
/internal-backstage/health, while the helm-edge application is
reporting health values at /BASE_PATH/internal-backstage/health.

* Bump chart minor version

* Set up defaults for unleash-edge nodes
---
 charts/unleash-edge/Chart.yaml                |  2 +-
 charts/unleash-edge/templates/deployment.yaml | 14 ++++++++++++--
 charts/unleash-edge/values.yaml               | 13 +++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/charts/unleash-edge/Chart.yaml b/charts/unleash-edge/Chart.yaml
index 6412f94..7c9d715 100644
--- a/charts/unleash-edge/Chart.yaml
+++ b/charts/unleash-edge/Chart.yaml
@@ -4,7 +4,7 @@ name: unleash-edge
 description: A Helm chart for deploying Unleash Edge to kubernetes
 icon: https://docs.getunleash.io/img/logo.svg
 type: application
-version: 2.0.2
+version: 2.0.3
 
 appVersion: "v11.0.2"
 maintainers:
diff --git a/charts/unleash-edge/templates/deployment.yaml b/charts/unleash-edge/templates/deployment.yaml
index ff1abed..b4e93f4 100644
--- a/charts/unleash-edge/templates/deployment.yaml
+++ b/charts/unleash-edge/templates/deployment.yaml
@@ -52,14 +52,24 @@ spec:
             - name: http
               containerPort: 3063
               protocol: TCP
+          {{- if .Values.livenessProbe.enabled | default true }}
           livenessProbe:
             httpGet:
-              path: /internal-backstage/health
+              path: {{ .Values.livenessProbe.path | default "/internal-backstage/health" }}
               port: http
+            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds | default 30 }}
+            timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds | default 10 }}
+          {{- end }}
+          {{- if .Values.readinessProbe.enabled | default true}}
           readinessProbe:
             httpGet:
-              path: /internal-backstage/health
+              path: {{ .Values.readinessProbe.path | default "/internal-backstage/health" }}
               port: http
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds | default 30 }}
+            timeoutSeconds: {{.Values.readinessProbe.timeoutSeconds | default 10 }}
+            successThreshold: {{.Values.readinessProbe.successThreshold | default 5 }}
+            periodSeconds: {{.Values.readinessProbe.periodSeconds | default 10 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
diff --git a/charts/unleash-edge/values.yaml b/charts/unleash-edge/values.yaml
index eb24df1..e53f457 100644
--- a/charts/unleash-edge/values.yaml
+++ b/charts/unleash-edge/values.yaml
@@ -64,6 +64,19 @@ ingress:
   #    hosts:
   #
 
+livenessProbe: {}
+#   enabled: true
+#   path: /internal-backstage/health
+#   initialDelaySeconds: 30
+#   timeoutSeconds: 10
+
+readinessProbe: {}
+# enabled: true
+#   path: /internal-backstage/health
+#   initialDelaySeconds: 30
+#   timeoutSeconds: 10
+#   periodSeconds: 10
+#   successThreshold: 5
 
 autoscaling:
   enabled: false