Skip to content

Commit

Permalink
Merge pull request #11 from SCT-Engineering/feature-merge-clusters
Browse files Browse the repository at this point in the history
Feature merge clusters
  • Loading branch information
morga471 committed Oct 10, 2024
2 parents 6f739db + 95312a4 commit 006a73b
Show file tree
Hide file tree
Showing 164 changed files with 322 additions and 20,550 deletions.
File renamed without changes.
7 changes: 0 additions & 7 deletions lab/account.hcl

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
locals {
account_name = "lab-dev-ew"
aws_account_id = "224384469011"
aws_profile = "224384469011-lab-dev-gov.inf-admin-t2"
aws_profile = "224384469011-lab-dev-gov"
environment = "development"
environment_abbr = "dev"
}
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,35 @@ 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"))
# In which AWS region are operations being performed
account_id = local.account_vars.locals.aws_account_id
cluster_endpoint_public_access = true
cluster_mailing_list = "matthew.c.morgan@census.gov"
# Set cluster/platform specific variables, or extract from the hierarchy.
account_id = include.root.inputs.aws_account_id
vpc_name = include.root.inputs.vpc_name
cluster_name = "platform-eng-eks-mcm"
cluster_version = "1.30"
vpc_domain_name = include.root.inputs.vpc_domain_name
eks_instance_disk_size = 100
eks_vpc_name = include.root.inputs.vpc_name
eks_ng_desired_size = 2
eks_ng_max_size = 10
eks_ng_min_size = 2
eks_vpc_name = "vpc3-lab-dev"
enable_cluster_creator_admin_permissions = true
operators_ns = "operators"
profile = "224384469011-lab-dev-gov"
region = local.region_vars.locals.aws_region
vpc_domain_name = "dev.lab.csp2.census.gov"
vpc_name = "vpc3-lab-dev"
cluster_endpoint_public_access = true
profile = include.root.inputs.aws_profile
region = include.root.inputs.aws_region
cluster_mailing_list = "matthew.c.morgan@census.gov"
environment_abbr = include.root.inputs.environment_abbr

