From 3b780510bee6e4af0e2ab98ca37202ec788b736a Mon Sep 17 00:00:00 2001
From: Arthur Luz de Avila <arthur.luzdeavila@windriver.com>
Date: Mon, 4 Apr 2022 09:44:44 -0300
Subject: [PATCH] Decrease terminationGracePeriodSeconds on glance-api

The glance-api pod has a terminationGracePeriodSeconds
of 600s(10min) and the others services has 30s. This high
terminationGracePeriodSeconds may cause timeout in some
cases and there is no reason for this high
terminationGracePeriodSeconds.
The terminationGracePeriodSeconds has been introduced on
https://review.opendev.org/c/openstack/openstack-helm/+/469974
but there is no explanation why it is too high.

Story: 2009959
Task: 44926

Signed-off-by: Arthur Luz de Avila <arthur.luzdeavila@windriver.com>
Change-Id: I9f9092e48c4f4ecf5a145dc42dbafe4f96cfa91c
---
 glance/Chart.yaml                    | 2 +-
 glance/templates/deployment-api.yaml | 2 +-
 glance/values.yaml                   | 2 +-
 releasenotes/notes/glance.yaml       | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/glance/Chart.yaml b/glance/Chart.yaml
index ed08d4677f..f5a701bd9f 100644
--- a/glance/Chart.yaml
+++ b/glance/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Glance
 name: glance
-version: 0.3.1
+version: 0.3.2
 home: https://docs.openstack.org/glance/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Glance/OpenStack_Project_Glance_vertical.png
 sources:
diff --git a/glance/templates/deployment-api.yaml b/glance/templates/deployment-api.yaml
index aee6edaa49..72fe3613e7 100644
--- a/glance/templates/deployment-api.yaml
+++ b/glance/templates/deployment-api.yaml
@@ -54,7 +54,7 @@ spec:
 {{ end }}
       nodeSelector:
         {{ .Values.labels.api.node_selector_key }}: {{ .Values.labels.api.node_selector_value }}
-      terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.api.timeout | default "600" }}
+      terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.api.timeout | default "30" }}
       initContainers:
 {{ tuple $envAll "api" $mounts_glance_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: glance-perms
diff --git a/glance/values.yaml b/glance/values.yaml
index 533e998a86..f90f242ccc 100644
--- a/glance/values.yaml
+++ b/glance/values.yaml
@@ -849,7 +849,7 @@ pod:
         min_available: 0
     termination_grace_period:
       api:
-        timeout: 600
+        timeout: 30
   resources:
     enabled: false
     api:
diff --git a/releasenotes/notes/glance.yaml b/releasenotes/notes/glance.yaml
index f3dd03427f..f506af2752 100644
--- a/releasenotes/notes/glance.yaml
+++ b/releasenotes/notes/glance.yaml
@@ -22,4 +22,5 @@ glance:
   - 0.2.10 Update htk requirements repo
   - 0.3.0 Remove glance registry
   - 0.3.1 Enable taint toleration for Openstack services
+  - 0.3.2 Decrease terminationGracePeriodSeconds on glance-api
 ...