test(mc): Hard-code retina values for integration test

microsoft · Feb 6, 2025 · 25b31fb · 25b31fb
1 parent fa4c041
commit 25b31fb
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 57 deletions.
diff --git a/test/multicloud/examples/integration/prometheus-kind/variables.tf b/test/multicloud/examples/integration/prometheus-kind/variables.tf
@@ -29,19 +29,6 @@ variable "prometheus_chart_name" {
 }
 
 variable "prometheus_values" {
-  description = "Configuration for set blocks, this corresponds to Helm values.yaml"
-  type = list(object({
-    name  = string
-    value = string
-  }))
-  default = [
-    {
-      name  = "global.prometheus.enabled"
-      value = "true"
-    },
-    {
-      name  = "global.grafana.enabled"
-      value = "true"
-    }
-  ]
-}
+  description = "This corresponds to Helm values.yaml"
+  type        = list(string)
+}
diff --git a/test/multicloud/examples/integration/retina-gke/variables.tf b/test/multicloud/examples/integration/retina-gke/variables.tf
@@ -47,23 +47,6 @@ variable "retina_chart_name" {
 }
 
 variable "retina_values" {
-  description = "Configuration for set blocks, this corresponds to Helm values.yaml"
-  type = list(object({
-    name  = string
-    value = string
-  }))
-  default = [
-    {
-      name  = "image.tag"
-      value = "v0.0.24"
-    },
-    {
-      name  = "operator.tag"
-      value = "v0.0.24"
-    },
-    {
-      name  = "logLevel"
-      value = "info"
-    }
-  ]
+  description = "This corresponds to Helm values.yaml"
+  type        = list(string)
 }
diff --git a/test/multicloud/examples/integration/retina-kind/main.tf b/test/multicloud/examples/integration/retina-kind/main.tf
@@ -10,5 +10,15 @@ module "retina" {
   repository_url = var.retina_repository_url
   chart_version  = var.retina_chart_version
   chart_name     = var.retina_chart_name
-  values         = var.retina_values
+  values = [jsonencode(
+    {
+      image = {
+        tag = "v0.0.24"
+      }
+      logLevel = "info"
+      operator = {
+        tag = "v0.0.24"
+      }
+    }
+  )]
 }
diff --git a/test/multicloud/examples/integration/retina-kind/variables.tf b/test/multicloud/examples/integration/retina-kind/variables.tf
@@ -29,23 +29,7 @@ variable "retina_chart_name" {
 }
 
 variable "retina_values" {
-  description = "Configuration for set blocks, this corresponds to Helm values.yaml"
-  type = list(object({
-    name  = string
-    value = string
-  }))
-  default = [
-    {
-      name  = "image.tag"
-      value = "v0.0.24"
-    },
-    {
-      name  = "operator.tag"
-      value = "v0.0.24"
-    },
-    {
-      name  = "logLevel"
-      value = "info"
-    }
-  ]
-}
+  description = "This corresponds to Helm values.yaml"
+  type        = list(string)
+  default     = []
+}
diff --git a/test/multicloud/modules/helm-release/variables.tf b/test/multicloud/modules/helm-release/variables.tf
@@ -19,6 +19,6 @@ variable "chart_name" {
 }
 
 variable "values" {
-  description = "Configuration for set blocks, this corresponds to Helm values.yaml"
+  description = "This corresponds to Helm values.yaml"
   type        = list(string)
 }