From c3ad002e717b9ee45ac3a49423c168296cffaea0 Mon Sep 17 00:00:00 2001
From: chung00-lee <chung00.lee@samsung.com>
Date: Wed, 30 Oct 2024 23:55:41 +0900
Subject: [PATCH] Add livenessProbe and change path in probe

* Add livenessProbe to deployment-api
* Change path to /healthcheck in livenessProbe, readinessProbe
* Add healthcheck in api-paste.ini

story: 2011250
task: 51236
Change-Id: I8212af42eedb65a74edc910a2cfa1f7b4eb81bbb
---
 barbican/Chart.yaml                    | 2 +-
 barbican/templates/deployment-api.yaml | 7 ++++++-
 barbican/values.yaml                   | 5 +++++
 releasenotes/notes/barbican.yaml       | 1 +
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/barbican/Chart.yaml b/barbican/Chart.yaml
index db32143ae3..0472c7da0a 100644
--- a/barbican/Chart.yaml
+++ b/barbican/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Barbican
 name: barbican
-version: 0.3.15
+version: 0.3.16
 home: https://docs.openstack.org/barbican/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Barbican/OpenStack_Project_Barbican_vertical.png
 sources:
diff --git a/barbican/templates/deployment-api.yaml b/barbican/templates/deployment-api.yaml
index 8ae9ea426a..651abdcd2d 100644
--- a/barbican/templates/deployment-api.yaml
+++ b/barbican/templates/deployment-api.yaml
@@ -79,10 +79,15 @@ spec:
           ports:
             - name: b-api
               containerPort: {{ tuple "key_manager" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+          livenessProbe:
+            httpGet:
+              scheme: HTTP
+              path: /healthcheck
+              port: {{ tuple "key_manager" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           readinessProbe:
             httpGet:
               scheme: HTTP
-              path: /
+              path: /healthcheck
               port: {{ tuple "key_manager" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           volumeMounts:
             - name: pod-tmp
diff --git a/barbican/values.yaml b/barbican/values.yaml
index c863d42601..91f11a0cc7 100644
--- a/barbican/values.yaml
+++ b/barbican/values.yaml
@@ -295,6 +295,7 @@ conf:
       use: egg:Paste#urlmap
       /: barbican_version
       /v1: barbican-api-keystone
+      /healthcheck: healthcheck
     pipeline:barbican_version:
       pipeline: cors http_proxy_to_wsgi versionapp
     pipeline:barbican_api:
@@ -309,6 +310,10 @@ conf:
       paste.app_factory: barbican.api.app:create_main_app
     app:versionapp:
       paste.app_factory: barbican.api.app:create_version_app
+    app:healthcheck:
+      paste.app_factory: oslo_middleware:Healthcheck.app_factory
+      backends: disable_by_file
+      disable_by_file_path: /etc/barbican/healthcheck_disable
     filter:simple:
       paste.filter_factory: barbican.api.middleware.simple:SimpleFilter.factory
     filter:unauthenticated-context:
diff --git a/releasenotes/notes/barbican.yaml b/releasenotes/notes/barbican.yaml
index 33ceb7a755..04f44f469c 100644
--- a/releasenotes/notes/barbican.yaml
+++ b/releasenotes/notes/barbican.yaml
@@ -39,4 +39,5 @@ barbican:
   - 0.3.13 Sync uWSGI config to other services
   - 0.3.14 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default
   - 0.3.15 Add 2024.2 Ubuntu Jammy overrides
+  - 0.3.16 Add livenessProbe and change path in probe
 ...