Skip to content

Commit

Permalink
Format and fix state variables
Browse files Browse the repository at this point in the history
  • Loading branch information
@mcgin314
mcgin314 committed Sep 17, 2024
1 parent c6d29f6 commit 364ff99
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 28 deletions.
2 changes: 1 addition & 1 deletion lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-tempo/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ terraform {
dependency "eks" {
config_path = "../eks"
mock_outputs = {
cluster_name = "a-cluster-name"
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"
}
}
Expand Down
6 changes: 3 additions & 3 deletions lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ locals {
# 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}"
"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}"
}

}
Expand Down
2 changes: 1 addition & 1 deletion lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-tempo/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ terraform {
dependency "eks" {
config_path = "../eks"
mock_outputs = {
cluster_name = "a-cluster-name"
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"
}
}
Expand Down
6 changes: 3 additions & 3 deletions lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ locals {
# 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}"
"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}"
}

}
Expand Down
2 changes: 1 addition & 1 deletion lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-tempo/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ terraform {
dependency "eks" {
config_path = "../eks"
mock_outputs = {
cluster_name = "a-cluster-name"
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"
}
}
Expand Down
10 changes: 5 additions & 5 deletions lab/development/us-gov-east-1/vpc/platform-test-x/eks-kiali.disable/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
include "root" {
path = find_in_parent_folders()
path = find_in_parent_folders()
expose = true
}

Expand Down Expand Up @@ -42,13 +42,13 @@ dependency "eks-grafana" {
port_number = "80"
url = "https://grafana.grafana.svc.cluster.local:80/"
}
namespace = "grafana"
public_endpoint = {
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"
secret_name = "grafana"
}
}

Expand All @@ -64,7 +64,7 @@ inputs = {
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 = ""
jaeger_internal_url = ""


# client_id = var.sso_client_id
Expand Down
2 changes: 1 addition & 1 deletion lab/development/us-gov-east-1/vpc/platform-test-x/eks-tempo/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ terraform {
dependency "eks" {
config_path = "../eks"
mock_outputs = {
cluster_name = "a-cluster-name"
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"
}
}
Expand Down
6 changes: 3 additions & 3 deletions lab/development/us-gov-east-1/vpc/platform-test-x/eks/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ locals {
# 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}"
"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}"
}

}
Expand Down
22 changes: 12 additions & 10 deletions lab/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,19 @@ locals {

# Automatically load vpc-level variables
vpc_vars = read_terragrunt_config(find_in_parent_folders("vpc.hcl", "skip-account-if-does-not-exist"))
# vpc_vars = read_terragrunt_config(find_in_parent_folders("vpc.hcl", "skip-account-if-does-not-exist"))
# vpc_vars = read_terragrunt_config(find_in_parent_folders("vpc.hcl", "skip-account-if-does-not-exist"))

# Extract the variables we need for easy access
account_name = local.account_vars.locals.account_name
account_id = local.account_vars.locals.aws_account_id
aws_profile = local.account_vars.locals.aws_profile
aws_region = local.region_vars.locals.aws_region
organization = local.common_vars.locals.organization
project_number = local.common_vars.locals.project_number
project_name = local.common_vars.locals.project_name
project_role = local.common_vars.locals.project_role
account_name = local.account_vars.locals.account_name
account_id = local.account_vars.locals.aws_account_id
aws_profile = local.account_vars.locals.aws_profile
aws_region = local.region_vars.locals.aws_region
organization = local.common_vars.locals.organization
project_number = local.common_vars.locals.project_number
project_name = local.common_vars.locals.project_name
project_role = local.common_vars.locals.project_role
state_bucket_prefix = "inf-tfstate"
state_table_name = "tf_remote_state"
}

# Generate an AWS provider block
Expand Down Expand Up @@ -91,7 +93,7 @@ remote_state {
skip_bucket_enforced_tls = true # use only if you need to access the S3 bucket without TLS being enforced
skip_bucket_public_access_blocking = true
skip_bucket_root_access = true # use only if the AWS account root user should not have access to the remote state bucket for some reason
skip_bucket_ssencryption = true # use only if non-encrypted OpenTofu/Terraform State is required and/or the object store does not support server-side encryption
skip_bucket_ssencryption = true # use only if non-encrypted OpenTofu/Terraform State is required and/or the object store does not support server-side encryption
skip_bucket_versioning = false # use only if the object store does not support versioning
enable_lock_table_ssencryption = false # use only if non-encrypted DynamoDB Lock Table for the OpenTofu/Terraform State is required and/or the NoSQL database service does not support server-side encryption
}
Expand Down

0 comments on commit 364ff99

Please sign in to comment.