updates

SCT-Engineering · Aug 13, 2024 · 56a15b3 · 56a15b3
1 parent 130ad05
commit 56a15b3
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 61 deletions.
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-cloudwatch/terragrunt.off b/lab/us-gov-east-1/vpc/_mcmCluster/eks-cloudwatch/terragrunt.off
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
@@ -3,7 +3,7 @@ include "root" {
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio.git?ref=mcmCluster"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio.git"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]

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
@@ -2,10 +2,6 @@ include "root" {
   path = find_in_parent_folders()
 }
 
-locals {
-  tag_costallocation = "census:csvd:platformbaseline"
-}
-
 terraform {
   source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-karpenter.git?ref=mcmCluster"
   extra_arguments "retry_lock" {
@@ -25,4 +21,5 @@ inputs = {
   karpenter_node_group_name = dependency.eks.outputs.node_group_name
   oidc_provider_arn         = dependency.eks.outputs.oidc_provider_arn
   region                    = dependency.eks.inputs.region
+  vpc_id                    = dependency.eks.outputs.vpc_id
 }
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
@@ -3,7 +3,7 @@ include "root" {
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-prometheus.git"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-prometheus.git?ref=mcmCluster"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -13,8 +13,8 @@ terraform {
 dependency "eks" {
   config_path = "../eks"
 }
-dependency "eks-loki" {
-  config_path = "../eks-loki"
+dependency "eks-istio" {
+  config_path = "../eks-istio"
 }
 
 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
@@ -14,7 +14,7 @@ locals {
   vpc_domain_name                          = "dev.lab.csp2.census.gov"
   eks_instance_disk_size                   = 100
   eks_vpc_name                             = "vpc3-lab-dev"
-  eks_ng_desired_size                      = 1
+  eks_ng_desired_size                      = 2
   eks_ng_max_size                          = 10
   eks_ng_min_size                          = 1
   operators_ns                             = "operators"
@@ -31,30 +31,10 @@ locals {
     "cluster:size"  = "min:${local.eks_ng_min_size}-max:${local.eks_ng_max_size}-desired:${local.eks_ng_desired_size}"
   }
 
-  aws_auth_roles = [
-    {
-      rolearn : "arn:aws-us-gov:iam::224384469011:role/AWSReservedSSO_inf-admin-t3_b200ae7af469cdc8"
-      aws_rolename : ""
-      username : "admin"
-      groups = ["system:masters"]
-    },
-    {
-      rolearn : "arn:aws-us-gov:iam::224384469011:role/r-inf-terraform"
-      aws_rolename : ""
-      username : "admin"
-      groups = ["system:masters"]
-    },
-    {
-      rolearn : "arn:aws-us-gov:iam::224384469011:role/AWSReservedSSO_inf-admin-t2_f3912d726991bbfa"
-      aws_rolename : ""
-      username : "admin"
-      groups = ["system:masters"]
-    }
-  ]
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git?ref=ver"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -77,7 +57,6 @@ inputs = {
   enable_cluster_creator_admin_permissions = local.enable_cluster_creator_admin_permissions
   cluster_endpoint_public_access           = local.cluster_endpoint_public_access
   tags                                     = local.tags
-  aws_auth_roles                           = local.aws_auth_roles
   vcp_domain_name                          = local.vpc_domain_name
   region                                   = local.region
   creator                                  = local.cluster_mailing_list