update default-versions and common-variables gen

locals.tf

@@ -7,6 +7,7 @@ locals {
     state_bucket_prefix = "inf-tfstate"
     state_table_name    = "tf_remote_state"
     route53_endpoints   = {}
+    environment_abbr    = var.cluster_config.environment_abbr
   }, var.common_variables)
 
   # First define base namespaces without dependencies
@@ -39,11 +40,9 @@ locals {
   }
 
   default_versions = {
-    cluster_version            = var.versions.cluster_version
-    custom_service_eks_account = var.versions.release_version
-    eks_module_version         = var.versions.eks_module_version
-    istio_ingress_version      = var.versions.release_version
-    release_version            = var.versions.release_version
+    environment        = var.environment
+    cluster_version    = var.versions.cluster_version
+    eks_module_version = var.versions.eks_module_version
 
     # Provider versions
     aws_version        = var.versions.aws_version
@@ -54,15 +53,21 @@ locals {
     template_version   = var.versions.template_version
     tf_version         = var.versions.tf_version
 
+    # Namespace configuration
+    operator_namespace  = var.namespaces.operator_namespace
+    telemetry_namespace = var.namespaces.telemetry_namespace
+
     # Component versions
-    gogatekeeper_tag           = var.versions.gogatekeeper.tag
-    gogatekeeper_chart_version = var.versions.gogatekeeper.chart_version
+    cribl_chart_version = var.versions.cribl.chart_version
+    cribl_app_version   = var.versions.cribl.app_version
+
+    gatekeeper_tag           = var.versions.gogatekeeper.tag
+    gatekeeper_chart_version = var.versions.gogatekeeper.chart_version
 
     grafana_hostname               = var.versions.grafana.hostname
     grafana_operator_chart_version = var.versions.grafana.operator_chart_version
     grafana_operator_tag           = var.versions.grafana.operator_tag
     grafana_tag                    = var.versions.grafana.tag
-    os_shell_image_tag             = var.versions.grafana.os_shell_image_tag
 
     istio_version = var.versions.istio.version
 
@@ -71,14 +76,11 @@ locals {
 
     keycloak_chart_version = var.versions.keycloak.chart_version
     keycloak_tag           = var.versions.keycloak.tag
-    keycloak_hostname      = var.versions.keycloak.hostname
-    keycloak_database      = var.versions.keycloak.database
-    keycloak_username      = var.versions.keycloak.username
-    keycloak_password      = var.versions.keycloak.password
     postgresql_tag         = var.versions.keycloak.postgresql_tag
+    postgres_exporter_tag  = var.versions.postgres_exporter_tag
+    utilities_tag          = var.versions.utilities_tag
 
-    kiali_operator_version    = var.versions.kiali.operator_version
-    kiali_application_version = "v${var.versions.kiali.operator_version}"
+    kiali_operator_version = var.versions.kiali.operator_version
 
     loki_chart_version              = var.versions.loki.chart_version
     loki_tag                        = var.versions.loki.tag
@@ -88,6 +90,15 @@ locals {
     exporter_tag                    = var.versions.loki.exporter_tag
     sidecar_tag                     = var.versions.loki.sidecar_tag
 
+    auto_instrumentation_java_version = var.versions.otel.auto_instrumentation_java_version
+    collector_contrib_version         = var.versions.otel.collector_contrib_version
+    collector_version                 = var.versions.otel.collector_version
+    otel_helm_version                 = var.versions.otel.helm_version
+    otel_version                      = var.versions.otel.version
+    rbac_proxy_version                = var.versions.otel.rbac_proxy_version
+
+    postgresql_chart_version = var.versions.postgresql.chart_version
+
     prometheus_chart_version       = var.versions.prometheus.chart_version
     prometheus_server_tag          = var.versions.prometheus.server_tag
     prometheus_config_reloader_tag = var.versions.prometheus.config_reloader_tag
@@ -96,13 +107,7 @@ locals {
 
     tempo_chart_version = var.versions.tempo.chart_version
     tempo_tag           = var.versions.tempo.tag
-
-    # Add namespace configurations
-    operator_namespace  = var.namespaces.operator_namespace
-    telemetry_namespace = var.namespaces.telemetry_namespace
-    namespaces          = local.all_namespaces
   }
-
   managed_extra_files = concat([
     {
       path    = "_envcommon/default-versions.hcl"

main.tf

@@ -106,12 +106,13 @@ module "github_repo" {
   github_has_wiki     = true
   github_has_projects = true
 
-  managed_extra_files = [
+  managed_extra_files = concat([
     for path, content in local.rendered_files : {
       path    = path
       content = content
-    }
-  ]
+    }],
+  local.managed_extra_files)
+
   archive_on_destroy = false
   github_org_teams = [
     for team, permission in var.repository_teams : {

templates/common-variables.hcl

@@ -1,10 +1,70 @@
+# ${environment_abbr}/_envcommon/common-variables.hcl
+
+# ---------------------------------------------------------------------------------------------------------------------
+# GLOBAL PARAMETERS
+# These are the variables we pass to use across modules regardless of environment, i.e. these are the parameters
+# that are common across all environments/accounts.
+# ---------------------------------------------------------------------------------------------------------------------
 locals {
-  organization        = "${organization}"
-  project_name        = "${project_name}"
-  project_number      = "${project_number}"
-  project_role        = "${project_role}"
   state_bucket_prefix = "${state_bucket_prefix}"
   state_table_name    = "${state_table_name}"
+  environment_abbr    = "${environment_abbr}"
+
+  route53_endpoints = {
+    route53_main = {
+      "account_id"    = local.route53_info[local.environment_abbr]["account_id"]
+      "alias"         = local.route53_info[local.environment_abbr]["alias"]
+      "us-gov-east-1" = local.route53_info[local.environment_abbr]["us-gov-east-1"]
+      "us-gov-west-1" = local.route53_info[local.environment_abbr]["us-gov-west-1"]
+    }
+    route53_main_legacy = {
+      "account_id"    = local.route53_info["legacy"]["account_id"]
+      "alias"         = local.route53_info["legacy"]["alias"]
+      "us-gov-east-1" = local.route53_info["legacy"]["us-gov-east-1"]
+      "us-gov-west-1" = local.route53_info["legacy"]["us-gov-west-1"]
+    }
+  }
+
+  route53_info = {
+    lab = {
+      "account_id"    = "269244441389"
+      "alias"         = "lab-gov-network-nonprod"
+      "us-gov-east-1" = "vpc-070595c5b133243dd"
+      "us-gov-west-1" = "vpc-08b7b4db6a5ddf9c1"
+    }
+    prod = {
+      "account_id"    = "057405694017"
+      "alias"         = "ent-ew-network-prod"
+      "us-gov-east-1" = "vpc-061325b37d748d17a"
+      "us-gov-west-1" = "vpc-0b22b68b90e47cb5f"
+    }
+    legacy = {
+      "account_id"    = "107742151971"
+      "alias"         = "do2-govcloud"
+      "us-gov-east-1" = "vpc-099a991da7c4eb8a5"
+      "us-gov-west-1" = "vpc-77877a12"
+    }
+  }
+
+  enterprise_ecr_account = {
+    lab = {
+      "account_id" = "269222635945"
+      "alias"      = "lab-gov-shared-nonprod"
+      "profile"    = "269222635945-lab-gov-shared-nonprod"
+      "region"     = "us-gov-east-1"
+    }
+    prod = {
+      "account_id" = "067074201825"
+      "alias"      = "ent-gov-shared-prod"
+      "profile"    = "067074201825-ent-gov-shared-prod"
+      "region"     = "us-gov-east-1"
+    }
+  }
 
-  route53_endpoints   = ${jsonencode(route53_endpoints)}
+  eecr_info = {
+    account_id = local.enterprise_ecr_account[local.environment_abbr]["account_id"]
+    alias      = local.enterprise_ecr_account[local.environment_abbr]["alias"]
+    profile    = local.enterprise_ecr_account[local.environment_abbr]["profile"]
+    region     = local.enterprise_ecr_account[local.environment_abbr]["region"]
+  }
 }