From 1e8d5ad06912a984fc4839e4f9ac752ac08dd367 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Wed, 16 Apr 2025 20:39:50 -0400 Subject: [PATCH] add enterprise ecr stuff --- lab/_envcommon/common-variables.hcl | 8 ++++++++ lab/_envcommon/default-versions.hcl | 20 +++++++++---------- .../vpc/csvd-platform-lab-mcm/cluster.hcl | 2 +- .../eks-cert-manager/terragrunt.hcl | 1 + .../eks-config/terragrunt.hcl | 1 + .../eks-dns/terragrunt.hcl | 1 + .../eks-gogatekeeper/terragrunt.hcl | 1 + .../eks-grafana/terragrunt.hcl | 1 + .../eks-istio/terragrunt.hcl | 1 + .../eks-k8s-dashboard/terragrunt.hcl | 1 + .../eks-karpenter/terragrunt.hcl | 1 + .../eks-keycloak/terragrunt.hcl | 1 + .../eks-kiali/terragrunt.hcl | 1 + .../eks-loki/terragrunt.hcl | 1 + .../eks-metrics-server/terragrunt.hcl | 1 + .../eks-otel/terragrunt.hcl | 1 + .../eks-prometheus/terragrunt.hcl | 1 + .../eks-tempo/terragrunt.hcl | 1 + lab/root.hcl | 1 + 19 files changed, 35 insertions(+), 11 deletions(-) diff --git a/lab/_envcommon/common-variables.hcl b/lab/_envcommon/common-variables.hcl index a636927..3979206 100644 --- 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 index 37f1b7c..62c84e9 100644 --- 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,6 +22,7 @@ locals { "eks-config", "eks-metrics-server", "eks-cert-manager", + "eks-istio", "eks-dns", ] @@ -28,17 +30,15 @@ locals { 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 index 3b78feb..6ae2809 100644 --- 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 index bee2ddb..cfb8682 100644 --- 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 index 49e0ea2..3d02850 100644 --- 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 index 62d93af..5ffff3e 100644 --- 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 index 184876d..830e664 100644 --- 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 index 850d726..7987770 100644 --- 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 index 7b4817b..5aa93f0 100644 --- 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 index 65b3bd3..9d23411 100644 --- 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 index e53c67f..83f3c5c 100644 --- 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 index 6a2248f..c2d06b7 100644 --- 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 index 8898085..d669908 100644 --- 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 index a0226b3..74630ea 100644 --- 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 index 1d784c6..4a4f34e 100644 --- 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 index ee0497b..d1bcdb8 100644 --- 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 index 11c7262..551e2ab 100644 --- 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 index 6b7fcb4..d2bdc31 100644 --- 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 index 43ee0ef..4ea2332 100644 --- 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