ca2a1d0fae
This change updates our openstack-helm-infra patches to rabbitmq chart so that no duplicate keys are placed in a yaml file. Initial stx-openstack tests on Debian showed that the most updated platform version fails to upload an app that has duplicated keys, during the sysinv map construction step. So this fix is required to update stx-openstack with the best yaml syntax practices. Test Plan: PASS - Build openstack-helm-infra package PASS - Build stx-openstack helm charts app PASS - Upload stx-openstack on Debian Closes-Bug: 1997564 Signed-off-by: Thales Elero Cervi <thaleselero.cervi@windriver.com> Change-Id: Ib7f63fee2868b2ccea3ab95a8c83edba96af1c7e
65 lines
2.3 KiB
Diff
65 lines
2.3 KiB
Diff
From 132df9829fa4c697e0b9701871888708973f9123 Mon Sep 17 00:00:00 2001
|
|
From: Gerry Kopec <Gerry.Kopec@windriver.com>
|
|
Date: Fri, 16 Aug 2019 14:29:46 -0400
|
|
Subject: [PATCH] Enable override of rabbitmq probe parameters
|
|
|
|
Add variables for initial delay, period and timeout for rabbitmq
|
|
liveness and readiness probes.
|
|
|
|
Change-Id: I8d2685118eb4ce3b8c27952892f7ad553fc5de77
|
|
Signed-off-by: Gerry Kopec <Gerry.Kopec@windriver.com>
|
|
[ fix duplicate yaml keys ]
|
|
Signed-off-by: Thales Elero Cervi <thaleselero.cervi@windriver.com>
|
|
---
|
|
rabbitmq/templates/statefulset.yaml | 10 ++++++----
|
|
rabbitmq/values.yaml | 8 ++++++++
|
|
2 files changed, 14 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/rabbitmq/templates/statefulset.yaml b/rabbitmq/templates/statefulset.yaml
|
|
index 45f8271a..cd9f39d6 100644
|
|
--- a/rabbitmq/templates/statefulset.yaml
|
|
+++ b/rabbitmq/templates/statefulset.yaml
|
|
@@ -225,14 +225,16 @@ spec:
|
|
value: {{ $envAll.Values.io_thread_pool.size | quote }}
|
|
{{- end }}
|
|
readinessProbe:
|
|
- initialDelaySeconds: 10
|
|
- timeoutSeconds: 10
|
|
+ initialDelaySeconds: {{ $envAll.Values.pod.probes.readiness.initialDelaySeconds }}
|
|
+ periodSeconds: {{ $envAll.Values.pod.probes.readiness.periodSeconds }}
|
|
+ timeoutSeconds: {{ $envAll.Values.pod.probes.readiness.timeoutSeconds }}
|
|
exec:
|
|
command:
|
|
- /tmp/rabbitmq-readiness.sh
|
|
livenessProbe:
|
|
- initialDelaySeconds: 60
|
|
- timeoutSeconds: 10
|
|
+ initialDelaySeconds: {{ $envAll.Values.pod.probes.liveness.initialDelaySeconds }}
|
|
+ periodSeconds: {{ $envAll.Values.pod.probes.liveness.periodSeconds }}
|
|
+ timeoutSeconds: {{ $envAll.Values.pod.probes.liveness.timeoutSeconds }}
|
|
exec:
|
|
command:
|
|
- /tmp/rabbitmq-liveness.sh
|
|
diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml
|
|
index 6a1bd85f..0d37e673 100644
|
|
--- a/rabbitmq/values.yaml
|
|
+++ b/rabbitmq/values.yaml
|
|
@@ -48,6 +48,14 @@ images:
|
|
|
|
pod:
|
|
probes:
|
|
+ readiness:
|
|
+ initialDelaySeconds: 10
|
|
+ periodSeconds: 10
|
|
+ timeoutSeconds: 10
|
|
+ liveness:
|
|
+ initialDelaySeconds: 30
|
|
+ periodSeconds: 10
|
|
+ timeoutSeconds: 10
|
|
prometheus_rabbitmq_exporter:
|
|
rabbitmq_exporter:
|
|
readiness:
|
|
--
|
|
2.25.1
|
|
|