From 377b583b6d9eca7147a36c6b5a805dbdca735c11 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Thu, 20 Feb 2025 22:31:46 -0500 Subject: [PATCH] less lock timeout --- .../vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl | 2 +- .../vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl | 2 +- .../vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl | 2 +- .../vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl | 2 +- .../vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl | 2 +- .../platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl | 2 +- .../vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl | 2 +- .../vpc/platform-eng-eks-mcm/eks-loki/terragrunt.hcl | 5 +++-- .../platform-eng-eks-mcm/eks-metrics-server/terragrunt.hcl | 2 +- .../vpc/platform-eng-eks-mcm/eks-prometheus/terragrunt.hcl | 5 +++-- .../vpc/platform-eng-eks-mcm/eks-tempo/terragrunt.hcl | 2 +- .../vpc/platform-eng-eks-mcm/eks/terragrunt.hcl | 2 +- 12 files changed, 16 insertions(+), 14 deletions(-) diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl index 5ceaeae..ea7cc82 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl @@ -9,7 +9,7 @@ terraform { extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() - arguments = ["-lock-timeout=20m"] + arguments = ["-lock-timeout=20s"] } } diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl index ae14eea..9798f19 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl @@ -16,7 +16,7 @@ terraform { extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() - arguments = ["-lock-timeout=20m"] + arguments = ["-lock-timeout=20s"] } } diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl index 41b816b..d1a51f5 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl @@ -8,7 +8,7 @@ terraform { source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-dns.git?ref=explictProvider" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() - arguments = ["-lock-timeout=20m"] + arguments = ["-lock-timeout=20s"] } } diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl index d41363a..ed53c15 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl @@ -8,7 +8,7 @@ terraform { source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-grafana.git?ref=cert_clash" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() - arguments = ["-lock-timeout=20m"] + arguments = ["-lock-timeout=20s"] } } diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl index b9712be..1acb519 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl @@ -8,7 +8,7 @@ terraform { source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio.git?ref=outputs" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() - arguments = ["-lock-timeout=20m"] + arguments = ["-lock-timeout=20s"] } } diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl index 94a1301..f213603 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl @@ -8,7 +8,7 @@ terraform { source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-k8s-dashboard.git?ref=cert_clash" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() - arguments = ["-lock-timeout=20m"] + arguments = ["-lock-timeout=20s"] } } diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl index 7d376f9..1ec3a41 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl @@ -9,7 +9,7 @@ terraform { extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() - arguments = ["-lock-timeout=20m"] + arguments = ["-lock-timeout=20s"] } } diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-loki/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-loki/terragrunt.hcl index 45acca4..e1ccdfd 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-loki/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-loki/terragrunt.hcl @@ -7,7 +7,8 @@ include "root" { dependencies { paths = [ "../eks", - "../eks-config" + "../eks-config", + "../eks-metrics-server" ] } @@ -32,7 +33,7 @@ terraform { source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-loki.git?ref=read_fix" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() - arguments = ["-lock-timeout=20m"] + arguments = ["-lock-timeout=20s"] } } diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-metrics-server/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-metrics-server/terragrunt.hcl index ef2851f..4e4d198 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-metrics-server/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-metrics-server/terragrunt.hcl @@ -23,7 +23,7 @@ terraform { source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-metrics-server.git?ref=${include.root.inputs.release_version}" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() - arguments = ["-lock-timeout=20m"] + arguments = ["-lock-timeout=20s"] } } diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-prometheus/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-prometheus/terragrunt.hcl index c9bc3c3..65a90e4 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-prometheus/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-prometheus/terragrunt.hcl @@ -8,14 +8,15 @@ terraform { source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-prometheus.git?ref=${include.root.inputs.release_version}" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() - arguments = ["-lock-timeout=20m"] + arguments = ["-lock-timeout=20s"] } } dependencies { paths = [ "../eks", - "../eks-config" + "../eks-config", + "../eks-metrics-server" ] } diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-tempo/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-tempo/terragrunt.hcl index 89a51eb..dc22271 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-tempo/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-tempo/terragrunt.hcl @@ -8,7 +8,7 @@ terraform { source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-tempo.git?ref=${include.root.inputs.release_version}" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() - arguments = ["-lock-timeout=20m"] + arguments = ["-lock-timeout=20s"] } } 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 f12f202..9eca1de 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 @@ -9,7 +9,7 @@ terraform { extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() - arguments = ["-lock-timeout=20m"] + arguments = ["-lock-timeout=20s"] } }