update eks module renaming

.github/platform-tg-infra.code-workspace

@@ -8,6 +8,10 @@
 			"name": "tfmod-cert-mgr",
 			"path": "../../tfmod-cert-mgr"
 		},
+		{
+			"name": "tfmod-config-job",
+			"path": "../../tfmod-config-job"
+		},
 		{
 			"name": "tfmod-eks",
 			"path": "../../tfmod-eks"
@@ -64,6 +68,10 @@
 			"name": "tfmod-open-telemetry",
 			"path": "../../tfmod-open-telemetry"
 		},
+		{
+			"name": "tfmod-postgresql",
+			"path": "../../tfmod-postgresql"
+		},
 		{
 			"name": "tfmod-prometheus",
 			"path": "../../tfmod-prometheus"
@@ -79,10 +87,6 @@
 		{
 			"name": "terragrunt",
 			"path": "../../terragrunt"
-		},
-		{
-			"name": "tfmod-config-job",
-			"path": "../../tfmod-config-job"
 		}
 	]
 }

input_vars.hcl

@@ -0,0 +1,25 @@
+locals {
+  account_name                             = "lab-dev-ew"
+  aws_account_id                           = "224384469011"
+  aws_profile                              = "224384469011-lab-dev-gov"
+  aws_region                               = "us-gov-east-1"
+  cluster_endpoint_public_access           = true
+  cluster_mailing_list                     = "matthew.c.morgan@census.gov"
+  cluster_name                             = "platform-eng-eks-mcm"
+  eks_instance_disk_size                   = 100
+  eks_ng_desired_size                      = 2
+  eks_ng_max_size                          = 10
+  eks_ng_min_size                          = 2
+  enable_cluster_creator_admin_permissions = true
+  environment                              = "development"
+  environment_abbr                         = "dev"
+  organization                             = "census:ocio:csvd"
+  finops_project_name                      = "csvd_platformbaseline"
+  finops_project_number                    = "fs0000000078"
+  finops_project_role                      = "csvd_platformbaseline_app"
+  vpc_domain_name                          = "dev.lab.csp2.census.gov"
+  vpc_name                                 = "vpc3-lab-dev"
+  tags = {
+    "slim:schedule" = "8:00-17:00"
+  }
+}

lab/_envcommon/common-variables.hcl

