From dfaf2f20c2d59d90241901ccd8e9c00d5b1cff63 Mon Sep 17 00:00:00 2001
From: JoshVanL <vleeuwenjoshua@gmail.com>
Date: Mon, 11 Nov 2019 12:55:07 +0000
Subject: [PATCH] Initialise e2e vault issuer secret namespace before each

Signed-off-by: JoshVanL <vleeuwenjoshua@gmail.com>
---
 .../e2e/suite/issuers/vault/certificate/approle.go | 12 ++++++------
 .../vault/certificate/approle_custom_mount.go      | 14 +++++++-------
 .../issuers/vault/certificaterequest/approle.go    | 11 ++++++-----
 .../certificaterequest/approle_custom_mount.go     | 12 +++++++-----
 4 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/test/e2e/suite/issuers/vault/certificate/approle.go b/test/e2e/suite/issuers/vault/certificate/approle.go
index dfc616728..ddd76ba03 100644
--- a/test/e2e/suite/issuers/vault/certificate/approle.go
+++ b/test/e2e/suite/issuers/vault/certificate/approle.go
@@ -78,14 +78,14 @@ func runVaultAppRoleTests(issuerKind string) {
 
 	var vaultSecretNamespace string
 
-	if issuerKind == cmapi.IssuerKind {
-		vaultSecretNamespace = f.Namespace.Name
-	} else {
-		vaultSecretNamespace = "kube-system"
-	}
-
 	BeforeEach(func() {
 		By("Configuring the Vault server")
+		if issuerKind == cmapi.IssuerKind {
+			vaultSecretNamespace = f.Namespace.Name
+		} else {
+			vaultSecretNamespace = "kube-system"
+		}
+
 		vaultInit = &vaultaddon.VaultInitializer{
 			Details:           *vault.Details(),
 			RootMount:         rootMount,
diff --git a/test/e2e/suite/issuers/vault/certificate/approle_custom_mount.go b/test/e2e/suite/issuers/vault/certificate/approle_custom_mount.go
index 67b1ceb7f..57eb9eebf 100644
--- a/test/e2e/suite/issuers/vault/certificate/approle_custom_mount.go
+++ b/test/e2e/suite/issuers/vault/certificate/approle_custom_mount.go
@@ -73,18 +73,18 @@ func runVaultCustomAppRoleTests(issuerKind string) {
 	vaultPath := path.Join(intermediateMount, "sign", role)
 	var roleId string
 	var secretId string
+	var vaultSecretNamespace string
 
 	var vaultInit *vaultaddon.VaultInitializer
 
-	var vaultSecretNamespace string
-	if issuerKind == cmapi.IssuerKind {
-		vaultSecretNamespace = f.Namespace.Name
-	} else {
-		vaultSecretNamespace = "kube-system"
-	}
-
 	BeforeEach(func() {
 		By("Configuring the Vault server")
+		if issuerKind == cmapi.IssuerKind {
+			vaultSecretNamespace = f.Namespace.Name
+		} else {
+			vaultSecretNamespace = "kube-system"
+		}
+
 		vaultInit = &vaultaddon.VaultInitializer{
 			Details:           *vault.Details(),
 			RootMount:         rootMount,
diff --git a/test/e2e/suite/issuers/vault/certificaterequest/approle.go b/test/e2e/suite/issuers/vault/certificaterequest/approle.go
index 721514323..ac2318edd 100644
--- a/test/e2e/suite/issuers/vault/certificaterequest/approle.go
+++ b/test/e2e/suite/issuers/vault/certificaterequest/approle.go
@@ -84,14 +84,15 @@ func runVaultAppRoleTests(issuerKind string) {
 	var vaultInit *vaultaddon.VaultInitializer
 
 	var vaultSecretNamespace string
-	if issuerKind == cmapi.IssuerKind {
-		vaultSecretNamespace = f.Namespace.Name
-	} else {
-		vaultSecretNamespace = "kube-system"
-	}
 
 	BeforeEach(func() {
 		By("Configuring the Vault server")
+		if issuerKind == cmapi.IssuerKind {
+			vaultSecretNamespace = f.Namespace.Name
+		} else {
+			vaultSecretNamespace = "kube-system"
+		}
+
 		vaultInit = &vaultaddon.VaultInitializer{
 			Details:           *vault.Details(),
 			RootMount:         rootMount,
diff --git a/test/e2e/suite/issuers/vault/certificaterequest/approle_custom_mount.go b/test/e2e/suite/issuers/vault/certificaterequest/approle_custom_mount.go
index 6214a96bd..598efa389 100644
--- a/test/e2e/suite/issuers/vault/certificaterequest/approle_custom_mount.go
+++ b/test/e2e/suite/issuers/vault/certificaterequest/approle_custom_mount.go
@@ -85,14 +85,16 @@ func runVaultCustomAppRoleTests(issuerKind string) {
 	var vaultInit *vaultaddon.VaultInitializer
 
 	var vaultSecretNamespace string
-	if issuerKind == cmapi.IssuerKind {
-		vaultSecretNamespace = f.Namespace.Name
-	} else {
-		vaultSecretNamespace = "kube-system"
-	}
 
 	BeforeEach(func() {
 		By("Configuring the Vault server")
+
+		if issuerKind == cmapi.IssuerKind {
+			vaultSecretNamespace = f.Namespace.Name
+		} else {
+			vaultSecretNamespace = "kube-system"
+		}
+
 		vaultInit = &vaultaddon.VaultInitializer{
 			Details:           *vault.Details(),
 			RootMount:         rootMount,