fmt

lab/_envcommon/default-versions.hcl

@@ -28,11 +28,12 @@ locals {
     cert-manager   = "kube-system"
     karpenter      = "kube-system"
     metrics-server = "kube-system"
+    postgresql     = "kube-system"
+    keylcloak      = "kube-system"
     istio          = "istio-system"
     kiali          = "istio-system"
     grafana        = local.telemetry_namespace
     k8s-dashboard  = local.telemetry_namespace
-    kiali          = local.telemetry_namespace
     loki           = local.telemetry_namespace
     otel           = local.telemetry_namespace
     prometheus     = local.telemetry_namespace

lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl

@@ -59,5 +59,5 @@ inputs = {
   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.namespaces["grafana"]
-  service_name = "grafana"
+  service_name                  = "grafana"
 }

lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl

@@ -5,7 +5,7 @@ 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=mcmCluster"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20s"]
@@ -29,17 +29,27 @@ dependency "eks" {
   }
 }
 
+dependency "eks_dns" {
+  config_path                             = "../eks-dns"
+  mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
+  mock_outputs = {
+    cluster_domain    = "mock.example.com"
+    oidc_provider_arn = "arn:aws-us-gov:iam::123456789012:oidc-provider/mock"
+  }
+}
+
 inputs = {
   # AWS Configuration
   account_id = include.root.inputs.aws_account_id
   profile    = include.root.inputs.aws_profile
   region     = include.root.inputs.aws_region
 
   # Cluster Configuration
-  cluster_domain = include.root.inputs.vpc_domain_name
+  cluster_domain = dependency.eks_dns.outputs.cluster_domain
   cluster_name   = dependency.eks.outputs.cluster_name
 
   # Dashboard Configuration
+  service_name          = include.root.inputs.dashboard_hostname
   k8s_dashboard_version = include.root.inputs.k8s_dashboard_version
   namespace             = include.root.inputs.namespaces["k8s-dashboard"]
 }

lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl

@@ -58,13 +58,13 @@ dependency "eks_grafana" {
       port_number = "80"
       url         = "https://grafana.mock.svc.cluster.local:80/"
     }
-    namespace         = "grafana"
-    public_endpoint   = {
+    namespace = "grafana"
+    public_endpoint = {
       hostname    = "grafana.mock.lab.csp2.census.gov"
       port_number = "80"
       url         = "https://grafana.mock.lab.csp2.census.gov:80/"
     }
-    secret_name       = "grafana"
+    secret_name = "grafana"
   }
 }
 
@@ -95,8 +95,8 @@ inputs = {
   cluster_name   = dependency.eks.outputs.cluster_name
 
   # Kiali Configuration
-  service_name = "kiali"
-  namespace = include.root.inputs.namespaces["kiali"]
+  service_name         = "kiali"
+  namespace            = include.root.inputs.namespaces["kiali"]
   grafana_internal_url = dependency.eks_grafana.outputs.internal_endpoint.url
   grafana_namespace    = dependency.eks_grafana.outputs.namespace
   grafana_secret_name  = dependency.eks_grafana.outputs.secret_name

lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-postgresql/terragrunt.hcl

@@ -0,0 +1,56 @@
+include "root" {
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
+}
+
+terraform {
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-postgresql.git?ref=main"
+  extra_arguments "retry_lock" {
+    commands  = get_terraform_commands_that_need_locking()
+    arguments = ["-lock-timeout=20s"]
+  }
+}
+
+dependencies {
+  paths = [
+    "../eks",
+    "../eks-config",
+    "../eks-dns"
+  ]
+}
+
+dependency "eks" {
+  config_path                             = "../eks"
+  mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
+  mock_outputs = {
+    cluster_name      = include.root.inputs.cluster_name
+    oidc_provider_arn = "arn:aws-us-gov:iam::123456789012:oidc-provider/mock"
+  }
+}
+
+dependency "eks_dns" {
+  config_path                             = "../eks-dns"
+  mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
+  mock_outputs = {
+    cluster_domain    = "mock.example.com"
+    oidc_provider_arn = "arn:aws-us-gov:iam::123456789012:oidc-provider/mock"
+  }
+}
+
+inputs = {
+  # AWS Configuration
+  account_id = include.root.inputs.aws_account_id
+  profile    = include.root.inputs.aws_profile
+  region     = include.root.inputs.aws_region
+
+  # Cluster Configuration
+  cluster_domain = dependency.eks_dns.outputs.cluster_domain
+  cluster_name   = dependency.eks.outputs.cluster_name
+
+  # PostgreSQL Configuration
+  service_name       = include.root.inputs.postgresql_name
+  postgresql_version = include.root.inputs.postgresql_version
+
+  namespace = include.root.inputs.namespaces["postgresql"]
+}