meta-starlingx/meta-stx-flock/stx-openstack-armada-app/openstack-helm-infra/0008-Enable-override-of-rabbitmq-probe-parameters.patch

   1 From 132df9829fa4c697e0b9701871888708973f9123 Mon Sep 17 00:00:00 2001
   2 From: Gerry Kopec <Gerry.Kopec@windriver.com>
   3 Date: Fri, 16 Aug 2019 14:29:46 -0400
   4 Subject: [PATCH] Enable override of rabbitmq probe parameters
   5
   6 Add variables for initial delay, period and timeout for rabbitmq
   7 liveness and readiness probes.
   8
   9 Change-Id: I8d2685118eb4ce3b8c27952892f7ad553fc5de77
  10 Signed-off-by: Gerry Kopec <Gerry.Kopec@windriver.com>
  11 ---
  12  rabbitmq/templates/statefulset.yaml | 10 ++++++----
  13  rabbitmq/values.yaml                |  9 +++++++++
  14  2 files changed, 15 insertions(+), 4 deletions(-)
  15
  16 diff --git a/rabbitmq/templates/statefulset.yaml b/rabbitmq/templates/statefulset.yaml
  17 index e0e61e6..f71dc3e 100644
  18 --- a/rabbitmq/templates/statefulset.yaml
  19 +++ b/rabbitmq/templates/statefulset.yaml
  20 @@ -200,14 +200,16 @@ spec:
  21                value: {{ $envAll.Values.io_thread_pool.size | quote }}
  22  {{- end }}
  23            readinessProbe:
  24 -            initialDelaySeconds: 10
  25 -            timeoutSeconds: 10
  26 +            initialDelaySeconds: {{ $envAll.Values.pod.probes.readiness.initialDelaySeconds }}
  27 +            periodSeconds: {{ $envAll.Values.pod.probes.readiness.periodSeconds }}
  28 +            timeoutSeconds: {{ $envAll.Values.pod.probes.readiness.timeoutSeconds }}
  29              exec:
  30                command:
  31                - /tmp/rabbitmq-readiness.sh
  32            livenessProbe:
  33 -            initialDelaySeconds: 30
  34 -            timeoutSeconds: 10
  35 +            initialDelaySeconds: {{ $envAll.Values.pod.probes.liveness.initialDelaySeconds }}
  36 +            periodSeconds: {{ $envAll.Values.pod.probes.liveness.periodSeconds }}
  37 +            timeoutSeconds: {{ $envAll.Values.pod.probes.liveness.timeoutSeconds }}
  38              exec:
  39                command:
  40                - /tmp/rabbitmq-liveness.sh
  41 diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml
  42 index 9cd3a91..2bae4cb 100644
  43 --- a/rabbitmq/values.yaml
  44 +++ b/rabbitmq/values.yaml
  45 @@ -145,6 +145,15 @@ pod:
  46          limits:
  47            memory: "1024Mi"
  48            cpu: "2000m"
  49 +  probes:
  50 +    readiness:
  51 +      initialDelaySeconds: 10
  52 +      periodSeconds: 10
  53 +      timeoutSeconds: 10
  54 +    liveness:
  55 +      initialDelaySeconds: 30
  56 +      periodSeconds: 10
  57 +      timeoutSeconds: 10
  58
  59  conf:
  60    enabled_plugins:
  61 --
  62 2.7.4
  63