From 204e81cb05a4fcbcc9e49752ce70fc44fe379c76 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Fri, 8 Nov 2024 14:25:48 -0500 Subject: [PATCH] fmt --- lab/_envcommon/aws-provider.hcl | 2 ++ lab/_envcommon/common-variables.hcl | 2 ++ lab/_envcommon/default-versions.hcl | 7 +++-- lab/development/account.hcl | 4 ++- lab/development/us-gov-east-1/region.hcl | 4 ++- .../vpc/platform-eng-eks-mcm/cluster.hcl | 2 ++ .../eks-tempo/terragrunt.hcl | 4 +-- lab/development/us-gov-east-1/vpc/vpc.hcl | 4 ++- lab/root.hcl | 2 ++ mcmcluster.hcl | 29 +++++++++++++++++++ 10 files changed, 52 insertions(+), 8 deletions(-) create mode 100644 mcmcluster.hcl diff --git a/lab/_envcommon/aws-provider.hcl b/lab/_envcommon/aws-provider.hcl index f5abe97..18483ac 100644 --- a/lab/_envcommon/aws-provider.hcl +++ b/lab/_envcommon/aws-provider.hcl @@ -1,3 +1,5 @@ +# lab/_envcommon/aws-provider.hcl + include "root" { path = find_in_parent_folders("root.hcl") merge_strategy = "deep" diff --git a/lab/_envcommon/common-variables.hcl b/lab/_envcommon/common-variables.hcl index 3ea745d..d2f73ef 100644 --- a/lab/_envcommon/common-variables.hcl +++ b/lab/_envcommon/common-variables.hcl @@ -1,3 +1,5 @@ +# lab/_envcommon/common-variables.hcl + # --------------------------------------------------------------------------------------------------------------------- # GLOBAL PARAMETERS # These are the variables we pass to use across modules regardless of environment, i.e. these are the parameters diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl index 9ae2832..6a147b5 100644 --- a/lab/_envcommon/default-versions.hcl +++ b/lab/_envcommon/default-versions.hcl @@ -1,9 +1,10 @@ # lab/_envcommon/default-versions.hcl + locals { ##################### # Module Versions ##################### - cluster_version = "1.30.0" + cluster_version = "1.30" custom_service_eks_account = "${local.release_version}" eks_module_version = "20.28.0" istio_ingress_version = "${local.release_version}" @@ -30,7 +31,7 @@ locals { ################ dashboard_hostname = "dashboard" k8s_dashboard_metrics_scraper = "1.0.8" - k8s_dashboard_version = "2.7.0" + k8s_dashboard_version = "6.0.6" ################ # Cert-Manager @@ -102,5 +103,5 @@ locals { # Tempo ################ tempo_chart_version = "1.10.3" - tempo_tag = "2.5.0" + tempo_tag = "2.5.0" } diff --git a/lab/development/account.hcl b/lab/development/account.hcl index 1992080..80a8b3a 100644 --- a/lab/development/account.hcl +++ b/lab/development/account.hcl @@ -1,3 +1,5 @@ +# lab/development/account.hcl + # Set account-wide variables. These are automatically pulled in to configure the remote state bucket in the root # terragrunt.hcl configuration. Terragrunt often segments account and environment, but given our strategy is to # leverage accounts as environment boundaries, there is an anticipated 1:1 account to environment model that @@ -8,4 +10,4 @@ locals { aws_profile = "224384469011-lab-dev-gov" environment = "development" environment_abbr = "dev" -} \ No newline at end of file +} diff --git a/lab/development/us-gov-east-1/region.hcl b/lab/development/us-gov-east-1/region.hcl index 4adfaa3..f87a8e6 100644 --- a/lab/development/us-gov-east-1/region.hcl +++ b/lab/development/us-gov-east-1/region.hcl @@ -1,5 +1,7 @@ +# lab/development/us-gov-east-1/region.hcl + # Set common variables for the region. This is automatically pulled in in the root terragrunt.hcl configuration to # configure the remote state bucket and pass forward to the child modules as inputs. locals { aws_region = "us-gov-east-1" -} \ No newline at end of file +} diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/cluster.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/cluster.hcl index bf4f842..8d2831c 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/cluster.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/cluster.hcl @@ -1,3 +1,5 @@ +# lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/cluster.hcl + # Set cluster specific variables. These are automatically pulled in to configure the remote state bucket in the root # terragrunt.hcl configuration. locals { diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-tempo/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-tempo/terragrunt.hcl index f317193..e9ebd48 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-tempo/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-tempo/terragrunt.hcl @@ -40,7 +40,7 @@ inputs = { oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn prometheus_port = dependency.eks-prometheus.outputs.prometheus_server_internal_endpoint.port_number prometheus_namespace = dependency.eks-prometheus.outputs.prometheus_namespace - tempo_chart_version = include.root.inputs.tempo_chart_version - tempo_tag = include.root.inputs.tempo_tag + tempo_chart_version = include.root.inputs.tempo_chart_version + tempo_tag = include.root.inputs.tempo_tag } diff --git a/lab/development/us-gov-east-1/vpc/vpc.hcl b/lab/development/us-gov-east-1/vpc/vpc.hcl index 907ce6d..8da18d0 100644 --- a/lab/development/us-gov-east-1/vpc/vpc.hcl +++ b/lab/development/us-gov-east-1/vpc/vpc.hcl @@ -1,6 +1,8 @@ +# lab/development/us-gov-east-1/vpc/vpc.hcl + # Set VPC specific variables. These are automatically pulled in to configure the remote state bucket in the root # terragrunt.hcl configuration. locals { vpc_name = "vpc3-lab-dev" vpc_domain_name = "dev.lab.csp2.census.gov" -} \ No newline at end of file +} diff --git a/lab/root.hcl b/lab/root.hcl index cba453a..87fe323 100644 --- a/lab/root.hcl +++ b/lab/root.hcl @@ -1,3 +1,5 @@ +# lab/root.hcl + # --------------------------------------------------------------------------------------------------------------------- # TERRAGRUNT CONFIGURATION # Terragrunt is a thin wrapper for Terraform that provides extra tools for working with multiple Terraform modules, diff --git a/mcmcluster.hcl b/mcmcluster.hcl new file mode 100644 index 0000000..d6399d1 --- /dev/null +++ b/mcmcluster.hcl @@ -0,0 +1,29 @@ +locals { + account_name = "lab-dev-ew" + aws_account_id = "224384469011" + aws_profile = "224384469011-lab-dev-gov" + aws_region = "us-gov-east-1" + cluster_endpoint_public_access = true + cluster_name = "platform-eng-eks-mcm" + creator = "matthew.c.morgan@census.gov" + eks_instance_disk_size = 100 + eks_ng_desired_size = 2 + eks_ng_max_size = 10 + eks_ng_min_size = 0 + enable_cluster_creator_admin_permissions = true + environment = "development" + environment_abbr = "dev" + terraform = true + terragrunt = true + vpc_domain_name = "dev.lab.csp2.census.gov" + vpc_name = "vpc3-lab-dev" + tags = { + "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}" + } + + + + + +}