fmt

lab/_envcommon/default-versions.hcl

@@ -8,7 +8,7 @@ locals {
   custom_service_eks_account = "${local.release_version}"
   eks_module_version         = "20.33.1"
   istio_ingress_version      = "${local.release_version}"
-  release_version            = "main" # "main" # change to main when testing updated modules
+  release_version            = "mcmCluster" # "main" # change to main when testing updated modules
 
   #####################
   # TF Providers

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

@@ -25,23 +25,23 @@ dependency "eks_dns" {
   config_path                             = "../eks-dns"
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
-    cluster_domain    = "mock.example.com"
+    cluster_domain = "mock.example.com"
   }
 }
 
 dependency "eks_grafana" {
   config_path                             = "../eks-grafana"
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
-    public_endpoint    = "mock.grafaba.example.com"
+    public_endpoint = "mock.grafaba.example.com"
   }
 }
 
 dependency "eks_keycloak" {
   config_path                             = "../eks-keycloak"
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
-    public_endpoint    = "mock.keycloak.example.com"
+    public_endpoint = "mock.keycloak.example.com"
   }
 }
 
@@ -63,15 +63,15 @@ inputs = {
   region         = include.root.inputs.aws_region
 
   # Gatekeeper Config
-  gogatekeeper_tag = include.root.inputs.gogatekeeper_tag
+  gogatekeeper_tag           = include.root.inputs.gogatekeeper_tag
   gogatekeeper_chart_version = include.root.inputs.gogatekeeper_chart_version
-  keycloak_public_url = dependency.eks_keycloak.outputs.public_endpoint
+  keycloak_public_url        = dependency.eks_keycloak.outputs.public_endpoint
 
   # Service Behind Gatekeeper Config
-  service_name           = "grafana"
+  service_name    = "grafana"
   redirection_url = dependency.eks_grafana.outputs.public_endpoint
   # client_id = dependency.eks_keycloak.outputs.client_id
   # client_secret = dependency.eks_keycloak.outputs.client_secret
-  client_id = "client_id"
+  client_id     = "client_id"
   client_secret = "client_secret"
 }

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

@@ -33,8 +33,8 @@ dependency "eks_loki" {
   config_path                             = "../eks-loki"
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
-    rwo_storage_class = "gp3-mocked"    
-    loki_internal_endpoint = {
+    rwo_storage_class = "gp3-mocked"
+    gateway_internal_endpoint = {
       url = "mock.loki.enpoint.example.com"
     }
   }

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

@@ -16,7 +16,6 @@ dependencies {
   paths = [
     "../eks",
     "../eks-config",
-    "../eks-dns",
     "../eks-grafana",
     "../eks-istio",
     "../eks-prometheus"

lab/development/us-gov-east-1/vpc/platform-eng-eks-srn/eks-keycloak/terragrunt.hcl

@@ -42,11 +42,15 @@ dependency "eks_postgresql" {
   config_path                             = "../eks-postgresql"
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
+<<<<<<< HEAD
 <<<<<<< HEAD
     internal_endpoint = {
 =======
     internal_endpoint = { 
 >>>>>>> 4d9a294 (deleted old cluster platform-eng-eks-test and created new cluster platform-eng-eks-srn)
+=======
+    internal_endpoint = {
+>>>>>>> 0a7b279 (fmt)
       url = "mock-internal-endpoint-url"
     }
   }
@@ -80,6 +84,7 @@ inputs = {
   telemetry_namespace    = include.root.inputs.telemetry_namespace
 
   # Database configuration
+<<<<<<< HEAD
 <<<<<<< HEAD
   db_host     = dependency.eks_postgresql.outputs.internal_endpoint.url
   db_name     = include.root.inputs.postgresql_database
@@ -91,6 +96,12 @@ inputs = {
   db_password = include.root.inputs.postgresql_password
   db_user = include.root.inputs.postgresql_username
 >>>>>>> 4d9a294 (deleted old cluster platform-eng-eks-test and created new cluster platform-eng-eks-srn)
+=======
+  db_host     = dependency.eks_postgresql.outputs.internal_endpoint.url
+  db_name     = include.root.inputs.postgresql_database
+  db_password = include.root.inputs.postgresql_password
+  db_user     = include.root.inputs.postgresql_username
+>>>>>>> 0a7b279 (fmt)
 
   # Project information
   project_name = include.root.inputs.project_name

lab/development/us-gov-east-1/vpc/platform-eng-eks-srn/eks-tempo/terragrunt.hcl

@@ -26,6 +26,7 @@ dependency "eks-prometheus" {
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     prometheus_svc       = "prometheus-server"
     prometheus_namespace = "prometheus"
@@ -38,6 +39,11 @@ dependency "eks-prometheus" {
     prometheus_namespace = "prometheus"
     prometheus_port = 80
 >>>>>>> 44e1884 (otel added)
+=======
+    prometheus_svc       = "prometheus-server"
+    prometheus_namespace = "prometheus"
+    prometheus_port      = 80
+>>>>>>> 0a7b279 (fmt)
     prometheus_server_internal_endpoint = {
       hostname    = "prometheus-server.prometheus.svc.cluster.local"
       port_number = 9090
@@ -76,13 +82,17 @@ inputs = {
 
   # Prometheus Configuration
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
   prometheus_svc       = dependency.eks-prometheus.outputs.prometheus_server_internal_endpoint.hostname
 =======
 >>>>>>> 4d9a294 (deleted old cluster platform-eng-eks-test and created new cluster platform-eng-eks-srn)
 =======
   prometheus_svc = dependency.eks-prometheus.outputs.prometheus_server_internal_endpoint.hostname
 >>>>>>> 44e1884 (otel added)
+=======
+  prometheus_svc       = dependency.eks-prometheus.outputs.prometheus_server_internal_endpoint.hostname
+>>>>>>> 0a7b279 (fmt)
   prometheus_namespace = dependency.eks-prometheus.outputs.prometheus_namespace
   prometheus_port      = dependency.eks-prometheus.outputs.prometheus_server_internal_endpoint.port_number