diff --git a/openstack-helm-infra/debian/deb_folder/patches/0006-Enable-override-of-rabbitmq-probe-parameters.patch b/openstack-helm-infra/debian/deb_folder/patches/0006-Enable-override-of-rabbitmq-probe-parameters.patch index e8ecf70c..c6cdacc0 100644 --- a/openstack-helm-infra/debian/deb_folder/patches/0006-Enable-override-of-rabbitmq-probe-parameters.patch +++ b/openstack-helm-infra/debian/deb_folder/patches/0006-Enable-override-of-rabbitmq-probe-parameters.patch @@ -8,13 +8,15 @@ liveness and readiness probes. Change-Id: I8d2685118eb4ce3b8c27952892f7ad553fc5de77 Signed-off-by: Gerry Kopec +[ fix duplicate yaml keys ] +Signed-off-by: Thales Elero Cervi --- rabbitmq/templates/statefulset.yaml | 10 ++++++---- - rabbitmq/values.yaml | 9 +++++++++ - 2 files changed, 15 insertions(+), 4 deletions(-) + rabbitmq/values.yaml | 8 ++++++++ + 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/rabbitmq/templates/statefulset.yaml b/rabbitmq/templates/statefulset.yaml -index e0e61e6..f71dc3e 100644 +index 45f8271a..cd9f39d6 100644 --- a/rabbitmq/templates/statefulset.yaml +++ b/rabbitmq/templates/statefulset.yaml @@ -225,14 +225,16 @@ spec: @@ -39,14 +41,13 @@ index e0e61e6..f71dc3e 100644 command: - /tmp/rabbitmq-liveness.sh diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml -index 9cd3a91..2bae4cb 100644 +index 6a1bd85f..0d37e673 100644 --- a/rabbitmq/values.yaml +++ b/rabbitmq/values.yaml -@@ -145,6 +145,15 @@ pod: - limits: - memory: "1024Mi" - cpu: "2000m" -+ probes: +@@ -48,6 +48,14 @@ images: + + pod: + probes: + readiness: + initialDelaySeconds: 10 + periodSeconds: 10 @@ -55,9 +56,9 @@ index 9cd3a91..2bae4cb 100644 + initialDelaySeconds: 30 + periodSeconds: 10 + timeoutSeconds: 10 - - conf: - enabled_plugins: + prometheus_rabbitmq_exporter: + rabbitmq_exporter: + readiness: -- -2.7.4 +2.25.1 diff --git a/openstack-helm-infra/debian/deb_folder/patches/0019-Add-force_boot-command-to-rabbit-start-template.patch b/openstack-helm-infra/debian/deb_folder/patches/0019-Add-force_boot-command-to-rabbit-start-template.patch index f7fa0d4a..a59ba222 100644 --- a/openstack-helm-infra/debian/deb_folder/patches/0019-Add-force_boot-command-to-rabbit-start-template.patch +++ b/openstack-helm-infra/debian/deb_folder/patches/0019-Add-force_boot-command-to-rabbit-start-template.patch @@ -26,10 +26,11 @@ Ref: Signed-off-by: Maik Catrinque Co-authored-by: Andrew Martins Carletti Change-Id: I56e966ea64e8881ba436213f0c9e1cbe547098e3 +Signed-off-by: Thales Elero Cervi --- rabbitmq/templates/bin/_rabbitmq-start.sh.tpl | 3 +++ rabbitmq/values.yaml | 6 ++++++ - 4 files changed, 11 insertions(+), 1 deletion(-) + 2 files changed, 9 insertions(+) diff --git a/rabbitmq/templates/bin/_rabbitmq-start.sh.tpl b/rabbitmq/templates/bin/_rabbitmq-start.sh.tpl index 794f0919..4ef849fd 100644 @@ -44,7 +45,7 @@ index 794f0919..4ef849fd 100644 +{{- end}} exec rabbitmq-server diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml -index c593966f..8eb51c64 100644 +index 90ed6d21..65a9526e 100644 --- a/rabbitmq/values.yaml +++ b/rabbitmq/values.yaml @@ -46,6 +46,12 @@ images: @@ -59,7 +60,7 @@ index c593966f..8eb51c64 100644 + pod: probes: - prometheus_rabbitmq_exporter: + readiness: -- 2.25.1 diff --git a/openstack-helm-infra/files/0006-Enable-override-of-rabbitmq-probe-parameters.patch b/openstack-helm-infra/files/0006-Enable-override-of-rabbitmq-probe-parameters.patch index e8ecf70c..c6cdacc0 100644 --- a/openstack-helm-infra/files/0006-Enable-override-of-rabbitmq-probe-parameters.patch +++ b/openstack-helm-infra/files/0006-Enable-override-of-rabbitmq-probe-parameters.patch @@ -8,13 +8,15 @@ liveness and readiness probes. Change-Id: I8d2685118eb4ce3b8c27952892f7ad553fc5de77 Signed-off-by: Gerry Kopec +[ fix duplicate yaml keys ] +Signed-off-by: Thales Elero Cervi --- rabbitmq/templates/statefulset.yaml | 10 ++++++---- - rabbitmq/values.yaml | 9 +++++++++ - 2 files changed, 15 insertions(+), 4 deletions(-) + rabbitmq/values.yaml | 8 ++++++++ + 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/rabbitmq/templates/statefulset.yaml b/rabbitmq/templates/statefulset.yaml -index e0e61e6..f71dc3e 100644 +index 45f8271a..cd9f39d6 100644 --- a/rabbitmq/templates/statefulset.yaml +++ b/rabbitmq/templates/statefulset.yaml @@ -225,14 +225,16 @@ spec: @@ -39,14 +41,13 @@ index e0e61e6..f71dc3e 100644 command: - /tmp/rabbitmq-liveness.sh diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml -index 9cd3a91..2bae4cb 100644 +index 6a1bd85f..0d37e673 100644 --- a/rabbitmq/values.yaml +++ b/rabbitmq/values.yaml -@@ -145,6 +145,15 @@ pod: - limits: - memory: "1024Mi" - cpu: "2000m" -+ probes: +@@ -48,6 +48,14 @@ images: + + pod: + probes: + readiness: + initialDelaySeconds: 10 + periodSeconds: 10 @@ -55,9 +56,9 @@ index 9cd3a91..2bae4cb 100644 + initialDelaySeconds: 30 + periodSeconds: 10 + timeoutSeconds: 10 - - conf: - enabled_plugins: + prometheus_rabbitmq_exporter: + rabbitmq_exporter: + readiness: -- -2.7.4 +2.25.1 diff --git a/openstack-helm-infra/files/0019-Add-force_boot-command-to-rabbit-start-template.patch b/openstack-helm-infra/files/0019-Add-force_boot-command-to-rabbit-start-template.patch index f7fa0d4a..a59ba222 100644 --- a/openstack-helm-infra/files/0019-Add-force_boot-command-to-rabbit-start-template.patch +++ b/openstack-helm-infra/files/0019-Add-force_boot-command-to-rabbit-start-template.patch @@ -26,10 +26,11 @@ Ref: Signed-off-by: Maik Catrinque Co-authored-by: Andrew Martins Carletti Change-Id: I56e966ea64e8881ba436213f0c9e1cbe547098e3 +Signed-off-by: Thales Elero Cervi --- rabbitmq/templates/bin/_rabbitmq-start.sh.tpl | 3 +++ rabbitmq/values.yaml | 6 ++++++ - 4 files changed, 11 insertions(+), 1 deletion(-) + 2 files changed, 9 insertions(+) diff --git a/rabbitmq/templates/bin/_rabbitmq-start.sh.tpl b/rabbitmq/templates/bin/_rabbitmq-start.sh.tpl index 794f0919..4ef849fd 100644 @@ -44,7 +45,7 @@ index 794f0919..4ef849fd 100644 +{{- end}} exec rabbitmq-server diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml -index c593966f..8eb51c64 100644 +index 90ed6d21..65a9526e 100644 --- a/rabbitmq/values.yaml +++ b/rabbitmq/values.yaml @@ -46,6 +46,12 @@ images: @@ -59,7 +60,7 @@ index c593966f..8eb51c64 100644 + pod: probes: - prometheus_rabbitmq_exporter: + readiness: -- 2.25.1