Skip to content

Commit

Permalink
Merge all latest into live TG repository structure
Browse files Browse the repository at this point in the history
  • Loading branch information
mcgin314 committed Sep 20, 2024
1 parent 9720802 commit 0b0ca0c
Show file tree
Hide file tree
Showing 9 changed files with 118 additions and 154 deletions.
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 @@ -10,10 +10,8 @@ locals {
cluster_name = "platform-eng-eks-mcm"
cluster_version = "1.30"
vpc_domain_name = include.root.inputs.vpc_domain_name
vpc_domain_name = include.root.inputs.vpc_domain_name
eks_instance_disk_size = 100
eks_vpc_name = include.root.inputs.vpc_name
eks_vpc_name = include.root.inputs.vpc_name
eks_ng_desired_size = 2
eks_ng_max_size = 10
eks_ng_min_size = 2
Expand All @@ -22,17 +20,14 @@ locals {
cluster_endpoint_public_access = true
profile = include.root.inputs.aws_profile
region = include.root.inputs.aws_region
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
environment_abbr = include.root.inputs.environment_abbr

# Tags applied to AWS objects created
tags = {
"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}"
"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 @@ -46,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 @@ -25,10 +25,9 @@ locals {

# 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}"
"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 @@ -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

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ dependency "eks-prometheus" {
}

inputs = {
aws_account_id = include.root.inputs.aws_account_id
profile = include.root.inputs.aws_profile
region = include.root.inputs.aws_region
cluster_name = dependency.eks.outputs.cluster_name
Expand Down

This file was deleted.

0 comments on commit 0b0ca0c

Please sign in to comment.