From c05d1589f80dbf6790935182a3bb779d2f385c33 Mon Sep 17 00:00:00 2001
From: Otto Bittner <cobittner@posteo.net>
Date: Wed, 30 Nov 2022 17:33:28 +0100
Subject: [PATCH] Bring in CSI driver changes from upstream

---
 .../templates/node.yaml                       | 46 +++++++++++--------
 .../templates/node.yaml                       | 46 +++++++++++--------
 2 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/cli/internal/helm/charts/edgeless/constellation-services/charts/gcp-compute-persistent-disk-csi-driver/templates/node.yaml b/cli/internal/helm/charts/edgeless/constellation-services/charts/gcp-compute-persistent-disk-csi-driver/templates/node.yaml
index 43b122dc9..dc5de2aa9 100644
--- a/cli/internal/helm/charts/edgeless/constellation-services/charts/gcp-compute-persistent-disk-csi-driver/templates/node.yaml
+++ b/cli/internal/helm/charts/edgeless/constellation-services/charts/gcp-compute-persistent-disk-csi-driver/templates/node.yaml
@@ -61,14 +61,17 @@ spec:
               mountPath: /dev
             # The following mounts are required to trigger host udevadm from
             # container
-            - name: udev-rules-etc
-              mountPath: /etc/udev
-            - name: udev-rules-lib
-              mountPath: /lib/udev
-            - name: udev-socket
-              mountPath: /run/udev
-            - name: sys
-              mountPath: /sys
+            # But we don't want that, because it breaks cryptsetup
+            # Also, the task done by manually triggering udevadm are already
+            # performed by having the correct udev rules configured
+            # - name: udev-rules-etc
+            #   mountPath: /etc/udev
+            # - name: udev-rules-lib
+            #   mountPath: /lib/udev
+            # - name: udev-socket
+            #   mountPath: /run/udev
+            # - name: sys
+            #   mountPath: /sys
             - name: cryptsetup
               mountPath: /run/cryptsetup
       volumes:
@@ -90,18 +93,21 @@ spec:
             type: Directory
         # The following mounts are required to trigger host udevadm from
         # container
-        - name: udev-rules-etc
-          hostPath:
-            path: /etc/udev
-            type: Directory
-        - name: udev-rules-lib
-          hostPath:
-            path: /lib/udev
-            type: Directory
-        - name: udev-socket
-          hostPath:
-            path: /run/udev
-            type: Directory
+        # But we don't want that, because it breaks cryptsetup
+        # Also, the task done by manually triggering udevadm are already
+        # performed by having the correct udev rules configured
+        # - name: udev-rules-etc
+        #   hostPath:
+        #     path: /etc/udev
+        #     type: Directory
+        # - name: udev-rules-lib
+        #   hostPath:
+        #     path: /lib/udev
+        #     type: Directory
+        # - name: udev-socket
+        #   hostPath:
+        #     path: /run/udev
+        #     type: Directory
         - name: sys
           hostPath:
             path: /sys
diff --git a/cli/internal/helm/testdata/GCP/constellation-services/charts/gcp-compute-persistent-disk-csi-driver/templates/node.yaml b/cli/internal/helm/testdata/GCP/constellation-services/charts/gcp-compute-persistent-disk-csi-driver/templates/node.yaml
index 7440a026c..de570279f 100644
--- a/cli/internal/helm/testdata/GCP/constellation-services/charts/gcp-compute-persistent-disk-csi-driver/templates/node.yaml
+++ b/cli/internal/helm/testdata/GCP/constellation-services/charts/gcp-compute-persistent-disk-csi-driver/templates/node.yaml
@@ -61,14 +61,17 @@ spec:
               mountPath: /dev
             # The following mounts are required to trigger host udevadm from
             # container
-            - name: udev-rules-etc
-              mountPath: /etc/udev
-            - name: udev-rules-lib
-              mountPath: /lib/udev
-            - name: udev-socket
-              mountPath: /run/udev
-            - name: sys
-              mountPath: /sys
+            # But we don't want that, because it breaks cryptsetup
+            # Also, the task done by manually triggering udevadm are already
+            # performed by having the correct udev rules configured
+            # - name: udev-rules-etc
+            #   mountPath: /etc/udev
+            # - name: udev-rules-lib
+            #   mountPath: /lib/udev
+            # - name: udev-socket
+            #   mountPath: /run/udev
+            # - name: sys
+            #   mountPath: /sys
             - name: cryptsetup
               mountPath: /run/cryptsetup
       volumes:
@@ -90,18 +93,21 @@ spec:
             type: Directory
         # The following mounts are required to trigger host udevadm from
         # container
-        - name: udev-rules-etc
-          hostPath:
-            path: /etc/udev
-            type: Directory
-        - name: udev-rules-lib
-          hostPath:
-            path: /lib/udev
-            type: Directory
-        - name: udev-socket
-          hostPath:
-            path: /run/udev
-            type: Directory
+        # But we don't want that, because it breaks cryptsetup
+        # Also, the task done by manually triggering udevadm are already
+        # performed by having the correct udev rules configured
+        # - name: udev-rules-etc
+        #   hostPath:
+        #     path: /etc/udev
+        #     type: Directory
+        # - name: udev-rules-lib
+        #   hostPath:
+        #     path: /lib/udev
+        #     type: Directory
+        # - name: udev-socket
+        #   hostPath:
+        #     path: /run/udev
+        #     type: Directory
         - name: sys
           hostPath:
             path: /sys