From e783450071f312c0d4461e08283313a265c518ef Mon Sep 17 00:00:00 2001
From: Darren DeJaeger <darren.dejaeger@gmail.com>
Date: Tue, 28 Sep 2021 11:46:22 -0500
Subject: [PATCH] Add rabbitmq secret volume + mount for audit usage cronjob

This PS adds the rabbitmq secret volume + mount for the audit
usage cronjob, as it was previously missing and the job's command(s)
were failing when run.

In addition, add labels to the CronJob's metadata, so that it can
be picked up for pre-delete hooks.

Change-Id: I0a2ed0655702b4e41cc12d3908b9aed141e6f0d2
---
 cinder/Chart.yaml                                        | 2 +-
 cinder/templates/cron-job-cinder-volume-usage-audit.yaml | 4 ++++
 releasenotes/notes/cinder.yaml                           | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/cinder/Chart.yaml b/cinder/Chart.yaml
index 7d463ead61..e538b33498 100644
--- a/cinder/Chart.yaml
+++ b/cinder/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Cinder
 name: cinder
-version: 0.2.8
+version: 0.2.9
 home: https://docs.openstack.org/cinder/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Cinder/OpenStack_Project_Cinder_vertical.png
 sources:
diff --git a/cinder/templates/cron-job-cinder-volume-usage-audit.yaml b/cinder/templates/cron-job-cinder-volume-usage-audit.yaml
index dc9cdaee77..3d13af36cd 100644
--- a/cinder/templates/cron-job-cinder-volume-usage-audit.yaml
+++ b/cinder/templates/cron-job-cinder-volume-usage-audit.yaml
@@ -25,6 +25,8 @@ apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
   name: cinder-volume-usage-audit
+  labels:
+{{ tuple $envAll "cinder" "volume-usage-audit" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
@@ -81,6 +83,7 @@ spec:
                   subPath: volume-usage-audit.sh
                   readOnly: true
 {{- dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.endpoints.oslo_db.auth.admin.secret.tls.internal "path" "/etc/mysql/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 16 }}
+{{- dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.endpoints.oslo_messaging.auth.admin.secret.tls.internal "path" "/etc/rabbitmq/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 16 }}
 {{ if $mounts_cinder_volume_usage_audit.volumeMounts }}{{ toYaml $mounts_cinder_volume_usage_audit.volumeMounts | indent 16 }}{{ end }}
           volumes:
             - name: pod-tmp
@@ -96,5 +99,6 @@ spec:
                 name: cinder-bin
                 defaultMode: 0555
 {{- dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.endpoints.oslo_db.auth.admin.secret.tls.internal | include "helm-toolkit.snippets.tls_volume" | indent 12 }}
+{{- dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.endpoints.oslo_messaging.auth.admin.secret.tls.internal | include "helm-toolkit.snippets.tls_volume" | indent 12 }}
 {{ if $mounts_cinder_volume_usage_audit.volumes }}{{ toYaml $mounts_cinder_volume_usage_audit.volumes | indent 12 }}{{ end }}
 {{- end }}
diff --git a/releasenotes/notes/cinder.yaml b/releasenotes/notes/cinder.yaml
index 569643f967..a3baedfa9b 100644
--- a/releasenotes/notes/cinder.yaml
+++ b/releasenotes/notes/cinder.yaml
@@ -25,4 +25,5 @@ cinder:
   - 0.2.6 Added helm.sh/hook with value of post-install and post-upgrade
   - 0.2.7 Add Victoria and Wallaby releases support
   - 0.2.8 Add logic to bootstrap to handle upgrade timing issue
+  - 0.2.9 Mount rabbitmq TLS secret for audit usage cronjob
 ...