From 1454a90442a90e70b156fc3965f38f20a16cea91 Mon Sep 17 00:00:00 2001
From: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com>
Date: Thu, 17 Oct 2024 14:54:14 +0200
Subject: [PATCH] fix CHECK_URL in kuberhealthy checks to respect namespaces

---
 .../base/conda-store-healthcheck.yaml         |  2 --
 .../template/base/jupyterhub-healthcheck.yaml |  2 --
 .../template/base/keycloak-healthcheck.yaml   |  2 --
 .../template/kustomization.yaml.tmpl          | 28 +++++++++++++++++++
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/_nebari/stages/kubernetes_kuberhealthy_healthchecks/template/base/conda-store-healthcheck.yaml b/src/_nebari/stages/kubernetes_kuberhealthy_healthchecks/template/base/conda-store-healthcheck.yaml
index 37bcc854c..b3487e1a1 100644
--- a/src/_nebari/stages/kubernetes_kuberhealthy_healthchecks/template/base/conda-store-healthcheck.yaml
+++ b/src/_nebari/stages/kubernetes_kuberhealthy_healthchecks/template/base/conda-store-healthcheck.yaml
@@ -12,8 +12,6 @@ spec:
         image: kuberhealthy/http-check:v1.5.0
         imagePullPolicy: IfNotPresent
         env:
-          - name: CHECK_URL
-            value: "http://nebari-conda-store-server.dev:5000"
           - name: COUNT #### default: "0"
             value: "5"
           - name: SECONDS #### default: "0"
diff --git a/src/_nebari/stages/kubernetes_kuberhealthy_healthchecks/template/base/jupyterhub-healthcheck.yaml b/src/_nebari/stages/kubernetes_kuberhealthy_healthchecks/template/base/jupyterhub-healthcheck.yaml
index bb7ad2e05..019a95c82 100644
--- a/src/_nebari/stages/kubernetes_kuberhealthy_healthchecks/template/base/jupyterhub-healthcheck.yaml
+++ b/src/_nebari/stages/kubernetes_kuberhealthy_healthchecks/template/base/jupyterhub-healthcheck.yaml
@@ -12,8 +12,6 @@ spec:
         image: kuberhealthy/http-check:v1.5.0
         imagePullPolicy: IfNotPresent
         env:
-          - name: CHECK_URL
-            value: "http://hub.dev:8081"
           - name: COUNT #### default: "0"
             value: "5"
           - name: SECONDS #### default: "0"
diff --git a/src/_nebari/stages/kubernetes_kuberhealthy_healthchecks/template/base/keycloak-healthcheck.yaml b/src/_nebari/stages/kubernetes_kuberhealthy_healthchecks/template/base/keycloak-healthcheck.yaml
index 8b1f847ae..9754617f7 100644
--- a/src/_nebari/stages/kubernetes_kuberhealthy_healthchecks/template/base/keycloak-healthcheck.yaml
+++ b/src/_nebari/stages/kubernetes_kuberhealthy_healthchecks/template/base/keycloak-healthcheck.yaml
@@ -12,8 +12,6 @@ spec:
         image: kuberhealthy/http-check:v1.5.0
         imagePullPolicy: IfNotPresent
         env:
-          - name: CHECK_URL
-            value: "http://keycloak-http.dev"
           - name: COUNT #### default: "0"
             value: "5"
           - name: SECONDS #### default: "0"
diff --git a/src/_nebari/stages/kubernetes_kuberhealthy_healthchecks/template/kustomization.yaml.tmpl b/src/_nebari/stages/kubernetes_kuberhealthy_healthchecks/template/kustomization.yaml.tmpl
index 06e8f4aaa..5ac2250fe 100644
--- a/src/_nebari/stages/kubernetes_kuberhealthy_healthchecks/template/kustomization.yaml.tmpl
+++ b/src/_nebari/stages/kubernetes_kuberhealthy_healthchecks/template/kustomization.yaml.tmpl
@@ -15,3 +15,31 @@ patches:
       - op: replace
         path: /metadata/namespace
         value: "{{ namespace }}"
+  - target:
+      kind: KuberhealthyCheck
+      name: conda-store-http-check
+    patch: |-
+      - op: add
+        path: /spec/podSpec/containers/0/env/-
+        value:
+          name: CHECK_URL
+          value: "http://nebari-conda-store-server.{{ namespace }}:5000"
+  - target:
+      kind: KuberhealthyCheck
+      name: jupyterhub-http-check
+    patch: |-
+      - op: add
+        path: /spec/podSpec/containers/0/env/-
+        value:
+          name: CHECK_URL
+          value: "http://
+          hub.{{ namespace }}:8081"
+  - target:
+      kind: KuberhealthyCheck
+      name: keycloak-http-check
+    patch: |-
+      - op: add
+        path: /spec/podSpec/containers/0/env/-
+        value:
+          name: CHECK_URL
+          value: "http://keycloak-http.{{ namespace }}"