make certs work

SCT-Engineering · Feb 21, 2025 · a8929e3 · a8929e3
1 parent 1125cc3
commit a8929e3
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 18 deletions.
diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl
@@ -29,7 +29,7 @@ locals {
   ################
   # k8s-dashboard
   ################
-  dashboard_hostname            = "dashboard"
+  dashboard_hostname            = "k8s-dashboard"
   k8s_dashboard_metrics_scraper = "1.0.8"
   k8s_dashboard_version         = "6.0.6"
 
@@ -94,6 +94,7 @@ locals {
   # Prometheus
   ################
   prometheus_chart_version       = "25.26.0"
+  prometheus_namespace           = "prometheus"
   prometheus_server_tag          = "v2.54.0"
   prometheus_config_reloader_tag = "v0.75.2"
   alertmanager_tag               = "v0.27.0"
@@ -105,5 +106,6 @@ locals {
   # Tempo
   ################
   tempo_chart_version = "1.18.1"
+  tempo_namespace     = "tempo"
   tempo_tag           = "2.7.0"
 }
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl
@@ -5,7 +5,7 @@ include "root" {
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-dns.git?ref=${include.root.inputs.release_version}"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-dns.git?ref=explictProvider"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]

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
@@ -5,7 +5,7 @@ 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=cert_clash"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -16,7 +16,7 @@ dependency "eks" {
   config_path                             = "../eks"
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
-    cluster_name      = "mock-cluster"
+    cluster_name      = include.root.inputs.cluster_name
     oidc_provider_arn = "arn:aws-us-gov:iam::123456789012:oidc-provider/mock"
   }
 }
@@ -59,6 +59,4 @@ 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.grafana_namespace
-  public_hostname               = include.root.inputs.grafana_hostname
 }
-
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
@@ -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=cert_clash"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -29,25 +29,17 @@ 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 = dependency.eks-dns.outputs.cluster_domain
+  cluster_domain = include.root.inputs.vpc_domain_name
   cluster_name   = dependency.eks.outputs.cluster_name
 
   # Dashboard Configuration
   k8s_dashboard_version = include.root.inputs.k8s_dashboard_version
+  namespace = include.root.inputs.dashboard_hostname
 }
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
@@ -29,7 +29,7 @@ dependency "eks-config" {
 }
 
 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=read_fix"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]

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
@@ -48,6 +48,7 @@ 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

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
@@ -61,4 +61,5 @@ 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
 }