From 1ecc9eac1675252c0af888106a3759e0a4f42cc1 Mon Sep 17 00:00:00 2001
From: Doug Goldstein <cardoe@cardoe.com>
Date: Tue, 10 Dec 2024 12:22:33 -0600
Subject: [PATCH] keystone: use oslo.middleware healtcheck instead of v3
 endpoint

Instead of hardcoding the liveness and readiness checks against the v3
endpoint, use the oslo.middlware healthcheck endpoint instead.

Change-Id: I0a8b6e0fb195dff8c7cfe8ccd2484cfcc980c791
Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
---
 keystone/templates/deployment-api.yaml                        | 2 +-
 keystone/values.yaml                                          | 1 +
 releasenotes/notes/keystone-healthcheck-1f72d266f886e735.yaml | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/keystone-healthcheck-1f72d266f886e735.yaml

diff --git a/keystone/templates/deployment-api.yaml b/keystone/templates/deployment-api.yaml
index cff233b85b..1ddac4c6ae 100644
--- a/keystone/templates/deployment-api.yaml
+++ b/keystone/templates/deployment-api.yaml
@@ -15,7 +15,7 @@ limitations under the License.
 {{- define "apiProbeTemplate" }}
 httpGet:
   scheme: {{ tuple "identity" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
-  path: /v3/
+  path: {{ tuple "identity" "healthcheck" "internal" . | include "helm-toolkit.endpoints.keystone_endpoint_path_lookup" }}
   port: {{ tuple "identity" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
 {{- end }}
 
diff --git a/keystone/values.yaml b/keystone/values.yaml
index abe207572d..b7937a7ab0 100644
--- a/keystone/values.yaml
+++ b/keystone/values.yaml
@@ -975,6 +975,7 @@ endpoints:
       #     key: null
     path:
       default: /v3
+      healthcheck: /healthcheck
     scheme:
       default: http
       service: http
diff --git a/releasenotes/notes/keystone-healthcheck-1f72d266f886e735.yaml b/releasenotes/notes/keystone-healthcheck-1f72d266f886e735.yaml
new file mode 100644
index 0000000000..88bfe2fc3d
--- /dev/null
+++ b/releasenotes/notes/keystone-healthcheck-1f72d266f886e735.yaml
@@ -0,0 +1,4 @@
+---
+keystone:
+  - Use oslo.middleware healthcheck endpoint for liveness and readiness
+...