@@ -6,12 +6,12 @@
 # that are common across all environments/accounts.
 # ---------------------------------------------------------------------------------------------------------------------
 locals {
-  organization        = "census:ocio:csvd"
-  project_name        = "csvd_platformbaseline"
-  project_number      = "fs0000000078"
-  project_role        = "csvd_platformbaseline_app"
-  state_bucket_prefix = "inf-tfstate"
-  state_table_name    = "tf_remote_state"
+  organization          = "census:ocio:csvd"
+  finops_project_name   = "csvd_platformbaseline"
+  finops_project_number = "fs0000000078"
+  finops_project_role   = "csvd_platformbaseline_app"
+  state_bucket_prefix   = "inf-tfstate"
+  state_table_name      = "tf_remote_state"
   route53_endpoints = {
     route53_main = {
       "account_id"    = "269244441389"

lab/_envcommon/default-versions.hcl

@@ -6,9 +6,9 @@ locals {
   #####################
   cluster_version            = "1.31"
   custom_service_eks_account = "${local.release_version}"
-  eks_module_version         = "20.33.1"
+  eks_module_version         = "20.34.0"
   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
@@ -47,13 +47,6 @@ locals {
   # EKS Config
   #####################
 
-  ################
-  # k8s-dashboard
-  ################
-  dashboard_hostname            = "dashboard"
-  k8s_dashboard_metrics_scraper = "1.0.8"
-  k8s_dashboard_version         = "6.0.6"
-
   ################
   # Cert-Manager
   ################
@@ -68,7 +61,7 @@ locals {
   ################
   # GoGatekeeper
   ################
-  gogatekeeper_tag           = "3.2.1"
+  gogatekeeper_tag           = "3.18.2"
   gogatekeeper_chart_version = "0.1.53"
 
   ################
@@ -89,15 +82,18 @@ locals {
   ################
   # k8s-dashboard
   ################
-  dashboard_hostname            = "dashboard"
-  k8s_dashboard_metrics_scraper = "1.0.8"
-  k8s_dashboard_version         = "6.0.6"
+  dashboard_hostname    = "dashboard"
+  k8s_dashboard_version = "7.11.1"
+  dashboard_api_tag     = "1.11.1"
+  dashboard_auth_tag    = "1.2.4"
+  dashboard_metrics_tag = "1.2.2"
+  dashboard_web_tag     = "1.6.2"
 
   ################
   # Karpenter
   ################
-  karpenter_helm_chart = "1.3.1"
-  karpenter_tag        = "1.3.1"
+  karpenter_helm_chart = "1.3.3"
+  karpenter_tag        = "1.3.3"
 
   ################
   # Keycloak
@@ -121,7 +117,7 @@ locals {
   ################
   loki_chart_version              = "6.27.0"
   loki_tag                        = "3.4.2"
-  enterprise_logs_provisioner_tag = "v1.7.0"
+  enterprise_logs_provisioner_tag = "3.4"
   gateway_tag                     = "1.27-alpine"
   memcached_tag                   = "1.6.37"
   exporter_tag                    = "v0.15.0"
@@ -138,7 +134,7 @@ locals {
   ################
   os_shell_tag             = "12"
   postgres_exporter_tag    = "0.16.0"
-  postgresql_repmgr_tag    = "17.4.0"
+  postgresql_repmgr_tag    = "17.4.0-alpine"
   pgpool_tag               = "4.5.5"
   postgresql_chart_version = "15.3.0"
 

lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/cluster.hcl

@@ -0,0 +1,13 @@
+locals {
+  # Cluster specific configuration
+  cluster_name           = "csvd-platform-lab-mcm"
+  cluster_mailing_list   = "matthew.c.morgan@census.gov"
+  eks_instance_disk_size = 100
+  eks_ng_desired_size    = 2
+  eks_ng_max_size        = 10
+  eks_ng_min_size        = 2
+  tags = {
+    "slim:schedule" = "8:00-17:00"
+    "cluster:size"  = "min:${local.eks_ng_min_size}-max:${local.eks_ng_max_size}-desired:${local.eks_ng_desired_size}"
+  }
+}

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

@@ -69,8 +69,4 @@ inputs = {
   keycloak_database = include.root.inputs.keycloak_database
   keycloak_user     = include.root.inputs.keycloak_username
   keycloak_password = include.root.inputs.keycloak_password
-
-  # Project information
-  project_name = include.root.inputs.project_name
-  tags         = include.root.inputs.tags
 }

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

@@ -33,7 +33,7 @@ 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"
   }
 }
 
@@ -52,8 +52,8 @@ dependency "eks_grafana" {
       port_number = "80"
       url         = "https://grafana.mock.lab.csp2.census.gov:80/"
     }
-    secret_name = "grafana"
-    tempo_datasource_id = "mock-tempo-datasource-id" 
+    secret_name         = "grafana"
+    tempo_datasource_id = "mock-tempo-datasource-id"
   }
 }
 
@@ -100,21 +100,21 @@ inputs = {
   region     = include.root.inputs.aws_region
 
   # Cluster Configuration
-  cluster_domain = dependency.eks_dns.outputs.cluster_domain
-  cluster_name   = dependency.eks.outputs.cluster_name
-  certificate_issuer  = dependency.eks_cert_manager.outputs.cluster_issuer_name
+  cluster_domain     = dependency.eks_dns.outputs.cluster_domain
+  cluster_name       = dependency.eks.outputs.cluster_name
+  certificate_issuer = dependency.eks_cert_manager.outputs.cluster_issuer_name
 
   # Kiali Configuration
   service_name         = "kiali"
-  namespace               = include.root.inputs.namespaces["kiali"]
-  istio_namespace         = include.root.inputs.namespaces["istio"]
+  namespace            = include.root.inputs.namespaces["kiali"]
+  istio_namespace      = include.root.inputs.namespaces["istio"]
   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
   grafana_public_url   = dependency.eks_grafana.outputs.public_endpoint
 
   kiali_application_version = include.root.inputs.kiali_application_version
-  kiali_operator_version = include.root.inputs.kiali_operator_version
+  kiali_operator_version    = include.root.inputs.kiali_operator_version
 
   prometheus_internal_url = dependency.eks_prometheus.outputs.prometheus_server_internal_endpoint.url
   grafana_namespace       = dependency.eks_grafana.outputs.namespace