Fixed merge conflict

alkaline-0 · Mar 27, 2024 · 6b56274 · 6b56274
1 parent 34e7940
commit 6b56274
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,6 +31,4 @@ override.tf.json
 
 # Ignore CLI configuration files
 .terraformrc
-terraform.rc
-
-db.secret
+terraform.rc
diff --git a/main.tf b/main.tf
@@ -1,13 +1,13 @@
-resource "kubernetes_namespace" "nodexpressv2" {
+resource "kubernetes_namespace" "nodexpressv3" {
   metadata {
-    name = "nodexpressv2-namespace"
+    name = "nodexpressv3-namespace"
   }
 }
 
 resource "kubernetes_deployment" "api-skaffold" {  
   metadata {
     name      = "test"
-    namespace = kubernetes_namespace.nodexpressv2.metadata.0.name
+    namespace = kubernetes_namespace.nodexpressv3.metadata.0.name
   }
   spec {
     replicas = 1
@@ -38,7 +38,7 @@ resource "kubernetes_deployment" "api-skaffold" {
 resource "kubernetes_service" "api-skaffold_service" {
   metadata {
     name      = "test"
-    namespace = "kubernetes_namespace.nodexpressv2.metadata.0.name"
+    namespace = "kubernetes_namespace.nodexpressv3.metadata.0.name"
   }
   spec {
     selector = {
@@ -50,4 +50,8 @@ resource "kubernetes_service" "api-skaffold_service" {
       target_port = 3000
     }
   }
+   wait_for_completion = true
+   timeouts {
+   create = "40s"
+ }
 }