From 2f59da0b09c5ec0222b7c3246af5fef819eb2399 Mon Sep 17 00:00:00 2001 From: Srini Nangunuri Date: Thu, 13 Jun 2024 16:41:48 -0400 Subject: [PATCH] Cleanup and deleting unwanted duplicate code --- eks-config/provider.tf | 17 ----- eks-config/terragrunt.hcl | 65 ---------------- eks/provider.tf | 5 -- eks/terragrunt.hcl | 75 ------------------- .../vpc/cluster/eks-config/terragrunt.hcl | 2 +- 5 files changed, 1 insertion(+), 163 deletions(-) delete mode 100644 eks-config/provider.tf delete mode 100644 eks-config/terragrunt.hcl delete mode 100644 eks/provider.tf delete mode 100644 eks/terragrunt.hcl diff --git a/eks-config/provider.tf b/eks-config/provider.tf deleted file mode 100644 index a451c11..0000000 --- a/eks-config/provider.tf +++ /dev/null @@ -1,17 +0,0 @@ -# provider.tf -provider "aws" { - region = "us-gov-east-1" - profile = "224384469011-lab-dev-gov.inf-admin-t3" -} - -provider "kubernetes" { - config_path = "~/.kube/config" - config_context = "arn:aws-us-gov:eks:us-gov-east-1:224384469011:cluster/platform-eng-eks-test" -} - -provider "helm" { - kubernetes { - config_path = "~/.kube/config" - config_context = "arn:aws-us-gov:eks:us-gov-east-1:224384469011:cluster/platform-eng-eks-test" - } -} \ No newline at end of file diff --git a/eks-config/terragrunt.hcl b/eks-config/terragrunt.hcl deleted file mode 100644 index 04e9562..0000000 --- a/eks-config/terragrunt.hcl +++ /dev/null @@ -1,65 +0,0 @@ -locals { - # In which AWS region are operations being performed - # vpc_id = "vpc-0280f77b373744eaa" - # profile = "224384469011-lab-dev-gov.inf-admin-t3" - # cluster_name = "platform-eng-eks-test" - # subnets = [ - # "subnet-078b228071c609a50", - # "subnet-02c2250b9ec2dd6a2", - # "subnet-07a6339be3670fb41", - # ] - # security_group_all_worker_mgmt_id = "sg-02b62e91afdbeba6b" - # eks_managed_node_groups_autoscaling_group_names = ["eks-eks-platform-eng-eks-test-nodegroup-20240501173536404400000016-3ec79a9c-f002-40c6-8358-29fbacfbb3e8"] - - # region = "us-gov-east-1" - # oidc_provider_arn = "arn:aws-us-gov:iam::224384469011:oidc-provider/oidc.eks.us-gov-east-1.amazonaws.com/id/7DE08671C3526A48AD5537E814DC2828" - - tag_costallocation = "census:csvd:platformbaseline" - tags = { - - "eks-cluster-name" = "platform-eng-eks-test" - "CostAllocation" = "census:csvd:platformbaseline" - "boc:tf_module_version" = "1.0.0" - "boc:created_by" = "terraform" - } -} - -terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=autoscaler-updates" - extra_arguments "retry_lock" { - commands = get_terraform_commands_that_need_locking() - arguments = ["-lock-timeout=20m"] - } -} - -remote_state { - backend = "s3" - generate = { - path = "backend.tf" - if_exists = "overwrite_terragrunt" - } - config = { - bucket = "tg-infrastructure-tf-state-lab-dev-ew-us-gov-east-1" - key = "platform-eks-test-config/terraform.tfstate" - region = "us-gov-east-1" - encrypt = true - #dynamodb_table = "my-lock-table" - } -} - -dependency "eks" { - config_path = "../eks" -} - -inputs = { - profile = dependency.eks.inputs.profile - vpc_id = dependency.eks.outputs.vpc_id - cluster_name = dependency.eks.inputs.cluster_name - subnets = dependency.eks.outputs.subnets - security_group_all_worker_mgmt_id = dependency.eks.outputs.security_group_all_worker_mgmt_id - eks_managed_node_groups_autoscaling_group_names = dependency.eks.outputs.eks_managed_node_groups_autoscaling_group_names - oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn - region = dependency.eks.inputs.region - tags = local.tags - tag_costallocation = local.tag_costallocation -} diff --git a/eks/provider.tf b/eks/provider.tf deleted file mode 100644 index 77551c2..0000000 --- a/eks/provider.tf +++ /dev/null @@ -1,5 +0,0 @@ -# provider.tf -provider "aws" { - region = "us-gov-east-1" - profile = "224384469011-lab-dev-gov.inf-admin-t3" -} diff --git a/eks/terragrunt.hcl b/eks/terragrunt.hcl deleted file mode 100644 index ba8fa03..0000000 --- a/eks/terragrunt.hcl +++ /dev/null @@ -1,75 +0,0 @@ -locals { - # In which AWS region are operations being performed - vpc_name = "vpc3-lab-dev" - cluster_name = "platform-eng-eks-test" - cluster_version = 1.29 - region = "us-gov-east-1" - domain = "dev.lab.csp2.census.gov" - eks_instance_disk_size = 40 - eks_vpc_name = "vpc3-lab-dev" - eks_ng_desired_size = 1 - eks_ng_max_size = 1 - eks_ng_min_size = 1 - operators_ns = "operators" - enable_cluster_creator_admin_permissions = true - cluster_endpoint_public_access = true - #eks_instance_types = "t3.xlarge" - - # Which AWS_PROFILE to use to perform the operations - profile = "224384469011-lab-dev-gov.inf-admin-t3" - - # Tags applied to AWS objects created - tags = { - "Project Name" = "csvd_platformbaseline" - "eks-cluster-name" = "platform-eng-eks-test" - "CostAllocation" = "census:csvd:platformbaseline" - "Organization" = "census:ocio:csvd" - "ProjectNumber" = "fs0000000078" - "Project Role" = "csvd_platformbaseline_app" - "boc:tf_module_version" = "1.0.0" - "Environment" = "dev" - "boc:created_by" = "terraform" - } -} - -terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git" - extra_arguments "retry_lock" { - commands = get_terraform_commands_that_need_locking() - arguments = ["-lock-timeout=20m"] - } -} - -remote_state { - backend = "s3" - generate = { - path = "backend.tf" - if_exists = "overwrite_terragrunt" - } - config = { - bucket = "tg-infrastructure-tf-state-lab-dev-ew-us-gov-east-1" - key = "platform-eks-test/terraform.tfstate" - region = "us-gov-east-1" - encrypt = true - #dynamodb_table = "my-lock-table" - } -} - -inputs = { - profile = local.profile - vpc_name = local.eks_vpc_name - cluster_name = local.cluster_name - cluster_version = local.cluster_version - region = local.region - domain = local.domain - eks_instance_disk_size = local.eks_instance_disk_size - eks_vpc_name = local.eks_vpc_name - #eks_instance_types = local.eks_instance_types - 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 - enable_cluster_creator_admin_permissions = local.enable_cluster_creator_admin_permissions - cluster_endpoint_public_access = local.cluster_endpoint_public_access - tags = local.tags -} diff --git a/lab/us-gov-east-1/vpc/cluster/eks-config/terragrunt.hcl b/lab/us-gov-east-1/vpc/cluster/eks-config/terragrunt.hcl index 20f00ee..d5910dd 100644 --- a/lab/us-gov-east-1/vpc/cluster/eks-config/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/cluster/eks-config/terragrunt.hcl @@ -26,7 +26,7 @@ locals { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=1.0.1" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=1.0.2" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"]