From 638f77a95c1faa5b1c77d856b9c143f14c8513b7 Mon Sep 17 00:00:00 2001
From: Marcel Lauhoff <marcel.lauhoff@suse.com>
Date: Fri, 19 Aug 2022 18:24:40 +0200
Subject: [PATCH] e2e: Deploy vault as part of the Ceph FS suite

Always deploy Vault as part of the the Ceph FS test suite.

Required by:
 - fscrypt tests using any vault KMS type.
 - Configuration in deploy/cephfs/*.yaml via the
   ceph-csi-encryption-kms-config config map created during deployVault()

Signed-off-by: Marcel Lauhoff <marcel.lauhoff@suse.com>
---
 e2e/cephfs.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/e2e/cephfs.go b/e2e/cephfs.go
index a058eeab9..b46c9e4d3 100644
--- a/e2e/cephfs.go
+++ b/e2e/cephfs.go
@@ -203,6 +203,7 @@ var _ = Describe(cephfsType, func() {
 		if err != nil {
 			e2elog.Failf("failed to create node secret: %v", err)
 		}
+		deployVault(f.ClientSet, deployTimeout)
 
 		// wait for cluster name update in deployment
 		containers := []string{cephFSContainerName}
@@ -248,6 +249,8 @@ var _ = Describe(cephfsType, func() {
 		if err != nil {
 			e2elog.Failf("failed to delete storageclass: %v", err)
 		}
+		deleteVault()
+
 		if deployCephFS {
 			deleteCephfsPlugin()
 			if cephCSINamespace != defaultNs {