Merge pull request #376 from w3aman/namespace_env

fix(e2e): Change hard-coded value of openebs namespace to env variable

e2e-tests/experiments/functional/backup_and_restore/backup.yml

@@ -1,6 +1,11 @@
 ---
 - block:
 
+    - name: Update the volume snapshot location yaml with zfs-operator namespace
+      template:
+        src: volume_snapshot_location.j2
+        dest: volume_snapshot_location.yml
+
     - name: Create the volume snapshot location which has the information about where the snapshot should be stored
       shell: kubectl apply -f ./volume_snapshot_location.yml
       args:
@@ -44,6 +49,11 @@
 
 - block:
 
+  - name: Update the volume snapshot location yaml with zfs-operator namespace
+    template:
+      src: incremental_backup_vsl.j2
+      dest: incremental_backup_vsl.yml
+
   - name: Create the volume snapshot location which has the information about where the snapshot should be stored
     shell: kubectl apply -f ./incremental_backup_vsl.yml
     args:

e2e-tests/experiments/functional/backup_and_restore/incremental_backup_vsl.j2

@@ -9,7 +9,7 @@ spec:
     bucket: velero
     prefix: zfs
     incrBackupCount: "2" # number of incremental backup we want to have
-    namespace: openebs # this is namespace where ZFS-LocalPV creates all the CRs, passed as OPENEBS_NAMESPACE env in the ZFS-LocalPV deployment
+    namespace: "{{zfs_operator_ns}}" # this is namespace where ZFS-LocalPV creates all the CRs, passed as OPENEBS_NAMESPACE env in the ZFS-LocalPV deployment
     provider: aws
     region: minio
     s3ForcePathStyle: "true"

e2e-tests/experiments/functional/backup_and_restore/run_e2e_test.yml

@@ -42,6 +42,9 @@ spec:
           - name: APP_PVC  ## PVC name for application
             value: ''
 
+          - name: ZFS_OPERATOR_NAMESPACE  ## Namespace in which all the resources created by zfs driver will be present
+            value: ''                     ## for e.g. zfsvolume (zv) will be in this namespace
+
           - name: ACTION  ## On basis of the value of this env, this playbook will perform tasks.
             value: ''     ## Supported values: (backup, restore, schedule_backup, incremental_backup, incremental_restore)
           

e2e-tests/experiments/functional/backup_and_restore/test_vars.yml

@@ -3,6 +3,7 @@ app_ns: "{{ lookup('env','APP_NAMESPACE') }}"
 app_ns_new: "{{ lookup('env','RESTORE_NAMESPACE') }}"
 app_label: "{{ lookup('env','APP_LABEL') }}"
 app_pvc: "{{ lookup('env','APP_PVC') }}"
+zfs_operator_ns: "{{ lookup('env','ZFS_OPERATOR_NAMESPACE') }}"
 velero_backup_name: "{{ lookup('env','VELERO_BACKUP_NAME') }}"
 velero_plugin_name: "{{ lookup('env','VELERO_PLUGIN_NAME') }}"
 velero_version: "{{ lookup('env','VELERO_VERSION') }}"

e2e-tests/experiments/functional/backup_and_restore/volume_snapshot_location.j2

@@ -8,7 +8,7 @@ spec:
   config:
     bucket: velero
     prefix: zfs
-    namespace: openebs # this is namespace where ZFS-LocalPV creates all the CRs, passed as OPENEBS_NAMESPACE env in the ZFS-LocalPV deployment
+    namespace: "{{zfs_operator_ns}}" # this is namespace where ZFS-LocalPV creates all the CRs, passed as OPENEBS_NAMESPACE env in the ZFS-LocalPV deployment
     provider: aws
     region: minio
     s3ForcePathStyle: "true"