From 6d032c3971d556893d50b1f71b9a692bfab44e6f Mon Sep 17 00:00:00 2001
From: Chris Wedgwood <cw@f00f.org>
Date: Thu, 25 Jun 2020 20:33:01 +0000
Subject: [PATCH] [rabbitmq] Upgrade to 3.7.26

Staying current.  Many bugfixes.

Change-Id: Ib95c30380d89c336774d5c74e02ce5cbd9efb5d7
---
 rabbitmq/templates/bin/_rabbitmq-password-hash.py.tpl | 2 +-
 rabbitmq/templates/bin/_rabbitmq-test.sh.tpl          | 2 +-
 rabbitmq/values.yaml                                  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rabbitmq/templates/bin/_rabbitmq-password-hash.py.tpl b/rabbitmq/templates/bin/_rabbitmq-password-hash.py.tpl
index 467e96db6..ffedc1956 100644
--- a/rabbitmq/templates/bin/_rabbitmq-password-hash.py.tpl
+++ b/rabbitmq/templates/bin/_rabbitmq-password-hash.py.tpl
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 {{/*
 Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/rabbitmq/templates/bin/_rabbitmq-test.sh.tpl b/rabbitmq/templates/bin/_rabbitmq-test.sh.tpl
index efe2e1574..98ac2079f 100644
--- a/rabbitmq/templates/bin/_rabbitmq-test.sh.tpl
+++ b/rabbitmq/templates/bin/_rabbitmq-test.sh.tpl
@@ -57,7 +57,7 @@ rabbit_check_node_count
 function rabbit_find_partitions () {
   NODE_INFO=$(mktemp)
   rabbitmqadmin_authed list nodes -f pretty_json | tee "${NODE_INFO}"
-  cat "${NODE_INFO}" | python -c "
+  cat "${NODE_INFO}" | python3 -c "
 import json, sys, traceback
 print('Checking cluster partitions')
 obj=json.load(sys.stdin)
diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml
index e836c5ec1..f539fbf58 100644
--- a/rabbitmq/values.yaml
+++ b/rabbitmq/values.yaml
@@ -35,9 +35,9 @@ images:
     prometheus_rabbitmq_exporter: docker.io/kbudde/rabbitmq-exporter:v0.21.0
     prometheus_rabbitmq_exporter_helm_tests: docker.io/openstackhelm/heat:stein-ubuntu_bionic
     rabbitmq_init: docker.io/openstackhelm/heat:stein-ubuntu_bionic
-    rabbitmq: docker.io/rabbitmq:3.7.13
+    rabbitmq: docker.io/rabbitmq:3.7.26
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
-    scripted_test: docker.io/rabbitmq:3.7.13-management
+    scripted_test: docker.io/rabbitmq:3.7.26-management
     image_repo_sync: docker.io/docker:17.07.0
   pull_policy: "IfNotPresent"
   local_registry: