From 17af27410dc6a61c167845d34f1ee7b5ced080e7 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Fri, 27 Jun 2025 21:42:04 -0400 Subject: [PATCH] add provisioned clusters --- .gitmodules | 6 +++++ Makefile | 37 ++++++++++++++++------------- README.md | 2 +- config.json | 36 ++++++++++++++-------------- lab/clusters/csvd-platform-lab-dja | 1 + lab/clusters/csvd-platform-lab-mcm | 2 +- lab/clusters/csvd-platform-lab-srn | 2 +- lab/clusters/eks-ois-eem-cribl-prod | 1 + 8 files changed, 50 insertions(+), 37 deletions(-) create mode 160000 lab/clusters/csvd-platform-lab-dja create mode 160000 lab/clusters/eks-ois-eem-cribl-prod diff --git a/.gitmodules b/.gitmodules index 6245275..7ba89d3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,9 @@ [submodule "lab/clusters/csvd-platform-lab-srn"] path = lab/clusters/csvd-platform-lab-srn url = git@github.e.it.census.gov:sct-engineering/csvd-platform-lab-srn +[submodule "lab/clusters/csvd-platform-lab-dja"] + path = lab/clusters/csvd-platform-lab-dja + url = git@github.e.it.census.gov:sct-engineering/csvd-platform-lab-dja +[submodule "lab/clusters/eks-ois-eem-cribl-prod"] + path = lab/clusters/eks-ois-eem-cribl-prod + url = git@github.e.it.census.gov:sct-engineering/eks-ois-eem-cribl-prod diff --git a/Makefile b/Makefile index cecee6e..07c869a 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,13 @@ .PHONY: help config init validate plan fmt check clean deploy-to-pipeline tail parse trigger-template # Default values ENV ?= development +AWS_REGION ?= us-gov-east-1 +AWS_ACCOUNT_ID ?= 066921446319 +ACCOUNT_NAME ?= ent-ew-logging-prod +AWS_PROFILE ?= 066921446319-ent-gov-logging-prod +CLUSTER_NAME ?= eks-ois-eem-cribl-prod REGION_DIR ?= us-gov-east-1 -CLUSTER_DIR ?= csvd-platform-lab-mcm +CLUSTER_DIR ?= ois-eem-cribl-prod help: @echo "Available targets:" @@ -20,21 +25,21 @@ help: config: @echo "Loading configuration..." -# Detect configuration files - $(eval ACCOUNT_HCL=lab/$(ENV)/account.hcl) - $(eval REGION_HCL=lab/$(ENV)/$(REGION_DIR)/region.hcl) - $(eval CLUSTER_HCL=lab/$(ENV)/$(REGION_DIR)/vpc/$(CLUSTER_DIR)/cluster.hcl) - - @if [ ! -f "$(ACCOUNT_HCL)" ]; then echo "Error: $(ACCOUNT_HCL) not found"; exit 1; fi - @if [ ! -f "$(REGION_HCL)" ]; then echo "Error: $(REGION_HCL) not found"; exit 1; fi - @if [ ! -f "$(CLUSTER_HCL)" ]; then echo "Error: $(CLUSTER_HCL) not found"; exit 1; fi - -# Extract values from HCL files - $(eval AWS_ACCOUNT_ID=$(shell grep -oP 'aws_account_id\s*=\s*"\K[^"]+' $(ACCOUNT_HCL))) - $(eval ACCOUNT_NAME=$(shell grep -oP 'account_name\s*=\s*"\K[^"]+' $(ACCOUNT_HCL))) - $(eval AWS_PROFILE=$(shell echo $(AWS_ACCOUNT_ID)-$(shell echo $(ACCOUNT_NAME) | sed 's/-ew/-gov/'))) - $(eval AWS_REGION=$(shell grep -oP 'aws_region\s*=\s*"\K[^"]+' $(REGION_HCL))) - $(eval CLUSTER_NAME=$(shell grep -oP 'cluster_name\s*=\s*"\K[^"]+' $(CLUSTER_HCL))) +# # Detect configuration files +# $(eval ACCOUNT_HCL=lab/$(ENV)/account.hcl) +# $(eval REGION_HCL=lab/$(ENV)/$(REGION_DIR)/region.hcl) +# $(eval CLUSTER_HCL=lab/$(ENV)/$(REGION_DIR)/vpc/$(CLUSTER_DIR)/cluster.hcl) + +# @if [ ! -f "$(ACCOUNT_HCL)" ]; then echo "Error: $(ACCOUNT_HCL) not found"; exit 1; fi +# @if [ ! -f "$(REGION_HCL)" ]; then echo "Error: $(REGION_HCL) not found"; exit 1; fi +# @if [ ! -f "$(CLUSTER_HCL)" ]; then echo "Error: $(CLUSTER_HCL) not found"; exit 1; fi + +# # Extract values from HCL files +# $(eval AWS_ACCOUNT_ID=$(shell grep -oP 'aws_account_id\s*=\s*"\K[^"]+' $(ACCOUNT_HCL))) +# $(eval ACCOUNT_NAME=$(shell grep -oP 'account_name\s*=\s*"\K[^"]+' $(ACCOUNT_HCL))) +# $(eval AWS_PROFILE=$(shell echo $(AWS_ACCOUNT_ID)-$(shell echo $(ACCOUNT_NAME) | sed 's/-ew/-gov/'))) +# $(eval AWS_REGION=$(shell grep -oP 'aws_region\s*=\s*"\K[^"]+' $(REGION_HCL))) +# $(eval CLUSTER_NAME=$(shell grep -oP 'cluster_name\s*=\s*"\K[^"]+' $(CLUSTER_HCL))) # Calculate derived values $(eval REGION_SHORT=$(shell echo $(AWS_REGION) | sed 's/\([a-z]\)[a-z]*-/\1/g')) diff --git a/README.md b/README.md index 1edcf29..8a01736 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ make fmt # Format files make check # Run all checks make clean # Clean up temporary files make deploy-to-piepeline # zip files and push to s3 for codepipeline -make trigger-template # trigger lambda with config.json to generate new cluster repo +make trigger-template # trigger lambda with config.json to generate new cluster repo ``` ### Manual Terragrunt Commands diff --git a/config.json b/config.json index fda6c3f..907dcb8 100644 --- a/config.json +++ b/config.json @@ -1,37 +1,37 @@ { "body": { - "project_name": "csvd-platform-lab-mcm", + "project_name": "eks-ois-eem-cribl-prod", "owning_team": "tf-module-admins", "template_settings": { - "environment": "development", + "environment": "production", "region": "us-gov-east-1", - "cluster_dir": "csvd-platform-lab-mcm", + "cluster_dir": "ois-eem-cribl-prod", "enable_all_modules": true, "account": { - "account_name": "lab-dev-ew", - "aws_account_id": "224384469011", - "aws_profile": "224384469011-lab-dev-ew", - "environment_abbr": "dev" + "account_name": "ent-ew-logging-prod", + "aws_account_id": "066921446319", + "aws_profile": "066921446319-ent-gov-logging-prod", + "environment_abbr": "prod" }, "vpc": { - "vpc_name": "vpc3-lab-dev", - "vpc_domain_name": "dev.lab.csp2.census.gov" + "vpc_name": "vpc1-inf-services", + "vpc_domain_name": "services.inf.csp1.census.gov" }, "cluster": { - "cluster_name": "csvd-platform-lab-mcm", - "cluster_mailing_list": "matthew.c.morgan@census.gov", + "cluster_name": "ois-eem-cribl-prod", + "cluster_mailing_list": "ois.acmt.list@census.gov", "eks_instance_disk_size": 200, "eks_ng_desired_size": 2, "eks_ng_max_size": 2, "eks_ng_min_size": 2, - "organization": "census:ocio:csvd", - "finops_project_name": "csvd_platformbaseline", - "finops_project_number": "fs0000000078", - "finops_project_role": "csvd_platformbaseline_eks", + "organization": "CHANGEME", + "finops_project_name": "CHANGEME", + "finops_project_number": "CHANGEME", + "finops_project_role": "CHANGEME", "tags": { - "slim:schedule": "8:00-17:00", - "environment": "development", - "owner": "matthew.c.morgan@census.gov", + "slim:schedule": "CHANGEME", + "environment": "production", + "owner": "OIS Security Engineering", "managed_by": "terragrunt" } } diff --git a/lab/clusters/csvd-platform-lab-dja b/lab/clusters/csvd-platform-lab-dja new file mode 160000 index 0000000..16c1db3 --- /dev/null +++ b/lab/clusters/csvd-platform-lab-dja @@ -0,0 +1 @@ +Subproject commit 16c1db3c97392516efc173be6a155f370f336df3 diff --git a/lab/clusters/csvd-platform-lab-mcm b/lab/clusters/csvd-platform-lab-mcm index 66461fe..a732eea 160000 --- a/lab/clusters/csvd-platform-lab-mcm +++ b/lab/clusters/csvd-platform-lab-mcm @@ -1 +1 @@ -Subproject commit 66461fe133a7b9c6459b3bb81f417fa3c0ec45ef +Subproject commit a732eeaa885f4dfb3b42bbbbe058360c2e9d96d3 diff --git a/lab/clusters/csvd-platform-lab-srn b/lab/clusters/csvd-platform-lab-srn index 0843f2e..65a48f8 160000 --- a/lab/clusters/csvd-platform-lab-srn +++ b/lab/clusters/csvd-platform-lab-srn @@ -1 +1 @@ -Subproject commit 0843f2e9100299148d5fa7f52f000ba686be2bcc +Subproject commit 65a48f80acfb07392098ba2505a6077c2738aee5 diff --git a/lab/clusters/eks-ois-eem-cribl-prod b/lab/clusters/eks-ois-eem-cribl-prod new file mode 160000 index 0000000..79e3527 --- /dev/null +++ b/lab/clusters/eks-ois-eem-cribl-prod @@ -0,0 +1 @@ +Subproject commit 79e3527137e8856709f00643db56de0e055763e3