Skip to content

Commit

Permalink
Merge all clusters into single directory structure
Browse files Browse the repository at this point in the history
  • Loading branch information
mcgin314 committed Sep 17, 2024
1 parent a134643 commit c6d29f6
Show file tree
Hide file tree
Showing 163 changed files with 324 additions and 20,690 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,51 +4,52 @@ 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
vpc_name = "vpc3-lab-dev"
cluster_name = "platform-eng-eks-mcm"
# 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-test"
cluster_version = "1.30"
vpc_domain_name = "dev.lab.csp2.census.gov"
vpc_domain_name = include.root.inputs.vpc_domain_name
eks_instance_disk_size = 100
eks_vpc_name = "vpc3-lab-dev"
eks_vpc_name = include.root.inputs.vpc_name
eks_ng_desired_size = 2
eks_ng_max_size = 10
eks_ng_min_size = 2
operators_ns = "operators"
enable_cluster_creator_admin_permissions = true
cluster_endpoint_public_access = true
profile = "224384469011-lab-dev-gov"
region = local.region_vars.locals.aws_region
cluster_mailing_list = "matthew.c.morgan@census.gov"
profile = include.root.inputs.aws_profile
region = include.root.inputs.aws_region
cluster_mailing_list = "srinivasa.nangunuri@census.gov"
environment_abbr = include.root.inputs.environment_abbr

