diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/common_vars.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/common_vars.hcl index e39a94d..d18706e 100644 --- a/lab/us-gov-east-1/vpc/_mcmCluster/common_vars.hcl +++ b/lab/us-gov-east-1/vpc/_mcmCluster/common_vars.hcl @@ -25,8 +25,8 @@ locals { #################################################### # Information about the VPC in which artifacts are being created - vpc_name = "vpc3-lab-dev" - + vpc_name = "vpc3-lab-dev" + #################################################### ## EKS Configuration #################################################### diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-cert-manager/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-cert-manager/terragrunt.hcl index 9f6ecbd..8ee88b3 100644 --- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-cert-manager/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-cert-manager/terragrunt.hcl @@ -14,24 +14,19 @@ dependency "eks" { config_path = "../eks" } dependency "eks-config" { - config_path = "../eks-config" - skip_outputs = true -} -dependency "eks-istio" { - config_path = "../eks-istio" - skip_outputs = true + config_path = "../eks-config" } inputs = { - cluster_name = dependency.eks.inputs.cluster_name - cluster_mailing_list = dependency.eks.inputs.creator - oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn - profile = dependency.eks.inputs.profile - region = dependency.eks.inputs.region - cert_manager-helm_chart = "1.15.1" - cert_manager-cainjector_tag = "v1.15.1" - cert_manager-controller_tag = "v1.15.1" + cluster_name = dependency.eks.inputs.cluster_name + cluster_mailing_list = dependency.eks.inputs.creator + oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn + profile = dependency.eks.inputs.profile + region = dependency.eks.inputs.region + cert_manager-helm_chart = "1.15.1" + cert_manager-cainjector_tag = "v1.15.1" + cert_manager-controller_tag = "v1.15.1" cert_manager-startupapicheck_tag = "v1.15.1" - cert_manager-webhook_tag = "v1.15.1" - namespace = "cert-manager" + cert_manager-webhook_tag = "v1.15.1" + namespace = "cert-manager" } diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-cloudwatch/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-cloudwatch/terragrunt.hcl index a146a03..4eed770 100644 --- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-cloudwatch/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-cloudwatch/terragrunt.hcl @@ -22,9 +22,9 @@ dependency "eks-config" { } inputs = { - cluster_name = dependency.eks.inputs.cluster_name + cluster_name = dependency.eks.inputs.cluster_name tag_costallocation = local.tag_costallocation - oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn - region = dependency.eks.inputs.region - profile = dependency.eks.inputs.profile + oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn + region = dependency.eks.inputs.region + profile = dependency.eks.inputs.profile } diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-config/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-config/terragrunt.hcl index b350902..9b316e7 100644 --- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-config/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-config/terragrunt.hcl @@ -23,9 +23,9 @@ dependency "eks-karpenter" { } inputs = { - profile = dependency.eks.inputs.profile - vpc_id = dependency.eks.outputs.vpc_id - cluster_name = dependency.eks.inputs.cluster_name + profile = dependency.eks.inputs.profile + vpc_id = dependency.eks.outputs.vpc_id + cluster_name = dependency.eks.inputs.cluster_name # cluster_autoscaler_role_name = dependency.eks.outputs.cluster_autoscaler_role_name subnets = dependency.eks.outputs.subnets security_group_all_worker_mgmt_id = dependency.eks.outputs.security_group_all_worker_mgmt_id diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-grafana/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-grafana/terragrunt.hcl index 289a888..e205934 100644 --- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-grafana/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-grafana/terragrunt.hcl @@ -23,10 +23,10 @@ dependency "eks-cert-manager" { } inputs = { - profile = dependency.eks.inputs.profile - cluster_name = dependency.eks.inputs.cluster_name - region = dependency.eks.inputs.region - cluster_domain = dependency.eks.inputs.vpc_domain_name + profile = dependency.eks.inputs.profile + cluster_name = dependency.eks.inputs.cluster_name + region = dependency.eks.inputs.region + cluster_domain = dependency.eks.inputs.vpc_domain_name # datasources = dependency.eks-loki.outputs.gateway_internal_endpoint - rwo_storage_class = dependency.eks-loki.outputs.rwo_storage_class + rwo_storage_class = dependency.eks-loki.outputs.rwo_storage_class } diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-istio/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-istio/terragrunt.hcl index b4bfd4c..5ad8b7c 100644 --- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-istio/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-istio/terragrunt.hcl @@ -1,5 +1,5 @@ include "root" { - path = find_in_parent_folders() + path = find_in_parent_folders() } terraform { @@ -14,10 +14,10 @@ dependency "eks" { config_path = "../eks" } dependency "eks-config" { - config_path = "../eks-config" + config_path = "../eks-config" } dependency "eks-cert-manager" { - config_path = "../eks-cert-manager" + config_path = "../eks-cert-manager" } inputs = { diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-karpenter/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-karpenter/terragrunt.hcl index 488c8b6..a0e6592 100644 --- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-karpenter/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-karpenter/terragrunt.hcl @@ -19,7 +19,7 @@ dependency "eks" { } inputs = { - profile = dependency.eks.inputs.profile + profile = dependency.eks.inputs.profile cluster_endpoint = dependency.eks.outputs.cluster_endpoint cluster_name = dependency.eks.inputs.cluster_name karpenter_node_group_name = dependency.eks.outputs.node_group_name diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-kiali/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-kiali/terragrunt.hcl index 78f5807..bb17172 100644 --- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-kiali/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-kiali/terragrunt.hcl @@ -20,6 +20,15 @@ dependency "eks" { dependency "eks-config" { config_path = "../eks-config" } +dependency "eks-loki" { + config_path = "../eks-loki" +} +dependency "eks-grafana" { + config_path = "../eks-grafana" +} +dependency "eks-prometheus" { + config_path = "../eks-prometheus" +} inputs = { diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-metrics-server/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-metrics-server/terragrunt.hcl index cc686d7..54a9214 100644 --- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-metrics-server/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-metrics-server/terragrunt.hcl @@ -25,7 +25,7 @@ dependency "eks-loki" { } inputs = { - profile = dependency.eks.inputs.profile + profile = dependency.eks.inputs.profile cluster_name = dependency.eks.inputs.cluster_name - region = dependency.eks.inputs.region + region = dependency.eks.inputs.region } diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-prometheus/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-prometheus/terragrunt.hcl index c6c75a7..ac236b8 100644 --- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-prometheus/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-prometheus/terragrunt.hcl @@ -16,6 +16,9 @@ dependency "eks" { dependency "eks-config" { config_path = "../eks-config" } +dependency "eks-loki" { + config_path = "../eks-loki" +} inputs = { profile = dependency.eks.inputs.profile diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-tempo/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-tempo/terragrunt.hcl index 923dcdd..b1f5121 100644 --- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-tempo/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-tempo/terragrunt.hcl @@ -20,6 +20,9 @@ dependency "eks" { dependency "eks-config" { config_path = "../eks-config" } +dependency "eks-loki" { + config_path = "../eks-loki" +} inputs = { diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks/terragrunt.hcl index 918dfcc..795e0f2 100644 --- a/lab/us-gov-east-1/vpc/_mcmCluster/eks/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks/terragrunt.hcl @@ -5,13 +5,13 @@ include "root" { locals { account_vars = read_terragrunt_config(find_in_parent_folders("account.hcl")) - region_vars = read_terragrunt_config(find_in_parent_folders("region.hcl")) + region_vars = read_terragrunt_config(find_in_parent_folders("region.hcl")) # In which AWS region are operations being performed - account_id = local.account_vars.locals.aws_account_id + account_id = local.account_vars.locals.aws_account_id vpc_name = "vpc3-lab-dev" cluster_name = "platform-eng-eks-mcm" cluster_version = "1.30" - vpc_domain_name = "dev.lab.csp2.census.gov" + vpc_domain_name = "dev.lab.csp2.census.gov" eks_instance_disk_size = 100 eks_vpc_name = "vpc3-lab-dev" eks_ng_desired_size = 3 @@ -62,7 +62,7 @@ terraform { } inputs = { - aws_account_id = local.account_id + aws_account_id = local.account_id profile = local.profile vpc_name = local.eks_vpc_name cluster_name = local.cluster_name @@ -81,6 +81,6 @@ inputs = { vcp_domain_name = local.vpc_domain_name region = local.region creator = local.cluster_mailing_list - os_username = local.cluster_mailing_list - shared_vpc_label = "dev" + os_username = local.cluster_mailing_list + shared_vpc_label = "dev" } diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/terragrunt.hcl index e77c263..15d4f54 100644 --- a/lab/us-gov-east-1/vpc/_mcmCluster/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/_mcmCluster/terragrunt.hcl @@ -23,7 +23,6 @@ locals { project_number = "fs0000000078" project_role = "csvd_platformbaseline_mcm" region = local.region_vars.locals.aws_region - _module_providers = [] } generate "provider" { @@ -54,28 +53,6 @@ provider "aws" { allowed_account_ids = ["${local.account_id}"] } -%{if contains(local._module_providers, "kubernetes") || contains(local._module_providers, "helm")} -data "aws_eks_cluster" "cluster" { - name = "${local.config.cluster_name}" -} -data "aws_eks_cluster_auth" "cluster" { - name = "${local.config.cluster_name}" -} -provider "kubernetes" { - host = data.aws_eks_cluster.cluster.endpoint - cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority[0].data) - token = data.aws_eks_cluster_auth.cluster.token -} -%{endif} -%{if contains(local._module_providers, "helm")} -provider "helm" { - kubernetes { - host = data.aws_eks_cluster.cluster.endpoint - cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority[0].data) - token = data.aws_eks_cluster_auth.cluster.token - } -} -%{endif} EOF }