Skip to content

Commit

Permalink
Merge pull request #10 from SCT-Engineering/ci-cd-validation
Browse files Browse the repository at this point in the history
e2e plan + dns module
  • Loading branch information
mcgin314 committed Sep 20, 2024
2 parents a134643 + 302a318 commit 6f739db
Show file tree
Hide file tree
Showing 14 changed files with 201 additions and 96 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ terraform.rc
.terragrunt-cache/
backend.tf
provider*.tf
remote_state.backend.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
include "root" {
path = find_in_parent_folders()
path = find_in_parent_folders()
expose = true
}

terraform {
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
29 changes: 16 additions & 13 deletions lab/us-gov-east-1/vpc/_mcmCluster/eks-config/terragrunt.hcl
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
include "root" {
path = find_in_parent_folders()
}

locals {
tag_costallocation = "census:csvd:platformbaseline"
path = find_in_parent_folders()
expose = true
}

terraform {
Expand All @@ -16,18 +13,24 @@ terraform {

dependency "eks" {
config_path = "../eks"
mock_outputs = {
cluster_name = "a-cluster-name"
eks_managed_node_groups_autoscaling_group_names = ["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"
security_group_all_worker_mgmt_id = "sg-00b0000000000000"
subnets = ["subnet-00000000000000001", "subnet-00000000000000002", "subnet-00000000000000003", ]
vpc_id = "a-vpc-id"
}
}

inputs = {
profile = dependency.eks.inputs.profile
vpc_id = dependency.eks.outputs.vpc_id
cluster_name = dependency.eks.inputs.cluster_name
# cluster_autoscaler_role_name = dependency.eks.outputs.cluster_autoscaler_role_name
subnets = dependency.eks.outputs.subnets
security_group_all_worker_mgmt_id = dependency.eks.outputs.security_group_all_worker_mgmt_id
cluster_name = dependency.eks.outputs.cluster_name
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
profile = include.root.inputs.aws_profile
region = include.root.inputs.aws_region
security_group_all_worker_mgmt_id = dependency.eks.outputs.security_group_all_worker_mgmt_id
subnets = dependency.eks.outputs.subnets
tags = dependency.eks.inputs.tags
tag_costallocation = local.tag_costallocation
region = dependency.eks.inputs.region
vpc_id = dependency.eks.outputs.vpc_id
}
30 changes: 30 additions & 0 deletions lab/us-gov-east-1/vpc/_mcmCluster/eks-dns/terragrunt.hcl
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
}
29 changes: 22 additions & 7 deletions lab/us-gov-east-1/vpc/_mcmCluster/eks-grafana/terragrunt.hcl
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
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" {
Expand All @@ -8,10 +13,23 @@ terraform {

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

dependency "eks-config" {
config_path = "../eks-config"
mock_outputs = {
rwo_storage_class = "a-storage-class"
}
}

dependency "eks-dns" {
config_path = "../eks-dns"
mock_outputs = {
cluster_domain = "a-cluster-domain"
}
}

dependency "eks-istio" {
Expand All @@ -25,12 +43,9 @@ dependency "eks-karpenter" {
}

inputs = {
profile = dependency.eks.inputs.profile
cluster_name = dependency.eks.inputs.cluster_name
region = dependency.eks.inputs.region
cluster_domain = dependency.eks.inputs.vpc_domain_name
# datasources = {
# loki = dependency.eks-loki.outputs.gateway_internal_endpoint
# }
cluster_domain = dependency.eks-dns.outputs.cluster_domain
cluster_name = dependency.eks.outputs.cluster_name
profile = include.root.inputs.aws_profile
region = include.root.inputs.aws_region
rwo_storage_class = dependency.eks-config.outputs.rwo_storage_class
}
13 changes: 9 additions & 4 deletions lab/us-gov-east-1/vpc/_mcmCluster/eks-istio/terragrunt.hcl
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
include "root" {
path = find_in_parent_folders()
path = find_in_parent_folders()
expose = true
}

terraform {
Expand All @@ -12,17 +13,21 @@ 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"
}
16 changes: 12 additions & 4 deletions lab/us-gov-east-1/vpc/_mcmCluster/eks-karpenter/terragrunt.hcl
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
include "root" {
path = find_in_parent_folders()
path = find_in_parent_folders()
expose = true
}

terraform {
Expand All @@ -12,6 +13,13 @@ terraform {

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-cert-manager" {
Expand All @@ -20,11 +28,11 @@ dependency "eks-cert-manager" {
}

inputs = {
profile = dependency.eks.inputs.profile
cluster_endpoint = dependency.eks.outputs.cluster_endpoint
cluster_name = dependency.eks.inputs.cluster_name
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
region = dependency.eks.inputs.region
profile = include.root.inputs.aws_profile
region = include.root.inputs.aws_region
vpc_id = dependency.eks.outputs.vpc_id
}
41 changes: 31 additions & 10 deletions lab/us-gov-east-1/vpc/_mcmCluster/eks-kiali/terragrunt.hcl.off
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
include "root" {
path = find_in_parent_folders()
}

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

terraform {
Expand All @@ -16,31 +13,55 @@ 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
cluster_domain = dependency.eks.inputs.vpc_domain_name
cluster_name = dependency.eks.inputs.cluster_name
cluster_domain = dependency.eks.outputs.vpc_domain_name
cluster_name = dependency.eks.outputs.cluster_name
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
jaeger_internal_url = ""
operators_namespace = dependency.eks-config.outputs.operators_ns
profile = dependency.eks.inputs.profile
profile = include.root.inputs.aws_profile
prometheus_internal_url = dependency.eks-prometheus.outputs.prometheus_server_internal_endpoint.url


Expand Down
11 changes: 8 additions & 3 deletions lab/us-gov-east-1/vpc/_mcmCluster/eks-loki/terragrunt.hcl
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
include "root" {
path = find_in_parent_folders()
path = find_in_parent_folders()
expose = true
}

terraform {
Expand All @@ -12,6 +13,10 @@ 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"
}
}

dependency "eks-grafana" {
Expand All @@ -20,8 +25,8 @@ dependency "eks-grafana" {
}

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

locals {
tag_costallocation = "census:csvd:platformbaseline"
path = find_in_parent_folders()
expose = true
}

terraform {
Expand All @@ -16,15 +13,13 @@ terraform {

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

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

inputs = {
profile = dependency.eks.inputs.profile
cluster_name = dependency.eks.inputs.cluster_name
region = dependency.eks.inputs.region
cluster_name = dependency.eks.outputs.cluster_name
profile = include.root.inputs.aws_profile
region = include.root.inputs.aws_region
}
14 changes: 9 additions & 5 deletions lab/us-gov-east-1/vpc/_mcmCluster/eks-prometheus/terragrunt.hcl
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
include "root" {
path = find_in_parent_folders()
path = find_in_parent_folders()
expose = true
}

terraform {
Expand All @@ -12,15 +13,18 @@ terraform {

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

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

0 comments on commit 6f739db

Please sign in to comment.