Skip to content

Commit

Permalink
latest updates
Browse files Browse the repository at this point in the history
  • Loading branch information
morga471 committed Sep 5, 2024
1 parent d089983 commit 1dd9d63
Show file tree
Hide file tree
Showing 11 changed files with 57 additions and 48 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ include "root" {
}

terraform {
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=mcmCluster"
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git"
extra_arguments "retry_lock" {
commands = get_terraform_commands_that_need_locking()
arguments = ["-lock-timeout=20m"]
Expand All @@ -13,9 +13,9 @@ terraform {
dependency "eks" {
config_path = "../eks"
}
dependency "eks-metrics-server" {
config_path = "../eks-metrics-server"
}
# dependency "eks-metrics-server" {
# config_path = "../eks-metrics-server"
# }

inputs = {
cluster_name = dependency.eks.inputs.cluster_name
Expand Down
6 changes: 1 addition & 5 deletions lab/us-gov-east-1/vpc/_mcmCluster/eks-config/terragrunt.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ locals {
}

terraform {
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=mcmCluster"
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git"
extra_arguments "retry_lock" {
commands = get_terraform_commands_that_need_locking()
arguments = ["-lock-timeout=20m"]
Expand All @@ -18,10 +18,6 @@ dependency "eks" {
config_path = "../eks"
}

dependency "eks-karpenter" {
config_path = "../eks-karpenter"
}

inputs = {
profile = dependency.eks.inputs.profile
vpc_id = dependency.eks.outputs.vpc_id
Expand Down
30 changes: 30 additions & 0 deletions lab/us-gov-east-1/vpc/_mcmCluster/eks-grafana/terragrunt.hcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
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"
}

dependency "eks-config" {
config_path = "../eks-config"
}

dependency "eks-loki" {
config_path = "../eks-loki"
}

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
}
rwo_storage_class = dependency.eks-config.outputs.rwo_storage_class
}
26 changes: 0 additions & 26 deletions lab/us-gov-east-1/vpc/_mcmCluster/eks-grafana/terragrunt.hcl.off

This file was deleted.

7 changes: 4 additions & 3 deletions lab/us-gov-east-1/vpc/_mcmCluster/eks-istio/terragrunt.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ terraform {
dependency "eks" {
config_path = "../eks"
}
dependency "eks-cert-manager" {
config_path = "../eks-cert-manager"
}

# dependency "eks-cert-manager" {
# config_path = "../eks-cert-manager"
# }

inputs = {
profile = dependency.eks.inputs.profile
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ include "root" {
}

terraform {
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-karpenter.git?ref=mcmCluster"
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-karpenter.git"
extra_arguments "retry_lock" {
commands = get_terraform_commands_that_need_locking()
arguments = ["-lock-timeout=20m"]
Expand All @@ -14,6 +14,11 @@ dependency "eks" {
config_path = "../eks"
}

dependency "eks-cert-manager" {
config_path = "../eks-cert-manager"
skip_outputs = true
}

inputs = {
profile = dependency.eks.inputs.profile
cluster_endpoint = dependency.eks.outputs.cluster_endpoint
Expand Down
6 changes: 4 additions & 2 deletions lab/us-gov-east-1/vpc/_mcmCluster/eks-loki/terragrunt.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ terraform {
dependency "eks" {
config_path = "../eks"
}
dependency "eks-istio" {
config_path = "../eks-istio"

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

inputs = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ locals {
}

terraform {
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-metrics-server.git?ref=mcmCluster"
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-metrics-server.git"
extra_arguments "retry_lock" {
commands = get_terraform_commands_that_need_locking()
arguments = ["-lock-timeout=20m"]
Expand All @@ -17,9 +17,9 @@ terraform {
dependency "eks" {
config_path = "../eks"
}
dependency "eks-config" {
config_path = "../eks-config"
}
# dependency "eks-config" {
# config_path = "../eks-config"
# }

inputs = {
profile = dependency.eks.inputs.profile
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ include "root" {
}

terraform {
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-prometheus.git?ref=mcmCluster"
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-prometheus.git"
extra_arguments "retry_lock" {
commands = get_terraform_commands_that_need_locking()
arguments = ["-lock-timeout=20m"]
Expand All @@ -14,7 +14,8 @@ dependency "eks" {
config_path = "../eks"
}
dependency "eks-loki" {
config_path = "../eks-loki"
config_path = "../eks-loki"
skip_outputs = true
}

inputs = {
Expand Down
2 changes: 1 addition & 1 deletion lab/us-gov-east-1/vpc/_mcmCluster/eks/terragrunt.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ locals {
}

terraform {
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git?ref=ver"
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git"
extra_arguments "retry_lock" {
commands = get_terraform_commands_that_need_locking()
arguments = ["-lock-timeout=20m"]
Expand Down

0 comments on commit 1dd9d63

Please sign in to comment.