From 99cf85550b1e1295e3ed3fc030e9aa06e9d826ec Mon Sep 17 00:00:00 2001
From: Mohammed Naser <mnaser@vexxhost.com>
Date: Thu, 23 Feb 2023 18:24:55 +0000
Subject: [PATCH] fix(cinder): solve keyring placement for uppercased backends

Change-Id: Ic384a86f74751dae7ff964688aef30e411fe4b8e
---
 cinder/Chart.yaml                       | 2 +-
 cinder/templates/deployment-backup.yaml | 2 +-
 cinder/templates/deployment-volume.yaml | 2 +-
 cinder/templates/job-storage-init.yaml  | 2 +-
 releasenotes/notes/cinder.yaml          | 1 +
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cinder/Chart.yaml b/cinder/Chart.yaml
index 53708546cf..89c0330ce3 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.3.5
+version: 0.3.6
 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/deployment-backup.yaml b/cinder/templates/deployment-backup.yaml
index 6107775cdf..47fac408c8 100755
--- a/cinder/templates/deployment-backup.yaml
+++ b/cinder/templates/deployment-backup.yaml
@@ -91,7 +91,7 @@ spec:
         {{- range $name := rest (splitList "," (include "cinder.utils.ceph_backend_list" $envAll)) }}
           {{- $backend := index $envAll.Values.conf.backends $name }}
             {{- if eq $internal_ceph_backend $name }}
-        - name: ceph-keyring-placement-{{$name}}
+        - name: ceph-keyring-placement-{{ $name | lower }}
 {{ tuple $envAll "cinder_backup" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ dict "envAll" $envAll "application" "cinder_backup" "container" "ceph_keyring_placement" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
           command:
diff --git a/cinder/templates/deployment-volume.yaml b/cinder/templates/deployment-volume.yaml
index 9207c258dc..01aea233c6 100755
--- a/cinder/templates/deployment-volume.yaml
+++ b/cinder/templates/deployment-volume.yaml
@@ -68,7 +68,7 @@ spec:
         {{- range $name := rest (splitList "," (include "cinder.utils.ceph_backend_list" $envAll)) }}
           {{- $backend := index $envAll.Values.conf.backends $name }}
             {{- if eq $internal_ceph_backend $name }}
-        - name: ceph-keyring-placement-{{$name}}
+        - name: ceph-keyring-placement-{{ $name | lower }}
 {{ tuple $envAll "cinder_volume" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ dict "envAll" $envAll "application" "cinder_volume" "container" "ceph_keyring_placement" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
           command:
diff --git a/cinder/templates/job-storage-init.yaml b/cinder/templates/job-storage-init.yaml
index e28a35efb9..350b013ac4 100755
--- a/cinder/templates/job-storage-init.yaml
+++ b/cinder/templates/job-storage-init.yaml
@@ -102,7 +102,7 @@ spec:
         {{- range $name, $backend := .Values.conf.backends }}
           {{- if (eq "true" ( dict "backend" $backend | include "cinder.utils.is_ceph_backend" )) }}
             {{- if eq $internal_ceph_backend $name }}
-        - name: cinder-storage-init-{{$name}}
+        - name: cinder-storage-init-{{ $name | lower }}
 {{ tuple $envAll "cinder_storage_init" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.storage_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
diff --git a/releasenotes/notes/cinder.yaml b/releasenotes/notes/cinder.yaml
index 6ca580fd4f..1df52d5bbb 100644
--- a/releasenotes/notes/cinder.yaml
+++ b/releasenotes/notes/cinder.yaml
@@ -55,4 +55,5 @@ cinder:
   - 0.3.3 Fix for creation endpoins and services when v1/v2 are disabled
   - 0.3.4 Fix Helm hooks for storage bootstrap jobs
   - 0.3.5 Add Nova endpoint details to support online volume resize
+  - 0.3.6 Fix ceph keyring placement for uppercased backends
 ...