Extend timeouts for single-node

dominodatalab · Nov 12, 2024 · 3e59a52 · 3e59a52
1 parent f77c10d
commit 3e59a52
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -195,6 +195,7 @@ commands:
           name: Deploy single-node
           working_directory: tests/deploy
           command: bash ci-deploy.sh deploy_single_node
+          no_output_timeout: "20m"
 
   tf_destroy_single_node:
     description: "Terraform destroy single-node"
@@ -203,6 +204,7 @@ commands:
           name: Destroy single-node
           working_directory: tests/deploy
           command: bash ci-deploy.sh destroy_single_node
+          no_output_timeout: "20m"
 
   tf_deploy:
     description: "Terraform deploy"

diff --git a/modules/eks/submodules/k8s/templates/k8s-functions.sh.tftpl b/modules/eks/submodules/k8s/templates/k8s-functions.sh.tftpl
@@ -183,7 +183,8 @@ kubectl_cmd() {
 }
 
 wait_for_single_node() {
-  TIMEOUT=600
+  # Derive timeout from first argument
+  TIMEOUT=${1:-600}
   ELAPSED_TIME=0
   SLEEP_INTERVAL=30
 

diff --git a/modules/single-node/main.tf b/modules/single-node/main.tf
@@ -33,7 +33,7 @@ resource "terraform_data" "node_is_ready" {
   # Even though the node is ready coredns hangs or takes 15m, waiting a bit reduces it to 15s.
   # https://github.com/terraform-aws-modules/terraform-aws-eks/issues/1801
   provisioner "local-exec" {
-    command     = "bash ./${basename(var.eks_info.k8s_pre_setup_sh_file)} wait_for_single_node && sleep 60"
+    command     = "bash ./${basename(var.eks_info.k8s_pre_setup_sh_file)} wait_for_single_node 1200 && sleep 60"
     interpreter = ["bash", "-c"]
     working_dir = dirname(var.eks_info.k8s_pre_setup_sh_file)
   }