test(robot): add nodePublishSecretRef support for encrypted volume PVs

Add `node_publish_secret_name`/`node_publish_secret_namespace` parameters
through the volume_keywords -> Volume -> Base -> PersistentVolume call
chain so that PVs created for restored/cloned encrypted volumes set
nodePublishSecretRef.

Update `test_encrypted_volume.robot` to pass `node_publish_secret_name`
for all `Create deployment ... with volume ...` steps that mount
restored/cloned encrypted volumes, and remove the v2 data engine skip
for backup restore to encrypted volume now that it is supported.

longhorn/longhorn#13364

Signed-off-by: Roger Yao <roger.yao@suse.com>
(cherry picked from commit 58f48b5)

Author: roger-ryao

e2e/libs/keywords/volume_keywords.py

@@ -417,8 +417,8 @@ def update_volume_spec(self, volume_name, key, value):
     def activate_dr_volume(self, volume_name):
         self.volume.activate(volume_name)
 
-    def create_persistentvolume_for_volume(self, volume_name, retry=True, volumeMode="Filesystem", fsType="ext4", sc_name="longhorn", node_stage_secret_name=None, node_stage_secret_namespace="longhorn-system"):
-        self.volume.create_persistentvolume(volume_name, retry, volumeMode, fsType, sc_name, node_stage_secret_name, node_stage_secret_namespace)
+    def create_persistentvolume_for_volume(self, volume_name, retry=True, volumeMode="Filesystem", fsType="ext4", sc_name="longhorn", node_stage_secret_name=None, node_stage_secret_namespace="longhorn-system", node_publish_secret_name=None, node_publish_secret_namespace="longhorn-system"):
+        self.volume.create_persistentvolume(volume_name, retry, volumeMode, fsType, sc_name, node_stage_secret_name, node_stage_secret_namespace, node_publish_secret_name, node_publish_secret_namespace)
 
     def create_persistentvolumeclaim_for_volume(self, volume_name, volumeMode="Filesystem", retry=True, sc_name="longhorn"):
         self.volume.create_persistentvolumeclaim(volume_name, volumeMode, retry, sc_name=sc_name)

e2e/libs/persistentvolume/persistentvolume.py

@@ -16,7 +16,7 @@ def __init__(self):
         self.api = client.CoreV1Api()
         self.retry_count, self.retry_interval = get_retry_count_and_interval()
 
-    def create(self, name, storage, volumeMode="Filesystem", fsType="ext4", sc_name="longhorn", node_stage_secret_name=None, node_stage_secret_namespace='longhorn-system'):
+    def create(self, name, storage, volumeMode="Filesystem", fsType="ext4", sc_name="longhorn", node_stage_secret_name=None, node_stage_secret_namespace='longhorn-system', node_publish_secret_name=None, node_publish_secret_namespace='longhorn-system'):
         filepath = "./templates/workload/pv.yaml"
         with open(filepath, 'r') as f:
             manifest_dict = yaml.safe_load(f)
@@ -35,6 +35,12 @@ def create(self, name, storage, volumeMode="Filesystem", fsType="ext4", sc_name=
                     'namespace': node_stage_secret_namespace,
                 }
 
+            if node_publish_secret_name:
+                manifest_dict['spec']['csi']['nodePublishSecretRef'] = {
+                    'name': node_publish_secret_name,
+                    'namespace': node_publish_secret_namespace,
+                }
+
             logging(f"yaml = {manifest_dict}")
 
             self.api.create_persistent_volume(body=manifest_dict)

e2e/libs/volume/base.py

@@ -176,13 +176,13 @@ def get_checksum(self, volume_name):
     def activate(self, volume_name):
         return NotImplemented
 
-    def create_persistentvolume(self, volume_name, retry, volumeMode, fsType, sc_name="longhorn", node_stage_secret_name=None, node_stage_secret_namespace="longhorn-system"):
+    def create_persistentvolume(self, volume_name, retry, volumeMode, fsType, sc_name="longhorn", node_stage_secret_name=None, node_stage_secret_namespace="longhorn-system", node_publish_secret_name=None, node_publish_secret_namespace="longhorn-system"):
         logging(f'Creating PV {volume_name} for volume {volume_name}')
         volume = self.get(volume_name)
         volume_size = self._get_volume_size(volume)
         assert volume_size is not None, f"Cannot determine size for volume {volume_name}"
         storage = str(convert_size_to_bytes(str(volume_size)))
-        self.pv.create(volume_name, storage, volumeMode, fsType, sc_name=sc_name, node_stage_secret_name=node_stage_secret_name, node_stage_secret_namespace=node_stage_secret_namespace)
+        self.pv.create(volume_name, storage, volumeMode, fsType, sc_name=sc_name, node_stage_secret_name=node_stage_secret_name, node_stage_secret_namespace=node_stage_secret_namespace, node_publish_secret_name=node_publish_secret_name, node_publish_secret_namespace=node_publish_secret_namespace)
 
         if not retry:
             return

e2e/libs/volume/volume.py

@@ -189,8 +189,8 @@ def update_volume_spec(self, volume_name, key, value):
     def activate(self, volume_name):
         return self.volume.activate(volume_name)
 
