need test

SCT-Engineering · Mar 17, 2025 · e946d7a · e946d7a
1 parent 689a0ed
commit e946d7a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 59 deletions.
diff --git a/copy_images.tf b/copy_images.tf
@@ -1,6 +1,6 @@
 locals {
-  kiali_operator_key     = format("%v#%v", "istio-tools/kiali-operator", var.kiali_application_version)
-  kiali_server_key       = format("%v#%v", "istio-tools/kiali", var.kiali_application_version)
+  kiali_operator_key = format("%v#%v", "istio-tools/kiali-operator", var.kiali_application_version)
+  kiali_server_key   = format("%v#%v", "istio-tools/kiali", var.kiali_application_version)
 
   image_config = [
     ## Images for Kiali

diff --git a/main.tf b/main.tf
@@ -4,21 +4,6 @@ locals {
   internal_url         = format("https://%s:%s/", local.internal_hostname, local.internal_port_number)
 }
 
-# data "kubernetes_secret" "grafana_admin" {
-#   metadata {
-#     name      = var.grafana_secret_name
-#     namespace = var.grafana_namespace
-#   }
-# }
-
-# data "kubernetes_namespace" "keycloak" {
-#   count = local.have_keycloak ? 1 : 0
-
-#   metadata {
-#     name = var.keycloak_namespace
-#   }
-# }
-
 resource "helm_release" "kiali_operator" {
   depends_on = [module.images]
   chart      = "kiali-operator"
@@ -38,7 +23,6 @@ resource "helm_release" "kiali_operator" {
     name  = "image.tag"
     value = module.images.images[local.kiali_operator_key].tag
   }
-
 
   set {
     name  = "watchNamespace"
@@ -49,7 +33,7 @@ resource "helm_release" "kiali_operator" {
     value = "RELATED_IMAGE_kiali_default"
   }
   set {
-    name  = "env[0].value"
+    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,
@@ -72,10 +56,6 @@ resource "helm_release" "kiali_operator" {
     name  = "prometheus.url"
     value = var.prometheus_internal_url
   }
-  # set {
-  #   name  = "jaegerInClusterUrl"
-  #   value = var.jaeger_internal_url
-  # }
   set {
     name  = "grafana.passwordKey"
     value = local.grafana_password_key
@@ -92,42 +72,6 @@ resource "helm_release" "kiali_operator" {
     name  = "grafanaSecretName"
     value = var.grafana_secret_name
   }
-
-  #  dynamic "set" {
-  #    for_each = local.have_keycloak ? ["openid"] : ["anonymous"]
-  #    content {
-  #      name  = "kialiAuthStrategy"
-  #      value = set.value
-  #    }
-  #  }
-  #  dynamic "set" {
-  #    for_each = local.have_keycloak ? [var.sso_client_id] : []
-  #    content {
-  #      name  = "openid.clientId"
-  #      value = set.value
-  #    }
-  #  }
-  #  dynamic "set" {
-  #    for_each = local.have_keycloak ? [var.sso_client_secret] : []
-  #    content {
-  #      name  = "openid.secret"
-  #      value = set.value
-  #    }
-  #  }
-  #  dynamic "set" {
-  #    for_each = local.have_keycloak ? [local.keycloak_issuer_uri] : []
-  #    content {
-  #      name  = "openid.issuerUri"
-  #      value = set.value
-  #    }
-  #  }
-  #  dynamic "set" {
-  #    for_each = local.have_keycloak ? ["username_claim"] : []
-  #    content {
-  #      name  = "openid.username_claim"
-  #      value = set.value
-  #    }
-  #  }
 }
 
 module "ingress_resources" {