Skip to content

Commit

Permalink
Minor code cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
mcgin314 committed Apr 10, 2025
1 parent 7b661bd commit e912f53
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 33 deletions.
23 changes: 1 addition & 22 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@ locals {
}

resource "helm_release" "kiali_operator" {
depends_on = [module.images]

chart = "kiali-operator"
version = var.kiali_operator_version
name = "kiali-operator"
namespace = var.namespace
repository = "./helm-charts-2.4.0"
# repository = "https://kiali.org/helm-charts"

set {
name = "image.repo"
Expand Down Expand Up @@ -74,7 +73,6 @@ resource "helm_release" "kiali_operator" {
resource "helm_release" "kiali" {
depends_on = [
helm_release.kiali_operator,
# module.preinstall,
]

chart = "./kiali-server"
Expand All @@ -97,14 +95,6 @@ resource "helm_release" "kiali" {
name = "prometheus.url"
value = var.prometheus_internal_url
}
# set {
# name = "grafana.secretName"
# value = var.grafana_secret_name
# }
# set {
# name = "grafana.passwordKey"
# value = local.grafana_password_key
# }
set {
name = "grafana.externalUrl"
value = var.grafana_public_url
Expand All @@ -122,14 +112,3 @@ resource "helm_release" "kiali" {
value = var.tempo_datasource_id
}
}

# module "ingress_resources" {
# depends_on = [helm_release.kiali_operator]
# # tflint-ignore: terraform_module_pinned_source
# source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio-service-ingress.git?ref=main"
# public_hostname = var.service_name
# public_domain = var.cluster_domain
# service_name = var.service_name
# service_namespace = var.namespace
# service_port = local.internal_port_number
# }
11 changes: 0 additions & 11 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,6 @@ variable "tempo_datasource_id" {
type = string
}

# variable "jaeger_internal_url" {
# description = "The url within the cluster to use to query the jaegertracing."
# type = string
# }

# variable "public_hostname" {
# description = "The hostname to use for kiali that will be publicly available"
# type = string
# default = "kiali"
# }

# helm repo add kiali https://kiali.org/helm-charts
# helm search repo kiali/kiali-operator
variable "kiali_operator_version" {
Expand Down

0 comments on commit e912f53

Please sign in to comment.