-    def create_persistentvolume(self, volume_name, retry, volumeMode, fsType, sc_name="longhorn", node_stage_secret_name=None, node_stage_secret_namespace="longhorn-system"):
-        return self.volume.create_persistentvolume(volume_name, retry, volumeMode, fsType, sc_name=sc_name, node_stage_secret_name=node_stage_secret_name, node_stage_secret_namespace=node_stage_secret_namespace)
+    def create_persistentvolume(self, volume_name, retry, volumeMode, fsType, sc_name="longhorn", node_stage_secret_name=None, node_stage_secret_namespace="longhorn-system", node_publish_secret_name=None, node_publish_secret_namespace="longhorn-system"):
+        return self.volume.create_persistentvolume(volume_name, retry, volumeMode, fsType, sc_name=sc_name, node_stage_secret_name=node_stage_secret_name, node_stage_secret_namespace=node_stage_secret_namespace, node_publish_secret_name=node_publish_secret_name, node_publish_secret_namespace=node_publish_secret_namespace)
 
     def create_persistentvolumeclaim(self, volume_name, volumeMode, retry, sc_name="longhorn"):
         return self.volume.create_persistentvolumeclaim(volume_name, volumeMode, retry, sc_name=sc_name)

e2e/tests/regression/test_encrypted_volume.robot

@@ -165,7 +165,8 @@ Test Encrypted Volume Snapshot Clone
     And Wait for volume 1 detached
 
     # Attach cloned volume to new deployment with crypto SC (to trigger luksOpen)
-    And Create deployment 1 with volume 1    sc_name=longhorn-crypto    node_stage_secret_name=longhorn-crypto
+    And Create deployment 1 with volume 1    sc_name=longhorn-crypto    node_stage_secret_name=longhorn-crypto    node_publish_secret_name=longhorn-crypto
+
     And Wait for volume of deployment 1 healthy
 
     # Verify cloned volume size and data integrity
@@ -309,9 +310,6 @@ Test Encrypted Volume Backup Restore To Encrypted Volume
     ...                  - Restored volumes' replica backend file is exactly 100 Mi + 16 Mi.
     ...                  - The 10 Mi payload checksum matches the original.
     ...                - Issue: https://github.com/longhorn/longhorn/issues/9205
-    IF    '${DATA_ENGINE}' == 'v2'
-        Skip    v2 data engine does not support encrypted volume restore with encrypted=True (https://github.com/longhorn/longhorn/issues/13163)
-    END
     Given Create crypto secret
     And Create storageclass longhorn-crypto with    encrypted=true    dataEngine=${DATA_ENGINE}
     When Create persistentvolumeclaim 0    volume_type=RWO    sc_name=longhorn-crypto    storage_size=100Mi
@@ -339,8 +337,10 @@ Test Encrypted Volume Backup Restore To Encrypted Volume
     And Wait for volume 3 detached
     # Mount the restored volumes via deployments so that CSI opens the LUKS container.
     # Must use longhorn-crypto SC (with node-stage-secret-ref) so luksOpen is triggered.
-    And Create deployment 2 with volume 2    sc_name=longhorn-crypto    node_stage_secret_name=longhorn-crypto
-    And Create deployment 3 with volume 3    sc_name=longhorn-crypto    node_stage_secret_name=longhorn-crypto
+    And Create deployment 2 with volume 2    sc_name=longhorn-crypto    node_stage_secret_name=longhorn-crypto    node_publish_secret_name=longhorn-crypto
+
+    And Create deployment 3 with volume 3    sc_name=longhorn-crypto    node_stage_secret_name=longhorn-crypto    node_publish_secret_name=longhorn-crypto
+
     And Wait for volume of deployment 2 healthy
     And Wait for volume of deployment 3 healthy
     Then Assert disk size in instance manager pod for deployment 2 is 100Mi
@@ -791,7 +791,8 @@ Test Encrypted Volume Upgrade
     # Deployment 7: Restore from Backup 0 (RWO Filesystem)
     When Create volume 7 from backup 0 of deployment 0 volume    size=100Mi    encrypted=True    dataEngine=${DATA_ENGINE}
     Then Wait for volume 7 detached
-    And Create deployment 7 with volume 7    sc_name=longhorn-crypto-stable    node_stage_secret_name=longhorn-crypto
+    And Create deployment 7 with volume 7    sc_name=longhorn-crypto-stable    node_stage_secret_name=longhorn-crypto    node_publish_secret_name=longhorn-crypto
+
     And Wait for volume of deployment 7 healthy
     Then Assert disk size in instance manager pod for deployment 7 is 100Mi
     And Assert replica file size of deployment 7 is 116Mi
@@ -800,7 +801,8 @@ Test Encrypted Volume Upgrade
     # Deployment 8: Restore from Backup 1 (RWX Filesystem)
     When Create volume 8 from backup 1 of deployment 1 volume    size=100Mi    encrypted=True    dataEngine=${DATA_ENGINE}
     Then Wait for volume 8 detached
-    And Create deployment 8 with volume 8    sc_name=longhorn-crypto-stable    node_stage_secret_name=longhorn-crypto
+    And Create deployment 8 with volume 8    sc_name=longhorn-crypto-stable    node_stage_secret_name=longhorn-crypto    node_publish_secret_name=longhorn-crypto
+
     And Wait for volume of deployment 8 healthy
     Then Assert disk size in instance manager pod for deployment 8 is 100Mi
     And Assert replica file size of deployment 8 is 116Mi