diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl index ea7cc82f..ebb79488 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl @@ -47,6 +47,7 @@ inputs = { # Cert Manager Configuration cert_manager_helm_chart = include.root.inputs.cert_manager_helm_chart cluster_issuer_name = include.root.inputs.cluster_issuer_name + namespace = include.root.inputs.namespaces["cert-manager"] # Version Tags cert_manager_cainjector_tag = include.root.inputs.cert_manager_cainjector_tag diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl index 0dfc1d31..3e003aa9 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl @@ -49,5 +49,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-eng-eks-mcm/eks-grafana/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl index e6db8bb5..5f8200b3 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl @@ -58,5 +58,5 @@ inputs = { grafana_tag = include.root.inputs.grafana_tag download_dashboards_image_tag = include.root.inputs.download_dashboards_image_tag init_chown_data_image_tag = include.root.inputs.init_chown_data_image_tag - namespace = include.root.inputs.grafana_namespace + namespace = include.root.inputs.namespaces["grafana"] } diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl index 2d1d87aa..1c312166 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl @@ -39,6 +39,6 @@ inputs = { oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn # Istio Configuration - namespace = include.root.inputs.istio_namespace + namespace = include.root.inputs.namespaces["istio"] istio_version = include.root.inputs.istio_version } diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl index 6b553503..575bf9d7 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl @@ -41,5 +41,5 @@ inputs = { # Dashboard Configuration k8s_dashboard_version = include.root.inputs.k8s_dashboard_version - namespace = include.root.inputs.dashboard_hostname + namespace = include.root.inputs.namespaces["k8s-dashboard"] } diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl index 1ec3a41d..c6ab6043 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl @@ -46,4 +46,5 @@ inputs = { karpenter_tag = include.root.inputs.karpenter_tag karpenter_helm_chart = include.root.inputs.karpenter_helm_chart karpenter_node_group_name = dependency.eks.outputs.node_group_name + namespace = include.root.inputs.namespaces["karpenter"] } diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-keycloak/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-keycloak/terragrunt.hcl index 48992191..eb7eb9b1 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-keycloak/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-keycloak/terragrunt.hcl @@ -44,7 +44,7 @@ inputs = { cluster_domain = include.root.inputs.vpc_domain_name cluster_name = dependency.eks.outputs.cluster_name environment = include.root.inputs.environment - namespace = include.root.inputs.keycloak_namespace + namespace = include.root.inputs.namespaces["keycloak"] profile = include.root.inputs.aws_profile region = include.root.inputs.aws_region diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl index 96c225b2..5211b5e4 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl @@ -76,7 +76,7 @@ inputs = { profile = include.root.inputs.aws_profile cluster_domain = dependency.eks.inputs.vpc_domain_name - operators_namespace = "operators" + operators_namespace = include.root.inputs.operators_namespace 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 @@ -86,6 +86,7 @@ inputs = { # grafana_secret_name = "grafana" grafana_secret_name = dependency.eks-grafana.outputs.secret_name jaeger_internal_url = "" + namespace = include.root.inputs.namespaces["kiali"] # client_id = var.sso_client_id diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-loki/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-loki/terragrunt.hcl index b3849db5..8083c570 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-loki/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-loki/terragrunt.hcl @@ -51,5 +51,6 @@ inputs = { # Loki Configuration loki_chart_version = include.root.inputs.loki_chart_version loki_tag = include.root.inputs.loki_tag + namespace = include.root.inputs.namespaces["loki"] rwo_storage_class = dependency.eks-config.outputs.rwo_storage_class } diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-metrics-server/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-metrics-server/terragrunt.hcl index 4e4d198f..f3e57605 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-metrics-server/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-metrics-server/terragrunt.hcl @@ -39,4 +39,5 @@ inputs = { # Metrics Server Configuration 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-eng-eks-mcm/eks-prometheus/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-prometheus/terragrunt.hcl index 8b16a914..cf916f12 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-prometheus/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-prometheus/terragrunt.hcl @@ -50,11 +50,11 @@ inputs = { # Prometheus Configuration prometheus_chart_version = include.root.inputs.prometheus_chart_version - prometheus_namespace = include.root.inputs.prometheus_namespace prometheus_server_tag = include.root.inputs.prometheus_server_tag prometheus_config_reloader_tag = include.root.inputs.prometheus_config_reloader_tag alertmanager_tag = include.root.inputs.alertmanager_tag kube_state_metrics_tag = include.root.inputs.kube_state_metrics_tag + namespace = include.root.inputs.namespaces["prometheus"] node_exporter_tag = include.root.inputs.node_exporter_tag pushgateway_tag = include.root.inputs.pushgateway_tag rwo_storage_class = dependency.eks-config.outputs.rwo_storage_class diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-tempo/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-tempo/terragrunt.hcl index 45bd5ecf..074fdeea 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-tempo/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-tempo/terragrunt.hcl @@ -61,5 +61,6 @@ inputs = { # Tempo Configuration tempo_chart_version = include.root.inputs.tempo_chart_version tempo_tag = include.root.inputs.tempo_tag - namespace = include.root.inputs.tempo_namespace + namespace = include.root.inputs.namespaces["tempo"] + }