From f5f34ed91015ec85a47c6219a96e222fbeb9c62b Mon Sep 17 00:00:00 2001
From: misook <misook.kim@samsung.com>
Date: Thu, 14 Nov 2024 15:00:34 +0900
Subject: [PATCH] added mount path /run/cryptsetup to fix the permission issue
 with cryptsetup operation. For this, when the backend volume is an iSCSI
 connection and of encryption type, /run/cryptsetup must be mounted.

Closes-Bug: #2087913
Change-Id: I806f24c21395a2bcf74e8df48f172dc6a3adb5f7
---
 cinder/Chart.yaml                       | 2 +-
 cinder/templates/deployment-backup.yaml | 5 +++++
 cinder/templates/deployment-volume.yaml | 5 +++++
 releasenotes/notes/cinder.yaml          | 1 +
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/cinder/Chart.yaml b/cinder/Chart.yaml
index b95147a046..fe9bd25d96 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.25
+version: 0.3.26
 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 365744668e..ccd84fc0fc 100644
--- a/cinder/templates/deployment-backup.yaml
+++ b/cinder/templates/deployment-backup.yaml
@@ -270,6 +270,8 @@ spec:
               {{- if or ( gt .Capabilities.KubeVersion.Major "1" ) ( ge .Capabilities.KubeVersion.Minor "10" ) }}
               mountPropagation: HostToContainer
               {{- end }}
+            - name: runcryptsetup
+              mountPath: /run/cryptsetup
             - name: runlock
               mountPath: /run/lock
             - name: etciscsi
@@ -352,6 +354,9 @@ spec:
         - name: host-dev
           hostPath:
             path: /dev
+        - name: runcryptsetup
+          hostPath:
+            path: /run/cryptsetup
         - name: runlock
           hostPath:
             path: /run/lock
diff --git a/cinder/templates/deployment-volume.yaml b/cinder/templates/deployment-volume.yaml
index 9362553679..e2d2fc4d4b 100644
--- a/cinder/templates/deployment-volume.yaml
+++ b/cinder/templates/deployment-volume.yaml
@@ -253,6 +253,8 @@ spec:
               {{- if or ( gt .Capabilities.KubeVersion.Major "1" ) ( ge .Capabilities.KubeVersion.Minor "10" ) }}
               mountPropagation: HostToContainer
               {{- end }}
+            - name: runcryptsetup
+              mountPath: /run/cryptsetup
             - name: runlock
               mountPath: /run/lock
             - name: etciscsi
@@ -336,6 +338,9 @@ spec:
         - name: host-dev
           hostPath:
             path: /dev
+        - name: runcryptsetup
+          hostPath:
+            path: /run/cryptsetup
         - name: runlock
           hostPath:
             path: /run/lock
diff --git a/releasenotes/notes/cinder.yaml b/releasenotes/notes/cinder.yaml
index d9dc4860dc..e1a9592489 100644
--- a/releasenotes/notes/cinder.yaml
+++ b/releasenotes/notes/cinder.yaml
@@ -75,4 +75,5 @@ cinder:
   - 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
   - 0.3.25 Add 2024.2 Ubuntu Jammy overrides
+  - 0.3.26 Mount /run/cryptsetup in cinder-volume container
 ...