Fixed merge conflict

.github/workflows/terraform.yml

@@ -94,7 +94,7 @@ jobs:
 
       # Apply terraform
       - name: Terraform Apply
-        run: TF_LOG=debug terraform apply -var 'gcp_credentials=${{ secrets.GCP_SA_KEY }}' -var 'application_name=${{github.event.input.applicationName}}' -auto-approve
+        run: terraform apply -var 'gcp_credentials=${{ secrets.GCP_SA_KEY }}' -var 'application_name=${{github.event.input.applicationName}}' -auto-approve
 
       - name: Terraform output
         run: terraform output

main.tf

@@ -1,13 +1,19 @@
-resource "kubernetes_namespace" "nodexpressv3" {
+resource "google_project_iam_member" "artifact_role" {
+  role = "roles/artifactregistry.reader"
+  member  = "serviceAccount:${var.gke_service_account_name}"
+  project = var.gcp_project_id
+}
+
+resource "kubernetes_namespace" "nodejs" {
   metadata {
-    name = "nodexpressv3-namespace"
+    name = "nodejs-namespace"
   }
 }
 
 resource "kubernetes_deployment" "api-skaffold" {  
   metadata {
     name      = "test"
-    namespace = kubernetes_namespace.nodexpressv3.metadata.0.name
+    namespace = "nodejs-namespace"
   }
   spec {
     replicas = 1
@@ -38,7 +44,7 @@ resource "kubernetes_deployment" "api-skaffold" {
 resource "kubernetes_service" "api-skaffold_service" {
   metadata {
     name      = "test"
-    namespace = "kubernetes_namespace.nodexpressv3.metadata.0.name"
+    namespace = ""nodejs-namespace""
   }
   spec {
     selector = {
@@ -50,8 +56,4 @@ resource "kubernetes_service" "api-skaffold_service" {
       target_port = 3000
     }
   }
-   wait_for_completion = true
-   timeouts {
-   create = "40s"
- }
-}
+}

variables.tf

@@ -11,7 +11,7 @@ variable "gcp_region" {
 }
 
 variable "gke_cluster_name" {
-  default     = "experimental-cluster"
+  default     = "expiremental-cluster"
   description = "Name of the cluster to deploy to"
 }