From 6e460da79069a2b6c6e54b97dd7ef2a914909a48 Mon Sep 17 00:00:00 2001 From: mcgin314 Date: Thu, 27 Feb 2025 12:00:47 -0500 Subject: [PATCH] Namespace movement in initial telemetry work --- .../vpc/platform-test-z/cluster.hcl | 2 +- .../eks-cert-manager/terragrunt.hcl | 4 +- .../platform-test-z/eks-config/terragrunt.hcl | 9 ++-- .../eks-grafana/terragrunt.hcl | 4 +- .../platform-test-z/eks-istio/terragrunt.hcl | 4 +- .../eks-k8s-dashboard/terragrunt.hcl | 4 +- .../eks-karpenter/terragrunt.hcl | 4 +- ...{terragrunt.hcl.disable => terragrunt.hcl} | 43 ++++++++++++------- .../platform-test-z/eks-loki/terragrunt.hcl | 12 +++--- .../eks-metrics-server/terragrunt.hcl | 4 +- .../terragrunt.hcl} | 6 ++- .../eks-prometheus/terragrunt.hcl | 4 +- .../platform-test-z/eks-tempo/terragrunt.hcl | 5 ++- .../vpc/platform-test-z/eks/terragrunt.hcl | 3 +- 14 files changed, 72 insertions(+), 36 deletions(-) rename lab/development/us-gov-east-1/vpc/platform-test-z/eks-kiali/{terragrunt.hcl.disable => terragrunt.hcl} (67%) rename lab/development/us-gov-east-1/vpc/platform-test-z/{eks-open-telemetry-disable/terragrunt.hcl.disable => eks-open-telemetry/terragrunt.hcl} (78%) diff --git a/lab/development/us-gov-east-1/vpc/platform-test-z/cluster.hcl b/lab/development/us-gov-east-1/vpc/platform-test-z/cluster.hcl index 6b63e3d..740c1ad 100644 --- a/lab/development/us-gov-east-1/vpc/platform-test-z/cluster.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-test-z/cluster.hcl @@ -10,7 +10,7 @@ locals { eks_instance_disk_size = 100 eks_ng_desired_size = 3 eks_ng_max_size = 10 - eks_ng_min_size = 0 + eks_ng_min_size = 1 enable_cluster_creator_admin_permissions = true terraform = true terragrunt = true diff --git a/lab/development/us-gov-east-1/vpc/platform-test-z/eks-cert-manager/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-z/eks-cert-manager/terragrunt.hcl index a2e6077..926da7c 100644 --- a/lab/development/us-gov-east-1/vpc/platform-test-z/eks-cert-manager/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-test-z/eks-cert-manager/terragrunt.hcl @@ -5,7 +5,8 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=${include.root.inputs.release_version}" + # source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=${include.root.inputs.release_version}" + source = "../../../../../../../tfmod-cert-mgr" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] @@ -38,4 +39,5 @@ inputs = { profile = include.root.inputs.aws_profile region = include.root.inputs.aws_region release_version = include.root.inputs.release_version + namespace = include.root.inputs.namespaces["cert-manager"] } diff --git a/lab/development/us-gov-east-1/vpc/platform-test-z/eks-config/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-z/eks-config/terragrunt.hcl index ad0fbe2..c39d32e 100644 --- a/lab/development/us-gov-east-1/vpc/platform-test-z/eks-config/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-test-z/eks-config/terragrunt.hcl @@ -7,7 +7,8 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=${include.root.inputs.release_version}" + # source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=${include.root.inputs.release_version}" + source = "../../../../../../../tfmod-eks-configuration" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] @@ -32,7 +33,7 @@ generate "kubectl-provider" { path = "kubectl-provider.tf" if_exists = "overwrite" contents = <<-EOF - %{ if dependency.eks.outputs.cluster_name != "a-cluster-name" ~} + %{if dependency.eks.outputs.cluster_name != "a-cluster-name"~} data "aws_eks_cluster" "kubectl" { name = "${dependency.eks.outputs.cluster_name}" } @@ -48,7 +49,7 @@ generate "kubectl-provider" { args = ["eks", "get-token", "--cluster-name", "${dependency.eks.outputs.cluster_name}", "--region", "${include.root.inputs.aws_region}"] } } - %{ endif ~} + %{endif~} EOF } @@ -62,4 +63,6 @@ inputs = { security_group_all_worker_mgmt_id = dependency.eks.outputs.security_group_all_worker_mgmt_id subnets = dependency.eks.outputs.subnets vpc_id = dependency.eks.outputs.vpc_id + operators_ns = include.root.inputs.operator_namespace + telemetry_ns = include.root.inputs.telemetry_namespace } diff --git a/lab/development/us-gov-east-1/vpc/platform-test-z/eks-grafana/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-z/eks-grafana/terragrunt.hcl index cf4f29a..cd0b935 100644 --- a/lab/development/us-gov-east-1/vpc/platform-test-z/eks-grafana/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-test-z/eks-grafana/terragrunt.hcl @@ -5,7 +5,8 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-grafana.git?ref=${include.root.inputs.release_version}" + # source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-grafana.git?ref=${include.root.inputs.release_version}" + source = "../../../../../../../tfmod-grafana" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] @@ -37,4 +38,5 @@ inputs = { public_hostname = include.root.inputs.grafana_hostname region = include.root.inputs.aws_region rwo_storage_class = dependency.eks-loki.outputs.rwo_storage_class + namespace = include.root.inputs.namespaces["grafana"] } diff --git a/lab/development/us-gov-east-1/vpc/platform-test-z/eks-istio/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-z/eks-istio/terragrunt.hcl index 61ea560..7a591c5 100644 --- a/lab/development/us-gov-east-1/vpc/platform-test-z/eks-istio/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-test-z/eks-istio/terragrunt.hcl @@ -5,7 +5,8 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio.git?ref=${include.root.inputs.release_version}" + # source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio.git?ref=${include.root.inputs.release_version}" + source = "../../../../../../../tfmod-istio" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] @@ -30,4 +31,5 @@ inputs = { istio_version = include.root.inputs.istio_version profile = include.root.inputs.aws_profile region = include.root.inputs.aws_region + namespace = include.root.inputs.namespaces["istio"] } diff --git a/lab/development/us-gov-east-1/vpc/platform-test-z/eks-k8s-dashboard/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-z/eks-k8s-dashboard/terragrunt.hcl index ded7ad0..e56658b 100644 --- a/lab/development/us-gov-east-1/vpc/platform-test-z/eks-k8s-dashboard/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-test-z/eks-k8s-dashboard/terragrunt.hcl @@ -5,7 +5,8 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-k8s-dashboard.git?ref=${include.root.inputs.release_version}" + # source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-k8s-dashboard.git?ref=${include.root.inputs.release_version}" + source = "../../../../../../../tfmod-k8s-dashboard" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] @@ -33,4 +34,5 @@ inputs = { profile = include.root.inputs.aws_profile public_hostname = include.root.inputs.dashboard_hostname region = include.root.inputs.aws_region + namespace = include.root.inputs.namespaces["k8s-dashboard"] } diff --git a/lab/development/us-gov-east-1/vpc/platform-test-z/eks-karpenter/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-z/eks-karpenter/terragrunt.hcl index bbf116b..94d8489 100644 --- a/lab/development/us-gov-east-1/vpc/platform-test-z/eks-karpenter/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-test-z/eks-karpenter/terragrunt.hcl @@ -5,7 +5,8 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-karpenter.git?ref=${include.root.inputs.release_version}" + # source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-karpenter.git?ref=${include.root.inputs.release_version}" + source = "../../../../../../../tfmod-karpenter" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] @@ -39,4 +40,5 @@ inputs = { region = include.root.inputs.aws_region release_version = include.root.inputs.release_version vpc_id = dependency.eks.outputs.vpc_id + namespace = include.root.inputs.namespaces["karpenter"] } diff --git a/lab/development/us-gov-east-1/vpc/platform-test-z/eks-kiali/terragrunt.hcl.disable b/lab/development/us-gov-east-1/vpc/platform-test-z/eks-kiali/terragrunt.hcl similarity index 67% rename from lab/development/us-gov-east-1/vpc/platform-test-z/eks-kiali/terragrunt.hcl.disable rename to lab/development/us-gov-east-1/vpc/platform-test-z/eks-kiali/terragrunt.hcl index 1e04fe0..a2e2a0e 100644 --- a/lab/development/us-gov-east-1/vpc/platform-test-z/eks-kiali/terragrunt.hcl.disable +++ b/lab/development/us-gov-east-1/vpc/platform-test-z/eks-kiali/terragrunt.hcl @@ -5,8 +5,8 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-kiali.git?ref=${include.root.inputs.release_version}" - # source = "../../../../../../../tfmod-kiali" + # source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-kiali.git?ref=mcmCluster" + source = "../../../../../../../tfmod-kiali" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] @@ -35,6 +35,16 @@ dependency "eks-prometheus" { } } } +dependency "eks-tempo" { + config_path = "../eks-tempo" + mock_outputs = { + tempo_internal_endpoint = { + hostname = "tempo.tempo.svc.cluster.local" + port_number = 3100 + url = "http://tempo.tempo.svc.cluster.local:3100/" + } + } +} dependency "eks-grafana" { config_path = "../eks-grafana" mock_outputs = { @@ -43,32 +53,35 @@ dependency "eks-grafana" { port_number = "80" url = "https://grafana.grafana.svc.cluster.local:80/" } - namespace = "grafana" - public_endpoint = { + namespace = "grafana" + public_endpoint = { hostname = "grafana.dev.lab.csp2.census.gov" port_number = "80" url = "https://grafana.dev.lab.csp2.census.gov:80/" } - secret_name = "grafana" + secret_name = "grafana" } } inputs = { - kiali_operator_version = include.root.inputs.kiali_operator_version - kiali_application_version = include.root.inputs.kiali_application_version + profile = include.root.inputs.aws_profile + cluster_domain = dependency.eks.inputs.vpc_domain_name + operators_namespace = "operators" + cluster_name = dependency.eks.outputs.cluster_name + certificate_issuer = dependency.eks-cert-manager.outputs.cluster_issuer_name + + # istio_namespace = - profile = include.root.inputs.aws_profile - cluster_domain = dependency.eks.inputs.vpc_domain_name - operators_namespace = "operators" - cluster_name = dependency.eks.outputs.cluster_name - certificate_issuer = dependency.eks-cert-manager.outputs.cluster_issuer_name prometheus_internal_url = dependency.eks-prometheus.outputs.prometheus_server_internal_endpoint.url - grafana_internal_url = dependency.eks-grafana.outputs.internal_endpoint.url grafana_namespace = dependency.eks-grafana.outputs.namespace - grafana_public_url = dependency.eks-grafana.outputs.public_endpoint.url grafana_secret_name = "grafana" + grafana_internal_url = dependency.eks-grafana.outputs.internal_endpoint.url + + grafana_public_url = dependency.eks-grafana.outputs.public_endpoint.url + # grafana_secret_name = dependency.eks-grafana.outputs.secret_name - jaeger_internal_url = "" + tempo_internal_url = dependency.eks-tempo.outputs.tempo_internal_endpoint.url + namespace = include.root.inputs.namespaces["kiali"] # client_id = var.sso_client_id diff --git a/lab/development/us-gov-east-1/vpc/platform-test-z/eks-loki/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-z/eks-loki/terragrunt.hcl index 70b8b09..1aa60a3 100644 --- a/lab/development/us-gov-east-1/vpc/platform-test-z/eks-loki/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-test-z/eks-loki/terragrunt.hcl @@ -5,7 +5,8 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-loki.git?ref=${include.root.inputs.release_version}" + # source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-loki.git?ref=${include.root.inputs.release_version}" + source = "../../../../../../../tfmod-loki" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] @@ -25,10 +26,10 @@ dependency "eks-istio" { skip_outputs = true } -dependency "eks-prometheus" { - config_path = "../eks-prometheus" - skip_outputs = true -} +# dependency "eks-prometheus" { +# config_path = "../eks-prometheus" +# skip_outputs = true +# } inputs = { profile = include.root.inputs.aws_profile @@ -43,4 +44,5 @@ inputs = { memcached_tag = include.root.inputs.memcached_tag exporter_tag = include.root.inputs.exporter_tag sidecar_tag = include.root.inputs.sidecar_tag + namespace = include.root.inputs.namespaces["loki"] } diff --git a/lab/development/us-gov-east-1/vpc/platform-test-z/eks-metrics-server/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-z/eks-metrics-server/terragrunt.hcl index 387653b..a472aba 100644 --- a/lab/development/us-gov-east-1/vpc/platform-test-z/eks-metrics-server/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-test-z/eks-metrics-server/terragrunt.hcl @@ -5,7 +5,8 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-metrics-server.git?ref=${include.root.inputs.release_version}" + # source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-metrics-server.git?ref=${include.root.inputs.release_version}" + source = "../../../../../../../tfmod-metrics-server" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] @@ -30,4 +31,5 @@ inputs = { region = include.root.inputs.aws_region metrics_server_helm_chart = include.root.inputs.metrics_server_helm_chart metrics_server_tag = include.root.inputs.metrics_server_tag + namespace = include.root.inputs.namespaces["metrics-server"] } diff --git a/lab/development/us-gov-east-1/vpc/platform-test-z/eks-open-telemetry-disable/terragrunt.hcl.disable b/lab/development/us-gov-east-1/vpc/platform-test-z/eks-open-telemetry/terragrunt.hcl similarity index 78% rename from lab/development/us-gov-east-1/vpc/platform-test-z/eks-open-telemetry-disable/terragrunt.hcl.disable rename to lab/development/us-gov-east-1/vpc/platform-test-z/eks-open-telemetry/terragrunt.hcl index 354bb43..1f60ec6 100644 --- a/lab/development/us-gov-east-1/vpc/platform-test-z/eks-open-telemetry-disable/terragrunt.hcl.disable +++ b/lab/development/us-gov-east-1/vpc/platform-test-z/eks-open-telemetry/terragrunt.hcl @@ -1,6 +1,7 @@ include "root" { - path = find_in_parent_folders() - expose = true + path = find_in_parent_folders("root.hcl") + merge_strategy = "deep" + expose = true } terraform { @@ -23,4 +24,5 @@ inputs = { profile = include.root.inputs.aws_profile cluster_name = dependency.eks.outputs.cluster_name region = include.root.inputs.aws_region + namespace = include.root.inputs.namespaces["otel"] } diff --git a/lab/development/us-gov-east-1/vpc/platform-test-z/eks-prometheus/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-z/eks-prometheus/terragrunt.hcl index e6c54b1..030dd33 100644 --- a/lab/development/us-gov-east-1/vpc/platform-test-z/eks-prometheus/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-test-z/eks-prometheus/terragrunt.hcl @@ -5,7 +5,8 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-prometheus.git?ref=${include.root.inputs.release_version}" + # source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-prometheus.git?ref=${include.root.inputs.release_version}" + source = "../../../../../../../tfmod-prometheus" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] @@ -35,4 +36,5 @@ inputs = { kube_state_metrics_tag = include.root.inputs.kube_state_metrics_tag node_exporter_tag = include.root.inputs.node_exporter_tag pushgateway_tag = include.root.inputs.pushgateway_tag + namespace = include.root.inputs.namespaces["prometheus"] } diff --git a/lab/development/us-gov-east-1/vpc/platform-test-z/eks-tempo/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-z/eks-tempo/terragrunt.hcl index e9ebd48..d14c8a1 100644 --- a/lab/development/us-gov-east-1/vpc/platform-test-z/eks-tempo/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-test-z/eks-tempo/terragrunt.hcl @@ -5,7 +5,8 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-tempo.git?ref=${include.root.inputs.release_version}" + # source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-tempo.git?ref=${include.root.inputs.release_version}" + source = "../../../../../../../tfmod-tempo" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] @@ -42,5 +43,5 @@ inputs = { prometheus_namespace = dependency.eks-prometheus.outputs.prometheus_namespace tempo_chart_version = include.root.inputs.tempo_chart_version tempo_tag = include.root.inputs.tempo_tag - + namespace = include.root.inputs.namespaces["tempo"] } diff --git a/lab/development/us-gov-east-1/vpc/platform-test-z/eks/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-z/eks/terragrunt.hcl index ba46766..cff2547 100644 --- a/lab/development/us-gov-east-1/vpc/platform-test-z/eks/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-test-z/eks/terragrunt.hcl @@ -5,7 +5,8 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git?ref=${include.root.inputs.release_version}" + # source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git?ref=${include.root.inputs.release_version}" + source = "../../../../../../../tfmod-eks" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"]