From c55d30577bd3b7838bd342868c0310d420947df6 Mon Sep 17 00:00:00 2001
From: Malte Poll <1780588+malt3@users.noreply.github.com>
Date: Thu, 15 Feb 2024 13:52:03 +0100
Subject: [PATCH] Merge develop branch

---
 charts/cinder-csi-plugin/Chart.yaml                           | 4 ++--
 .../templates/controllerplugin-deployment.yaml                | 4 ----
 charts/cinder-csi-plugin/templates/nodeplugin-daemonset.yaml  | 4 ----
 charts/cinder-csi-plugin/values.yaml                          | 2 +-
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/charts/cinder-csi-plugin/Chart.yaml b/charts/cinder-csi-plugin/Chart.yaml
index 27b471f7..779770a3 100644
--- a/charts/cinder-csi-plugin/Chart.yaml
+++ b/charts/cinder-csi-plugin/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: v1.0.1
+appVersion: v1.0.2
 description: Cinder CSI Chart for OpenStack with on-node encryption support
 name: openstack-cinder-csi
-version: 1.0.1
+version: 1.0.2
diff --git a/charts/cinder-csi-plugin/templates/controllerplugin-deployment.yaml b/charts/cinder-csi-plugin/templates/controllerplugin-deployment.yaml
index 18f98326..dd9a1688 100644
--- a/charts/cinder-csi-plugin/templates/controllerplugin-deployment.yaml
+++ b/charts/cinder-csi-plugin/templates/controllerplugin-deployment.yaml
@@ -195,10 +195,6 @@ spec:
           volumeMounts:
             - name: socket-dir
               mountPath: /csi
-            - name: cloud-config
-              mountPath: /etc/kubernetes/{{ .Values.secret.filename }}
-              readOnly: true
-              subPath: {{ .Values.secret.filename }}
           {{- with .Values.csi.plugin.volumeMounts }}
             {{- toYaml . | nindent 12 }}
           {{- end }}
diff --git a/charts/cinder-csi-plugin/templates/nodeplugin-daemonset.yaml b/charts/cinder-csi-plugin/templates/nodeplugin-daemonset.yaml
index cf9521f2..482f1800 100644
--- a/charts/cinder-csi-plugin/templates/nodeplugin-daemonset.yaml
+++ b/charts/cinder-csi-plugin/templates/nodeplugin-daemonset.yaml
@@ -118,10 +118,6 @@ spec:
             - name: pods-probe-dir
               mountPath: /dev
               mountPropagation: "HostToContainer"
-            - name: cloud-config
-              mountPath: /etc/kubernetes/{{ .Values.secret.filename }}
-              readOnly: true
-              subPath: {{ .Values.secret.filename }}
             # Edgeless specific mounts for cryptsetup
             - name: sys
               mountPath: /sys
diff --git a/charts/cinder-csi-plugin/values.yaml b/charts/cinder-csi-plugin/values.yaml
index 7e34d381..e6d12438 100644
--- a/charts/cinder-csi-plugin/values.yaml
+++ b/charts/cinder-csi-plugin/values.yaml
@@ -57,7 +57,7 @@ csi:
       repository: ghcr.io/edgelesssys/constellation/cinder-csi-plugin
       pullPolicy: IfNotPresent
       # CSI driver version is independent of Constellation releases
-      tag: v1.0.1@sha256:65b59c9b64701f92c59d05f80d5b2bae0a2bc281e74b1f0db0fa3802081fd298
+      tag: v1.0.2@sha256:d0b9872378ef5cad9ca5442651df85cf6a4a3a50044018c3541b53f3b7b7480e
     volumeMounts:
       - name: cloud-config
         mountPath: /etc/kubernetes