Merge pull request #12 from SCT-Engineering/helm_syntax

update for helm syntax
SCT-Engineering · Jun 25, 2025 · f178211 · f178211
2 parents 6fe5034 + 4543c9e
commit f178211
Show file tree

Hide file tree

Showing 2 changed files with 95 additions and 92 deletions.
diff --git a/README.md b/README.md
@@ -19,10 +19,10 @@ This module deploys and configures Kiali via its operator and integrates it with
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.94.1 |
-| <a name="provider_aws.eecr"></a> [aws.eecr](#provider\_aws.eecr) | 5.94.1 |
-| <a name="provider_helm"></a> [helm](#provider\_helm) | 2.17.0 |
-| <a name="provider_null"></a> [null](#provider\_null) | 3.2.3 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | 6.0.0 |
+| <a name="provider_aws.eecr"></a> [aws.eecr](#provider\_aws.eecr) | 6.0.0 |
+| <a name="provider_helm"></a> [helm](#provider\_helm) | 3.0.2 |
+| <a name="provider_null"></a> [null](#provider\_null) | 3.2.4 |
 
 ## Modules
 

diff --git a/main.tf b/main.tf
@@ -14,62 +14,63 @@ resource "helm_release" "kiali_operator" {
   name      = "kiali-operator"
   namespace = var.namespace
 
-  set {
-    name = "image.repo"
-    value = format("%v/%v",
-      module.images.images[local.kiali_operator_key].dest_registry,
-      module.images.images[local.kiali_operator_key].dest_repository
-    )
-  }
-  set {
-    name  = "image.tag"
-    value = module.images.images[local.kiali_operator_key].tag
-  }
-
-  set {
-    name  = "watchNamespace"
-    value = var.istio_namespace
-  }
-  set {
-    name  = "env[0].name"
-    value = "RELATED_IMAGE_kiali_default"
-  }
-  set {
-    name = "env[0].value"
-    value = format("%v/%v:%v",
-      module.images.images[local.kiali_server_key].dest_registry,
-      module.images.images[local.kiali_server_key].dest_repository,
-      module.images.images[local.kiali_server_key].tag
-    )
-  }
-  set {
-    name  = "publicHostname"
-    value = var.service_name
-  }
-  set {
-    name  = "publicDomain"
-    value = var.cluster_domain
-  }
-  set {
-    name  = "istioNamespace"
-    value = var.istio_namespace
-  }
-  set {
-    name  = "prometheus.url"
-    value = var.prometheus_internal_url
-  }
-  set {
-    name  = "grafana.externalUrl"
-    value = local.grafana_public_url
-  }
-  set {
-    name  = "grafana.internalUrl"
-    value = var.grafana_internal_url
-  }
-  set {
-    name  = "grafanaSecretName"
-    value = var.grafana_secret_name
-  }
+  set = [
+    {
+      name = "image.repo"
+      value = format("%v/%v",
+        module.images.images[local.kiali_operator_key].dest_registry,
+        module.images.images[local.kiali_operator_key].dest_repository
+      )
+    },
+    {
+      name  = "image.tag"
+      value = module.images.images[local.kiali_operator_key].tag
+    },
+    {
+      name  = "watchNamespace"
+      value = var.istio_namespace
+    },
+    {
+      name  = "env[0].name"
+      value = "RELATED_IMAGE_kiali_default"
+    },
+    {
+      name = "env[0].value"
+      value = format("%v/%v:%v",
+        module.images.images[local.kiali_server_key].dest_registry,
+        module.images.images[local.kiali_server_key].dest_repository,
+        module.images.images[local.kiali_server_key].tag
+      )
+    },
+    {
+      name  = "publicHostname"
+      value = var.service_name
+    },
+    {
+      name  = "publicDomain"
+      value = var.cluster_domain
+    },
+    {
+      name  = "istioNamespace"
+      value = var.istio_namespace
+    },
+    {
+      name  = "prometheus.url"
+      value = var.prometheus_internal_url
+    },
+    {
+      name  = "grafana.externalUrl"
+      value = local.grafana_public_url
+    },
+    {
+      name  = "grafana.internalUrl"
+      value = var.grafana_internal_url
+    },
+    {
+      name  = "grafanaSecretName"
+      value = var.grafana_secret_name
+    }
+  ]
 }
 
 resource "helm_release" "kiali" {
@@ -81,36 +82,38 @@ resource "helm_release" "kiali" {
   name      = "kiali"
   namespace = var.namespace
 
-  set {
-    name  = "auth.strategy"
-    value = "anonymous"
-  }
-  set {
-    name  = "deployment.view_only_mode"
-    value = true
-  }
-  set {
-    name  = "istioNamespace"
-    value = var.istio_namespace
-  }
-  set {
-    name  = "prometheus.url"
-    value = var.prometheus_internal_url
-  }
-  set {
-    name  = "grafana.externalUrl"
-    value = local.grafana_public_url
-  }
-  set {
-    name  = "grafana.internalUrl"
-    value = var.grafana_internal_url
-  }
-  set {
-    name  = "tracing.internalUrl"
-    value = var.tempo_internal_url
-  }
-  set {
-    name  = "tracing.tempo_config.datasource_uid"
-    value = var.tempo_datasource_id
-  }
+  set = [
+    {
+      name  = "auth.strategy"
+      value = "anonymous"
+    },
+    {
+      name  = "deployment.view_only_mode"
+      value = true
+    },
+    {
+      name  = "istioNamespace"
+      value = var.istio_namespace
+    },
+    {
+      name  = "prometheus.url"
+      value = var.prometheus_internal_url
+    },
+    {
+      name  = "grafana.externalUrl"
+      value = local.grafana_public_url
+    },
+    {
+      name  = "grafana.internalUrl"
+      value = var.grafana_internal_url
+    },
+    {
+      name  = "tracing.internalUrl"
+      value = var.tempo_internal_url
+    },
+    {
+      name  = "tracing.tempo_config.datasource_uid"
+      value = var.tempo_datasource_id
+    },
+  ]
 }