From ec305f8dc3fdcda88b12dc7da6134aba642f225a Mon Sep 17 00:00:00 2001
From: ricolin <rlin@vexxhost.com>
Date: Wed, 21 Aug 2024 12:09:33 +0800
Subject: [PATCH] fix: fix volume type create to honor encrypt type

There is no way to create encrypted volume type in current bootstrap script.
This patch makes sure we allow create encrypted volume types.

Change-Id: Ie486509fb0028e21270c18a2d27b56405eac1e29
---
 cinder/Chart.yaml                      | 2 +-
 cinder/templates/bin/_bootstrap.sh.tpl | 7 ++++++-
 releasenotes/notes/cinder.yaml         | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/cinder/Chart.yaml b/cinder/Chart.yaml
index 2be27eedf1..aa64c11cb1 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.23
+version: 0.3.24
 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/bin/_bootstrap.sh.tpl b/cinder/templates/bin/_bootstrap.sh.tpl
index 49d99c5236..9d117c8435 100644
--- a/cinder/templates/bin/_bootstrap.sh.tpl
+++ b/cinder/templates/bin/_bootstrap.sh.tpl
@@ -38,6 +38,11 @@ export HOME=/tmp
       openstack volume type show {{ $name }} || \
       openstack volume type create \
         --{{ $access_type }} \
+      {{- range $key, $value := $properties }}
+      {{- if or (eq $key "encryption-provider") (eq $key "encryption-cipher") (eq $key "encryption-key-size") (eq $key "encryption-control-location") }}
+        --{{ $key }} {{ $value}} \
+      {{- end }}
+      {{- end }}
       {{ $name }}
       {{/*
         We will try to set or update volume type properties.
@@ -64,7 +69,7 @@ export HOME=/tmp
         {{- end }}
 
         {{- range $key, $value := $properties }}
-        {{- if and (ne $key "access_type") (ne $key "grant_access") $value }}
+        {{- if and (ne $key "access_type") (ne $key "grant_access") (ne $key "encryption-provider") (ne $key "encryption-cipher") (ne $key "encryption-key-size") (ne $key "encryption-control-location") $value }}
         openstack volume type set --property {{ $key }}={{ $value }} {{ $name }}
         {{- end }}
         {{- end }}
diff --git a/releasenotes/notes/cinder.yaml b/releasenotes/notes/cinder.yaml
index 47e008ba49..a2523f0a5d 100644
--- a/releasenotes/notes/cinder.yaml
+++ b/releasenotes/notes/cinder.yaml
@@ -73,4 +73,5 @@ cinder:
   - 0.3.21 Enable custom annotations for Openstack secrets
   - 0.3.22 Update images used by default
   - 0.3.23 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default
+  - 0.3.24 Fix volume type create to allow encrypt volume type
 ...