# Tags applied to AWS objects created
tags = {
"Environment" = "dev"
"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}"
}

}

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=main"
extra_arguments "retry_lock" {
commands = get_terraform_commands_that_need_locking()
arguments = ["-lock-timeout=20m"]
}
}

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
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
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 All @@ -60,5 +61,5 @@ inputs = {
region = local.region
creator = local.cluster_mailing_list
os_username = local.cluster_mailing_list
shared_vpc_label = "dev"
shared_vpc_label = local.environment_abbr
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
include "root" {
path = find_in_parent_folders()
path = find_in_parent_folders()
expose = true
}

terraform {
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git"
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=main"
extra_arguments "retry_lock" {
commands = get_terraform_commands_that_need_locking()
arguments = ["-lock-timeout=20m"]
Expand All @@ -12,14 +13,18 @@ terraform {

dependency "eks" {
config_path = "../eks"
mock_outputs = {
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"
}
}

inputs = {
cluster_name = dependency.eks.inputs.cluster_name
cluster_name = dependency.eks.outputs.cluster_name
cluster_mailing_list = dependency.eks.inputs.creator
oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn
profile = dependency.eks.inputs.profile
region = dependency.eks.inputs.region
profile = include.root.inputs.aws_profile
region = include.root.inputs.aws_region
cert_manager_helm_chart = "1.15.1"
cert_manager_cainjector_tag = "v1.15.1"
cert_manager_controller_tag = "v1.15.1"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
include "root" {
path = find_in_parent_folders()
expose = true
}

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

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

dependency "eks" {
config_path = "../eks"
mock_outputs = {
vpc_id = "a-vpc-id"
cluster_name = "a-cluster-name"
subnets = ["subnet-00000000000000001", "subnet-00000000000000002", "subnet-00000000000000003", ]
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 = {
profile = include.root.inputs.aws_profile
region = include.root.inputs.aws_region
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,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
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
include "root" {
path = find_in_parent_folders()
path = find_in_parent_folders()
expose = true
}

terraform {
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio.git"
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio.git?ref=main"
extra_arguments "retry_lock" {
commands = get_terraform_commands_that_need_locking()
arguments = ["-lock-timeout=20m"]
Expand All @@ -12,17 +13,19 @@ terraform {

dependency "eks" {
config_path = "../eks"
mock_outputs = {
cluster_name = "a-cluster-name"
}
}

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

inputs = {
profile = dependency.eks.inputs.profile
cluster_name = dependency.eks.inputs.cluster_name
region = dependency.eks.inputs.region
profile = include.root.inputs.aws_profile
region = include.root.inputs.aws_region
cluster_name = dependency.eks.outputs.cluster_name
istio_chart_version = "1.22.1"
istio_version = "1.22.1"
}
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-karpenter.git?ref=main"
extra_arguments "retry_lock" {
commands = get_terraform_commands_that_need_locking()
arguments = ["-lock-timeout=20m"]
}
}

dependency "eks" {
config_path = "../eks"
mock_outputs = {
cluster_endpoint = "https://0000000000000000AAAAAAAAAAAAAAAA.sk1.us-gov-east-1.eks.amazonaws.com"
cluster_name = "a-cluster-name"
node_group_name = "node_group_a-cluster-name"
oidc_provider_arn = "arn:aws-us-gov:iam::111111111111:oidc-provider/oidc.eks.us-gov-east-1.amazonaws.com/id/0000000000000000AAAAAAAAAAAAAAAA"
vpc_id = "a-vpc-name"
}
}

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

inputs = {
profile = include.root.inputs.aws_profile
region = include.root.inputs.aws_region
cluster_endpoint = dependency.eks.outputs.cluster_endpoint
cluster_name = dependency.eks.outputs.cluster_name
karpenter_node_group_name = dependency.eks.outputs.node_group_name
oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn
vpc_id = dependency.eks.outputs.vpc_id
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
include "root" {
path = find_in_parent_folders()
}

locals {
tag_costallocation = "census:csvd:platformbaseline"
expose = true
}

terraform {
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-kiali.git?ref=mcmCluster"
# source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-kiali.git?ref=mcmCluster"
source = "../../../../../../../tfmod-kiali"
extra_arguments "retry_lock" {
commands = get_terraform_commands_that_need_locking()
arguments = ["-lock-timeout=20m"]
Expand All @@ -16,32 +14,57 @@ terraform {

dependency "eks" {
config_path = "../eks"
}
dependency "eks-config" {
config_path = "../eks-config"
mock_outputs = {
cluster_name = "a-cluster-name"
}
}
dependency "eks-cert-manager" {
config_path = "../eks-cert-manager"
mock_outputs = {
cluster_issuer_name = "acmpca-clusterissuer"
}
}
dependency "eks-prometheus" {
config_path = "../eks-prometheus"
mock_outputs = {
prometheus_server_internal_endpoint = {
hostname = "prometheus-server.prometheus.svc.cluster.local"
port_number = 9090
url = "http://prometheus-server.prometheus.svc.cluster.local:9090/"
}
}
}
dependency "eks-grafana" {
config_path = "../eks-grafana"
mock_outputs = {
internal_endpoint = {
hostname = "grafana.grafana.svc.cluster.local"
port_number = "80"
url = "https://grafana.grafana.svc.cluster.local:80/"
}
namespace = "grafana"
public_endpoint = {
hostname = "grafana.dev.lab.csp2.census.gov"
port_number = "80"
url = "https://grafana.dev.lab.csp2.census.gov:80/"
}
secret_name = "grafana"
}
}

inputs = {
certificate_issuer = dependency.eks-cert-manager.outputs.certificate_issuer
profile = include.root.inputs.aws_profile
cluster_domain = dependency.eks.inputs.vpc_domain_name
cluster_name = dependency.eks.inputs.cluster_name
operators_namespace = dependency.eks.inputs.operators_ns
cluster_name = dependency.eks.outputs.cluster_name
certificate_issuer = dependency.eks-cert-manager.outputs.cluster_issuer_name
prometheus_internal_url = dependency.eks-prometheus.outputs.prometheus_server_internal_endpoint.url
grafana_internal_url = dependency.eks-grafana.outputs.internal_endpoint.url
grafana_namespace = dependency.eks-grafana.outputs.namespace
grafana_public_url = dependency.eks-grafana.outputs.public_endpoint.url
grafana_secret_name = dependency.eks-grafana.outputs.secret_name
grafana_secret_name = "grafana"
# grafana_secret_name = dependency.eks-grafana.outputs.secret_name
jaeger_internal_url = ""
operators_namespace = dependency.eks-config.outputs.operators_ns
profile = dependency.eks.inputs.profile
prometheus_internal_url = dependency.eks-prometheus.outputs.prometheus_server_internal_endpoint.url


# client_id = var.sso_client_id
Expand Down
Loading

0 comments on commit c6d29f6

Please sign in to comment.