# Tags applied to AWS objects created
tags = {
"Environment" = "dev"
"Environment" = local.environment_abbr
"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 {
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git?ref=dnsv2"
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"]
Expand All @@ -54,10 +53,5 @@ inputs = {
enable_cluster_creator_admin_permissions = local.enable_cluster_creator_admin_permissions
operators_ns = local.operators_ns
os_username = local.cluster_mailing_list
profile = local.profile
region = local.region
shared_vpc_label = "dev"
tags = local.tags
vpc_domain_name = local.vpc_domain_name
vpc_name = local.eks_vpc_name
shared_vpc_label = local.environment_abbr
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
include "root" {
path = find_in_parent_folders()
expose = true
}

terraform {
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-dns.git"
extra_arguments "retry_lock" {
commands = get_terraform_commands_that_need_locking()
arguments = ["-lock-timeout=20m"]
}
}

dependency "eks" {
config_path = "../eks"
mock_outputs = {
zone_ids = ["Z12345678CA5FV1LIFBC5"]
}
}

inputs = {
cluster_name = dependency.eks.inputs.cluster_name
profile = include.root.inputs.aws_profile
region = include.root.inputs.aws_region
subnets = dependency.eks.outputs.subnets
tags = dependency.eks.inputs.tags
vpc_domain_name = dependency.eks.inputs.vpc_domain_name
vpc_id = dependency.eks.outputs.vpc_id
vpc_name = dependency.eks.inputs.vpc_name
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ terraform {
dependency "eks" {
config_path = "../eks"
mock_outputs = {
cluster_name = "a-cluster-name"
cluster_name = "a-cluster-name"
oidc_provider_arn = "arn:aws-us-gov:iam::111111111111:oidc-provider/oidc.eks.us-gov-east-1.amazonaws.com/id/0000000000000000AAAAAAAAAAAAAAAA"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ locals {
# Set cluster/platform specific variables, or extract from the hierarchy.
account_id = include.root.inputs.aws_account_id
vpc_name = include.root.inputs.vpc_name
cluster_name = "platform-eng-eks-mcm"
cluster_name = "platform-eng-eks-test"
cluster_version = "1.30"
vpc_domain_name = include.root.inputs.vpc_domain_name
eks_instance_disk_size = 100
Expand All @@ -20,12 +20,11 @@ locals {
cluster_endpoint_public_access = true
profile = include.root.inputs.aws_profile
region = include.root.inputs.aws_region
cluster_mailing_list = "matthew.c.morgan@census.gov"
cluster_mailing_list = "srinivasa.nangunuri@census.gov"
environment_abbr = include.root.inputs.environment_abbr

# Tags applied to AWS objects created
tags = {
"eks-cluster-name" = local.cluster_name
"Environment" = local.environment_abbr
"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}"
Expand All @@ -42,14 +41,13 @@ terraform {
}

inputs = {
aws_account_id = local.account_id
profile = local.profile
vpc_name = local.eks_vpc_name
cluster_name = local.cluster_name
cluster_version = local.cluster_version
eks_instance_disk_size = local.eks_instance_disk_size
eks_vpc_name = local.eks_vpc_name
# eks_instance_types = local.eks_instance_types
aws_account_id = local.account_id
profile = local.profile
vpc_name = local.eks_vpc_name
cluster_name = local.cluster_name
cluster_version = local.cluster_version
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
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
include "root" {
path = find_in_parent_folders()
expose = true
}

terraform {
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-dns.git"
extra_arguments "retry_lock" {
commands = get_terraform_commands_that_need_locking()
arguments = ["-lock-timeout=20m"]
}
}

dependency "eks" {
config_path = "../eks"
mock_outputs = {
zone_ids = ["Z12345678CA5FV1LIFBC5"]
}
}

inputs = {
cluster_name = dependency.eks.inputs.cluster_name
profile = include.root.inputs.aws_profile
region = include.root.inputs.aws_region
subnets = dependency.eks.outputs.subnets
tags = dependency.eks.inputs.tags
vpc_domain_name = dependency.eks.inputs.vpc_domain_name
vpc_id = dependency.eks.outputs.vpc_id
vpc_name = dependency.eks.inputs.vpc_name
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ terraform {
dependency "eks" {
config_path = "../eks"
mock_outputs = {
cluster_name = "a-cluster-name"
cluster_name = "a-cluster-name"
oidc_provider_arn = "arn:aws-us-gov:iam::111111111111:oidc-provider/oidc.eks.us-gov-east-1.amazonaws.com/id/0000000000000000AAAAAAAAAAAAAAAA"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,13 @@ terraform {
}

inputs = {
aws_account_id = local.account_id
profile = local.profile
vpc_name = local.eks_vpc_name
cluster_name = local.cluster_name
cluster_version = local.cluster_version
eks_instance_disk_size = local.eks_instance_disk_size
eks_vpc_name = local.eks_vpc_name
# eks_instance_types = local.eks_instance_types
aws_account_id = local.account_id
profile = local.profile
vpc_name = local.eks_vpc_name
cluster_name = local.cluster_name
cluster_version = local.cluster_version
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ include "root" {
expose = true
}

# locals {
# tag_costallocation = "census:csvd:platformbaseline"
# }

terraform {
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git"
extra_arguments "retry_lock" {
Expand All @@ -14,23 +18,25 @@ terraform {
dependency "eks" {
config_path = "../eks"
mock_outputs = {
vpc_id = "a-vpc-id"
cluster_name = "a-cluster-name"
eks_managed_node_groups_autoscaling_group_names = ["eks-a-cluster-name-node_group-0000000000000000000000000-5ac8a5e3-14dd-c043-2cc9-f4b6ffb36d32"]
oidc_provider_arn = "arn:aws-us-gov:iam::111111111111:oidc-provider/oidc.eks.us-gov-east-1.amazonaws.com/id/0000000000000000AAAAAAAAAAAAAAAA"
security_group_all_worker_mgmt_id = "sg-00b0000000000000"
subnets = ["subnet-00000000000000001", "subnet-00000000000000002", "subnet-00000000000000003", ]
vpc_id = "a-vpc-id"
security_group_all_worker_mgmt_id = "sg-00b0000000000000"
eks_managed_node_groups_autoscaling_group_names = ["eks-eks-a-cluster-name-node_group-0000000000000000000000000-5ac8a5e3-14dd-c043-2cc9-f4b6ffb36d32"]
oidc_provider_arn = "arn:aws-us-gov:iam::111111111111:oidc-provider/oidc.eks.us-gov-east-1.amazonaws.com/id/0000000000000000AAAAAAAAAAAAAAAA"
}
}

inputs = {
cluster_name = dependency.eks.outputs.cluster_name
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
profile = include.root.inputs.aws_profile
region = include.root.inputs.aws_region
security_group_all_worker_mgmt_id = dependency.eks.outputs.security_group_all_worker_mgmt_id
subnets = dependency.eks.outputs.subnets
tags = dependency.eks.inputs.tags
vpc_id = dependency.eks.outputs.vpc_id
cluster_name = dependency.eks.outputs.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
# tags = dependency.eks.inputs.tags
# tag_costallocation = local.tag_costallocation
# cluster_autoscaler_role_name = dependency.eks.outputs.cluster_autoscaler_role_name
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
include "root" {
path = find_in_parent_folders()
expose = true
}

terraform {
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-dns.git"
extra_arguments "retry_lock" {
commands = get_terraform_commands_that_need_locking()
arguments = ["-lock-timeout=20m"]
}
}

dependency "eks" {
config_path = "../eks"
mock_outputs = {
zone_ids = ["Z12345678CA5FV1LIFBC5"]
}
}

inputs = {
cluster_name = dependency.eks.inputs.cluster_name
profile = include.root.inputs.aws_profile
region = include.root.inputs.aws_region
subnets = dependency.eks.outputs.subnets
tags = dependency.eks.inputs.tags
vpc_domain_name = dependency.eks.inputs.vpc_domain_name
vpc_id = dependency.eks.outputs.vpc_id
vpc_name = dependency.eks.inputs.vpc_name
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,35 +17,22 @@ dependency "eks" {
cluster_name = "a-cluster-name"
}
}

dependency "eks-config" {
config_path = "../eks-config"
mock_outputs = {
rwo_storage_class = "a-storage-class"
}
}

dependency "eks-dns" {
config_path = "../eks-dns"
dependency "eks-loki" {
config_path = "../eks-loki"
mock_outputs = {
cluster_domain = "a-cluster-domain"
rwo_storage_class = "gp3-encrypted"
}
}

dependency "eks-istio" {
config_path = "../eks-istio"
skip_outputs = true
}

dependency "eks-karpenter" {
config_path = "../eks-karpenter"
skip_outputs = true
}
# dependency "eks-tempo" {
# config_path = "../eks-tempo"
# skip_outputs = true
# }

inputs = {
cluster_domain = dependency.eks-dns.outputs.cluster_domain
cluster_name = dependency.eks.outputs.cluster_name
profile = include.root.inputs.aws_profile
region = include.root.inputs.aws_region
rwo_storage_class = dependency.eks-config.outputs.rwo_storage_class
cluster_name = dependency.eks.outputs.cluster_name
cluster_domain = dependency.eks.inputs.vpc_domain_name
rwo_storage_class = dependency.eks-loki.outputs.rwo_storage_class
# datasources = dependency.eks-loki.outputs.gateway_internal_endpoint
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
include "root" {
path = find_in_parent_folders()
expose = true
}

terraform {
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-grafana.git"
extra_arguments "retry_lock" {
commands = get_terraform_commands_that_need_locking()
arguments = ["-lock-timeout=20m"]
}
}

dependency "eks" {
config_path = "../eks"
mock_outputs = {
cluster_name = "a-cluster-name"
}
}
dependency "eks-loki" {
config_path = "../eks-loki"
mock_outputs = {
rwo_storage_class = "gp3-encrypted"
}
}
# dependency "eks-tempo" {
# config_path = "../eks-tempo"
# skip_outputs = true
# }

inputs = {
profile = include.root.inputs.aws_profile
region = include.root.inputs.aws_region
cluster_name = dependency.eks.outputs.cluster_name
cluster_domain = dependency.eks.inputs.vpc_domain_name
rwo_storage_class = dependency.eks-loki.outputs.rwo_storage_class
# datasources = dependency.eks-loki.outputs.gateway_internal_endpoint
}
Loading

0 comments on commit 006a73b

Please sign in to comment.