Fixed merge conflict

alkaline-0 · Mar 27, 2024 · 1768a75 · 1768a75
1 parent 6b56274
commit 1768a75
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/main.tf b/main.tf
@@ -11,6 +11,7 @@ resource "kubernetes_deployment" "api-skaffold" {
   }
   spec {
     replicas = 1
+    progressDeadlineSeconds = 600
     selector {
       match_labels = {
         app = "test"
@@ -50,8 +51,4 @@ resource "kubernetes_service" "api-skaffold_service" {
       target_port = 3000
     }
   }
-   wait_for_completion = true
-   timeouts {
-   create = "40s"
- }
-}
+}