Fix HCPVS Helm integration tests (#363)

Ensure that the HCPVS Helm integration tests run correctly during the release.
hashicorp · Sep 19, 2023 · 3aae9b8 · 3aae9b8
1 parent aaf66df
commit 3aae9b8
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/test/integration/hcpvaultsecretsapp/terraform/main.tf b/test/integration/hcpvaultsecretsapp/terraform/main.tf
@@ -58,4 +58,6 @@ module "vso-helm" {
   enable_default_auth_method = false
   enable_default_connection  = false
   operator_helm_chart_path   = var.operator_helm_chart_path
+  operator_image_repo        = var.operator_image_repo
+  operator_image_tag         = var.operator_image_tag
 }
diff --git a/test/integration/hcpvaultsecretsapp/terraform/variables.tf b/test/integration/hcpvaultsecretsapp/terraform/variables.tf
@@ -43,3 +43,11 @@ variable "deploy_operator_via_helm" {
 variable "operator_helm_chart_path" {
   default = "../../../chart"
 }
+
+variable "operator_image_repo" {
+  default = "hashicorp/vault-secrets-operator"
+}
+
+variable "operator_image_tag" {
+  default = "0.0.0-dev"
+}
diff --git a/test/integration/hcpvaultsecretsapp_integration_test.go b/test/integration/hcpvaultsecretsapp_integration_test.go
@@ -108,10 +108,6 @@ func TestHCPVaultSecretsApp(t *testing.T) {
 		ContextName: k8sConfigContext,
 		Namespace:   operatorNS,
 	}
-	kustomizeConfigPath := filepath.Join(kustomizeConfigRoot, "default")
-	if !testWithHelm {
-		deployOperatorWithKustomize(t, k8sOpts, kustomizeConfigPath)
-	}
 
 	// Construct the terraform options with default retryable errors to handle the most common
 	// retryable errors in terraform testing.
@@ -131,6 +127,18 @@ func TestHCPVaultSecretsApp(t *testing.T) {
 		},
 	}
 
+	kustomizeConfigPath := filepath.Join(kustomizeConfigRoot, "default")
+	if !testWithHelm {
+		deployOperatorWithKustomize(t, k8sOpts, kustomizeConfigPath)
+	} else {
+		if operatorImageRepo != "" {
+			tfOptions.Vars["operator_image_repo"] = operatorImageRepo
+		}
+		if operatorImageTag != "" {
+			tfOptions.Vars["operator_image_tag"] = operatorImageTag
+		}
+	}
+
 	tfOptions = setCommonTFOptions(t, tfOptions)
 
 	skipCleanup := os.Getenv("SKIP_CLEANUP") != ""