From 79a51c4e7d4fd2b891e2119a5ef784332400d603 Mon Sep 17 00:00:00 2001
From: Anthony Zawacki <anthony.c.zawacki@census.gov>
Date: Tue, 12 Sep 2023 10:38:46 -0400
Subject: [PATCH] Updating variables

---
 main.tf      |  2 +-
 outputs.tf   |  4 ++--
 variables.tf | 54 ----------------------------------------------------
 3 files changed, 3 insertions(+), 57 deletions(-)

diff --git a/main.tf b/main.tf
index 07983e2..69af1a9 100644
--- a/main.tf
+++ b/main.tf
@@ -86,7 +86,7 @@ resource "helm_release" "kiali-operator" {
   chart      = "kiali-operator"
   version    = var.kiali_operator_version
   name       = "kiali-operator"
-  namespace  = local.ns
+  namespace  = data.kubernetes_namespace.operators.metadata[0].name
   repository = "https://kiali.org/helm-charts"
 
   set {
diff --git a/outputs.tf b/outputs.tf
index 21d1432..acb206b 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -1,8 +1,8 @@
 
 output "kiali_public_url" {
-  value = format("https://kiali.%v/", var.cluster_domain)
+  value = local.kiali_public_url
 }
 
 output "kiali_internal_url" {
-  value = format("http://kiali.%v.svc.cluster.local:20001/", var.namespace)
+  value = local.kiali_internal_url
 }
diff --git a/variables.tf b/variables.tf
index 67859c8..d0b1e0e 100644
--- a/variables.tf
+++ b/variables.tf
@@ -12,18 +12,6 @@ variable "cluster_domain" {
   default     = ""
 }
 
-variable "enable_kiali" {
-  description = "Indicates if Kiali should be installed for managing the service mesh"
-  type        = bool
-  default     = true
-}
-
-variable "enable_jaeger" {
-  description = "Indicates if Jaegertracing should be installed to monitor api calls within the service mesh"
-  type        = bool
-  default     = true
-}
-
 variable "namespace" {
   description = "The namespace to create and into which the tools are deployed."
   default     = "istio-tools"
@@ -53,11 +41,6 @@ variable "grafana_namespace" {
   description = "The namespace holding the grafana instance, used to look up the grafana password."
 }
 
-variable "grafana_service_name" {
-  description = "The service name of the grafana instance."
-  default     = "grafana"
-}
-
 variable "grafana_secret_name" {
   description = "The secret in the <grafana_namespace> holding the grafana admin password."
 }
@@ -103,11 +86,6 @@ variable "kiali_hostname" {
   default     = "kiali"
 }
 
-variable "jaeger_hostname" {
-  description = "The hsotname to use for the jaegertracing deployment"
-  default     = "jaeger"
-}
-
 # helm repo add kiali https://kiali.org/helm-charts
 # helm search repo kiali/kiali-operator
 variable "kiali_operator_version" {
@@ -122,38 +100,6 @@ variable "kiali_application_version" {
   default     = "v1.73.0"
 }
 
-# helm repo add jaegertracing https://jaegertracing.github.io/helm-charts
-# helm search repo jaegertracing/jaeger-operator
-variable "jaeger_operator_version" {
-  description = "The version of jaegertracing to install"
-  default     = "2.46.2"
-}
-
-# See the [APP VERSION] found while determining jaeger_oeprator_version
-variable "jaeger_application_version" {
-  description = "The version of jaegertracing to install"
-  default     = "1.46.0"
-}
-
-# jaegertracing requires elasticsearch v7
-# opensearch is a fork of elasticsearch v7 with OSS licensing
-# hosted opensearch in govcloud is 2.7.0 as of 29 Aug 2023
-# helm repo add opensearch https://opensearch-project.github.io/helm-charts/
-# to match govcloud hosted opensearch
-# helm search repo opensearch/opensearch -l | grep '[[:space:]]2.7' | head -2
-# to find the latest version of opensearch
-# helm search repo opensearch/opensearch
-variable "opensearch_chart_version" {
-  description = "The version of opensearch to install"
-  default     = "2.14.1"
-}
-
-# The [APP VERSION] found while determining opensearch_chart_version
-variable "opensearch_version" {
-  description = "The version of opensearch to install"
-  default     = "2.9.0"
-}
-
 variable "gogatekeeper_chart_version" {
   description = "When SSO information is supplied, use this gogatekeeper chart version to protect kiali/jaeger"
   default     = null