add enterprise ecr stuff

SCT-Engineering · Apr 17, 2025 · 1e8d5ad · 1e8d5ad
1 parent a604bba
commit 1e8d5ad
Show file tree

Hide file tree

Showing 19 changed files with 35 additions and 11 deletions.
diff --git a/lab/_envcommon/common-variables.hcl b/lab/_envcommon/common-variables.hcl
@@ -20,4 +20,12 @@ locals {
       "us-gov-west-1" = "vpc-08b7b4db6a5ddf9c1"
     }
   }
+  enterprise_ecr_account = {
+    lab = {
+      account_id = "269222635945"
+    }
+    prod = {
+      account_id = "067074201825"
+    }
+  }
 }
diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl
@@ -10,6 +10,7 @@ locals {
   istio_ingress_version      = "${local.release_version}"
   release_version            = "mcmCluster" # "main"
 
+
   #####################
   # Module Enablement
   #####################
@@ -21,24 +22,23 @@ locals {
     "eks-config",
     "eks-metrics-server", 
     "eks-cert-manager",
+    "eks-istio",
     "eks-dns",
   ]
 
   # Optional modules with their default enablement state
   enabled_modules = {
     "eks-arcgis"        = false
     "eks-gogatekeeper"  = false
-    "eks-grafana"       = true
-    "eks-istio"         = true
-    "eks-k8s-dashboard" = true
-    "eks-karpenter"     = true
-    "eks-keycloak"      = true
-    "eks-kiali"         = true
-    "eks-loki"          = true
-    "eks-otel"          = true
+    "eks-grafana"       = false
+    "eks-k8s-dashboard" = false
+    "eks-keycloak"      = false
+    "eks-kiali"         = false
+    "eks-loki"          = false
+    "eks-otel"          = false
     "eks-postgresql"    = false
-    "eks-prometheus"    = true
-    "eks-tempo"         = true
+    "eks-prometheus"    = false
+    "eks-tempo"         = false
   }
 
   #####################

diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/cluster.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/cluster.hcl
@@ -11,6 +11,6 @@ locals {
     "cluster:size"  = "min:${local.eks_ng_min_size}-max:${local.eks_ng_max_size}-desired:${local.eks_ng_desired_size}"
   }
   module_enablement_overrides = {
-    "eks-arcgis"      = true
+    "eks-arcgis"      = false
   }
 }
diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-cert-manager/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-cert-manager/terragrunt.hcl
@@ -50,6 +50,7 @@ inputs = {
   account_id = include.root.inputs.aws_account_id
   profile    = include.root.inputs.aws_profile
   region     = include.root.inputs.aws_region
+  eecr_account_id = include.root.inputs.eecr_account_id
 
   # Cluster Configuration
   cluster_name         = dependency.eks.outputs.cluster_name

diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-config/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-config/terragrunt.hcl
@@ -53,6 +53,7 @@ inputs = {
   account_id = include.root.inputs.aws_account_id
   profile    = include.root.inputs.aws_profile
   region     = include.root.inputs.aws_region
+  eecr_account_id = include.root.inputs.eecr_account_id
 
   # Core Cluster Configuration
   cluster_name                                    = dependency.eks.outputs.cluster_name

diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-dns/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-dns/terragrunt.hcl
@@ -56,6 +56,7 @@ inputs = {
   account_id = include.root.inputs.aws_account_id
   profile    = include.root.inputs.aws_profile
   region     = include.root.inputs.aws_region
+  eecr_account_id = include.root.inputs.eecr_account_id
 
   # Cluster Configuration
   cluster_name = include.root.inputs.cluster_name

diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-gogatekeeper/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-gogatekeeper/terragrunt.hcl
@@ -72,6 +72,7 @@ dependencies {
 inputs = {
   # Base Cluster Config
   cluster_domain = dependency.eks_dns.outputs.cluster_domain
+  eecr_account_id = include.root.inputs.eecr_account_id
   namespace      = include.root.inputs.namespaces["gogatekeeper"]
   profile        = include.root.inputs.aws_profile
   region         = include.root.inputs.aws_region

diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-grafana/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-grafana/terragrunt.hcl
@@ -87,6 +87,7 @@ dependencies {
 inputs = {
   # AWS Configuration
   account_id = include.root.inputs.aws_account_id
+  eecr_account_id = include.root.inputs.eecr_account_id
   profile    = include.root.inputs.aws_profile
   region     = include.root.inputs.aws_region
 

diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-istio/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-istio/terragrunt.hcl
@@ -42,6 +42,7 @@ dependency "eks" {
 inputs = {
   # AWS Configuration
   account_id = include.root.inputs.aws_account_id
+  eecr_account_id = include.root.inputs.eecr_account_id
   profile    = include.root.inputs.aws_profile
   region     = include.root.inputs.aws_region
 

diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-k8s-dashboard/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-k8s-dashboard/terragrunt.hcl
@@ -57,6 +57,7 @@ inputs = {
   # Cluster Configuration
   cluster_domain = dependency.eks_dns.outputs.cluster_domain
   cluster_name   = dependency.eks.outputs.cluster_name
+  eecr_account_id = include.root.inputs.eecr_account_id
 
   # Dashboard Configuration
   service_name          = include.root.inputs.dashboard_hostname

diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-karpenter/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-karpenter/terragrunt.hcl
@@ -49,6 +49,7 @@ inputs = {
   account_id = include.root.inputs.aws_account_id
   profile    = include.root.inputs.aws_profile
   region     = include.root.inputs.aws_region
+  eecr_account_id = include.root.inputs.eecr_account_id
 
   # Cluster Configuration
   cluster_endpoint  = dependency.eks.outputs.cluster_endpoint

diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-keycloak/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-keycloak/terragrunt.hcl
@@ -60,6 +60,7 @@ dependencies {
 inputs = {
   cluster_domain = dependency.eks_dns.outputs.cluster_domain
   cluster_name   = dependency.eks.outputs.cluster_name
+  eecr_account_id = include.root.inputs.eecr_account_id
 
   namespace = include.root.inputs.namespaces["keycloak"]
   # AWS Configuration

diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-kiali/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-kiali/terragrunt.hcl
@@ -107,6 +107,7 @@ dependencies {
 inputs = {
   # AWS Configuration
   account_id = include.root.inputs.aws_account_id
+  eecr_account_id = include.root.inputs.eecr_account_id
   profile    = include.root.inputs.aws_profile
   region     = include.root.inputs.aws_region
 

diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-loki/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-loki/terragrunt.hcl
@@ -51,6 +51,7 @@ dependencies {
 inputs = {
   # AWS Configuration
   account_id = include.root.inputs.aws_account_id
+  eecr_account_id = include.root.inputs.eecr_account_id
   profile    = include.root.inputs.aws_profile
   region     = include.root.inputs.aws_region
 

diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-metrics-server/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-metrics-server/terragrunt.hcl
@@ -40,6 +40,7 @@ dependencies {
 inputs = {
   # AWS Configuration
   account_id = include.root.inputs.aws_account_id
+  eecr_account_id = include.root.inputs.eecr_account_id
   profile    = include.root.inputs.aws_profile
   region     = include.root.inputs.aws_region
 

diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-otel/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-otel/terragrunt.hcl
@@ -65,6 +65,7 @@ dependencies {
 inputs = {
   # AWS Configuration
   account_id = include.root.inputs.aws_account_id
+  eecr_account_id = include.root.inputs.eecr_account_id
   profile    = include.root.inputs.aws_profile
   region     = include.root.inputs.aws_region
 

diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-prometheus/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-prometheus/terragrunt.hcl
@@ -51,6 +51,7 @@ dependency "eks_config" {
 inputs = {
   # AWS Configuration
   account_id = include.root.inputs.aws_account_id
+  eecr_account_id = include.root.inputs.eecr_account_id
   profile    = include.root.inputs.aws_profile
   region     = include.root.inputs.aws_region
 

diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-tempo/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-tempo/terragrunt.hcl
@@ -55,6 +55,7 @@ dependencies {
 inputs = {
   # AWS Configuration
   account_id = include.root.inputs.aws_account_id
+  eecr_account_id = include.root.inputs.eecr_account_id
   profile    = include.root.inputs.aws_profile
   region     = include.root.inputs.aws_region
 

diff --git a/lab/root.hcl b/lab/root.hcl
@@ -31,6 +31,7 @@ locals {
   aws_region            = local.region_vars.locals.aws_region
   cluster_name          = local.cluster_vars.locals.cluster_name
   environment_abbr      = local.account_vars.locals.environment_abbr
+  eecr_account_id       = local.common_vars.locals.enterprise_ecr_account.lab.account_id
   finops_project_name   = local.common_vars.locals.finops_project_name
   finops_project_number = local.common_vars.locals.finops_project_number
   finops_project_role   = local.common_vars.locals.finops_project_role