From 1768a754b18c99265f69db18049b6cf041089784 Mon Sep 17 00:00:00 2001
From: Menna Tullah Magdy Taha <menna.tullah.magdy731@gmail.com>
Date: Wed, 27 Mar 2024 11:25:48 +0100
Subject: [PATCH] Fixed merge conflict

---
 main.tf | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/main.tf b/main.tf
index 4fa8e8f..c67e107 100644
--- 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"
- }
-}
\ No newline at end of file
+}