From c394080738a309abc5f30584019b63692ec6a1be Mon Sep 17 00:00:00 2001
From: "Ritchie, Frank (fr801x)" <fr801x@att.com>
Date: Thu, 10 Aug 2023 15:50:55 -0400
Subject: [PATCH] Add exec probe timeouts

As of kubernetes 1.20 exec liveness and readiness probes default to 1
second. See the note here:

https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/

This PS adds exec probe timeouts where necessary.

Change-Id: If1de652f0b2bef8dac2e9b306e645930320c67eb
---
 glance/Chart.yaml                    | 2 +-
 glance/templates/deployment-api.yaml | 4 ++++
 neutron/Chart.yaml                   | 2 +-
 neutron/values.yaml                  | 5 +++++
 releasenotes/notes/glance.yaml       | 1 +
 releasenotes/notes/neutron.yaml      | 1 +
 6 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/glance/Chart.yaml b/glance/Chart.yaml
index 95f222ec92..ac3bb1269f 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.4.9
+version: 0.4.10
 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 9c26c747f4..86b65712a5 100644
--- a/glance/templates/deployment-api.yaml
+++ b/glance/templates/deployment-api.yaml
@@ -167,6 +167,8 @@ spec:
                 - python
                 - -c
                 - "import requests; requests.get('http://127.0.0.1:{{ tuple "image" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}')"
+            periodSeconds: 15
+            timeoutSeconds: 10
           livenessProbe:
             exec:
               command:
@@ -174,6 +176,8 @@ spec:
                 - -c
                 - "import requests; requests.get('http://127.0.0.1:{{ tuple "image" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}')"
             initialDelaySeconds: 30
+            periodSeconds: 15
+            timeoutSeconds: 10
           {{- else }}
           ports:
             - name: g-api
diff --git a/neutron/Chart.yaml b/neutron/Chart.yaml
index 697a521dae..9b5d94f077 100644
--- a/neutron/Chart.yaml
+++ b/neutron/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Neutron
 name: neutron
-version: 0.3.16
+version: 0.3.17
 home: https://docs.openstack.org/neutron/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png
 sources:
diff --git a/neutron/values.yaml b/neutron/values.yaml
index 036805ed7d..753afb10b4 100644
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -423,6 +423,7 @@ pod:
         readiness:
           enabled: true
           params:
+            timeoutSeconds: 10
         liveness:
           enabled: true
           params:
@@ -465,10 +466,14 @@ pod:
         readiness:
           enabled: true
           params:
+            periodSeconds: 15
+            timeoutSeconds: 10
         liveness:
           enabled: true
           params:
             initialDelaySeconds: 60
+            periodSeconds: 15
+            timeoutSeconds: 10
   security_context:
     neutron_dhcp_agent:
       pod:
diff --git a/releasenotes/notes/glance.yaml b/releasenotes/notes/glance.yaml
index 8df96bbfa1..d589a2bce6 100644
--- a/releasenotes/notes/glance.yaml
+++ b/releasenotes/notes/glance.yaml
@@ -43,4 +43,5 @@ glance:
   - 0.4.7 Add Zed overrides
   - 0.4.8 Add 2023.1 overrides
   - 0.4.9 Use service tokens
+  - 0.4.10 Add exec probe timeouts
 ...
diff --git a/releasenotes/notes/neutron.yaml b/releasenotes/notes/neutron.yaml
index b5edf8c739..eae923576f 100644
--- a/releasenotes/notes/neutron.yaml
+++ b/releasenotes/notes/neutron.yaml
@@ -58,4 +58,5 @@ neutron:
   - 0.3.14 Add 2023.1 overrides
   - 0.3.15 Add asap2 support
   - 0.3.16 Use service tokens
+  - 0.3.17 Add exec probe timeouts
 ...