From 9720802e12af42ede53821bddef8ea1f3e85aa71 Mon Sep 17 00:00:00 2001 From: mcgin314 Date: Fri, 20 Sep 2024 15:56:09 -0400 Subject: [PATCH] Merge all latest module updates to terragrunt repo structure --- .gitignore | 1 + .../platform-eng-eks-mcm/eks/terragrunt.hcl | 6 +- .../platform-test-x/eks-dns/terragrunt.hcl | 31 ++++++++ .../eks-grafana/terragrunt.hcl,disable | 38 +++++++++ .../platform-test-x/eks-istio/terragrunt.hcl | 1 + .../eks-k8s-dashboard/terragrunt.hcl.disable | 31 ++++++++ .../eks-kiali.disable/terragrunt.hcl.disable | 77 +++++++++++++++++++ .../eks-loki/terragrunt.hcl.disable | 31 ++++++++ .../eks-prometheus/terragrunt.hcl.disable | 30 ++++++++ .../eks-tempo/terragrunt.hcl.disable | 41 ++++++++++ 10 files changed, 286 insertions(+), 1 deletion(-) create mode 100644 lab/development/us-gov-east-1/vpc/platform-test-x/eks-dns/terragrunt.hcl create mode 100644 lab/development/us-gov-east-1/vpc/platform-test-x/eks-grafana/terragrunt.hcl,disable create mode 100644 lab/development/us-gov-east-1/vpc/platform-test-x/eks-k8s-dashboard/terragrunt.hcl.disable create mode 100644 lab/development/us-gov-east-1/vpc/platform-test-x/eks-kiali.disable/terragrunt.hcl.disable create mode 100644 lab/development/us-gov-east-1/vpc/platform-test-x/eks-loki/terragrunt.hcl.disable create mode 100644 lab/development/us-gov-east-1/vpc/platform-test-x/eks-prometheus/terragrunt.hcl.disable create mode 100644 lab/development/us-gov-east-1/vpc/platform-test-x/eks-tempo/terragrunt.hcl.disable diff --git a/.gitignore b/.gitignore index 4b51fc4..4b072ca 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ terraform.rc .terragrunt-cache/ backend.tf provider*.tf +remote_state.backend.tf diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks/terragrunt.hcl index 3bf52f9..324ab9f 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks/terragrunt.hcl @@ -10,8 +10,10 @@ 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 @@ -20,12 +22,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 = { - "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}" diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-dns/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-dns/terragrunt.hcl new file mode 100644 index 0000000..02eb7fc --- /dev/null +++ b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-dns/terragrunt.hcl @@ -0,0 +1,31 @@ +include "root" { + path = find_in_parent_folders() + expose = true +} + +terraform { + # source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-dns.git" + source = "../../../../../../../tfmod-eks-dns" + 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 +} diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-grafana/terragrunt.hcl,disable b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-grafana/terragrunt.hcl,disable new file mode 100644 index 0000000..c2172e8 --- /dev/null +++ b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-grafana/terragrunt.hcl,disable @@ -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 +} diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-istio/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-istio/terragrunt.hcl index 5a30c0e..7ec5357 100644 --- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-istio/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-istio/terragrunt.hcl @@ -17,6 +17,7 @@ dependency "eks" { cluster_name = "a-cluster-name" } } + dependency "eks-karpenter" { config_path = "../eks-karpenter" skip_outputs = true diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-k8s-dashboard/terragrunt.hcl.disable b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-k8s-dashboard/terragrunt.hcl.disable new file mode 100644 index 0000000..6434120 --- /dev/null +++ b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-k8s-dashboard/terragrunt.hcl.disable @@ -0,0 +1,31 @@ +include "root" { + path = find_in_parent_folders() + expose = true +} + +terraform { + # source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio.git?ref=main" + source = "../../../../../../../tfmod-k8s-dashboard" + 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-karpenter" { + config_path = "../eks-karpenter" + skip_outputs = true +} + +inputs = { + profile = include.root.inputs.aws_profile + region = include.root.inputs.aws_region + cluster_name = dependency.eks.outputs.cluster_name + # k8s_dashboard_version = "v2.0.0" # NEW IDEA TO START PINNING VERSIONING OF COMPONENT TO TF MODULE VERSION +} diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-kiali.disable/terragrunt.hcl.disable b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-kiali.disable/terragrunt.hcl.disable new file mode 100644 index 0000000..ac0a548 --- /dev/null +++ b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-kiali.disable/terragrunt.hcl.disable @@ -0,0 +1,77 @@ +include "root" { + path = find_in_parent_folders() + expose = true +} + +terraform { + # 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"] + } +} + +dependency "eks" { + config_path = "../eks" + 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 = { + profile = include.root.inputs.aws_profile + cluster_domain = dependency.eks.inputs.vpc_domain_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 = "grafana" + # grafana_secret_name = dependency.eks-grafana.outputs.secret_name + jaeger_internal_url = "" + + + # client_id = var.sso_client_id + # client_secret = var.sso_client_secret + # keycloak_public_url = var.keycloak_public_url + # gogatekeeper_chart_version = var.gogatekeeper_chart_version + # gogatekeeper_registry = var.gogatekeeper_registry + # gogatekeeper_repository = var.gogatekeeper_repository + # gogatekeeper_tag = var.gogatekeeper_tag +} diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-loki/terragrunt.hcl.disable b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-loki/terragrunt.hcl.disable new file mode 100644 index 0000000..cc94f7f --- /dev/null +++ b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-loki/terragrunt.hcl.disable @@ -0,0 +1,31 @@ +include "root" { + path = find_in_parent_folders() + expose = true +} + +terraform { + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-loki.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_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" + } +} +dependency "eks-istio" { + config_path = "../eks-istio" + skip_outputs = true +} + +inputs = { + profile = include.root.inputs.aws_profile + region = include.root.inputs.aws_region + cluster_name = dependency.eks.outputs.cluster_name + oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn +} diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-prometheus/terragrunt.hcl.disable b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-prometheus/terragrunt.hcl.disable new file mode 100644 index 0000000..62611b1 --- /dev/null +++ b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-prometheus/terragrunt.hcl.disable @@ -0,0 +1,30 @@ +include "root" { + path = find_in_parent_folders() + expose = true +} + +terraform { + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-prometheus.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_name = "a-cluster-name" + } +} + +dependency "eks-istio" { + config_path = "../eks-istio" + skip_outputs = true +} + +inputs = { + profile = include.root.inputs.aws_profile + region = include.root.inputs.aws_region + cluster_name = dependency.eks.outputs.cluster_name +} diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-tempo/terragrunt.hcl.disable b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-tempo/terragrunt.hcl.disable new file mode 100644 index 0000000..7f3d706 --- /dev/null +++ b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-tempo/terragrunt.hcl.disable @@ -0,0 +1,41 @@ +include "root" { + path = find_in_parent_folders() + expose = true +} + +terraform { + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-tempo.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_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" + } +} + +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/" + } + prometheus_namespace = "prometheus" + } +} + +inputs = { + profile = include.root.inputs.aws_profile + region = include.root.inputs.aws_region + cluster_name = dependency.eks.outputs.cluster_name + 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 +}