Resolve merge conflicts

SCT-Engineering · Sep 20, 2024 · e7b7139 · e7b7139
2 parents f20d9fd + 6f739db
commit e7b7139
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks/terragrunt.hcl
@@ -15,7 +15,7 @@ locals {
   eks_ng_desired_size                      = 2
   eks_ng_max_size                          = 10
   eks_ng_min_size                          = 2
-  operators_ns                             = "operators"
+  eks_vpc_name                             = "vpc3-lab-dev"
   enable_cluster_creator_admin_permissions = true
   cluster_endpoint_public_access           = true
   profile                                  = include.root.inputs.aws_profile
@@ -29,7 +29,6 @@ locals {
     "slim:schedule" = "8:00-17:00"
     "cluster:size"  = "min:${local.eks_ng_min_size}-max:${local.eks_ng_max_size}-desired:${local.eks_ng_desired_size}"
   }
-
 }
 
 terraform {
@@ -42,22 +41,17 @@ terraform {
 
 inputs = {
   aws_account_id                           = local.account_id
-  profile                                  = local.profile
-  vpc_name                                 = local.eks_vpc_name
+  cluster_endpoint_public_access           = local.cluster_endpoint_public_access
   cluster_name                             = local.cluster_name
   cluster_version                          = local.cluster_version
+  creator                                  = local.cluster_mailing_list
   eks_instance_disk_size                   = local.eks_instance_disk_size
-  eks_vpc_name                             = local.eks_vpc_name
   eks_ng_desired_size                      = local.eks_ng_desired_size
   eks_ng_max_size                          = local.eks_ng_max_size
   eks_ng_min_size                          = local.eks_ng_min_size
-  operators_ns                             = local.operators_ns
+  eks_vpc_name                             = local.eks_vpc_name
   enable_cluster_creator_admin_permissions = local.enable_cluster_creator_admin_permissions
-  cluster_endpoint_public_access           = local.cluster_endpoint_public_access
-  tags                                     = local.tags
-  vcp_domain_name                          = local.vpc_domain_name
-  region                                   = local.region
-  creator                                  = local.cluster_mailing_list
+  operators_ns                             = local.operators_ns
   os_username                              = local.cluster_mailing_list
   shared_vpc_label                         = local.environment_abbr
 }
diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-istio/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-istio/terragrunt.hcl
@@ -18,6 +18,7 @@ dependency "eks" {
   }
 }
 
+
 dependency "eks-karpenter" {
   config_path  = "../eks-karpenter"
   skip_outputs = true