feat: remove load balancer

linderttobias · Feb 18, 2024 · b10f7e2 · b10f7e2
1 parent abd1911
commit b10f7e2
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 163 deletions.
diff --git a/infrastructure/cloudrun.tf b/infrastructure/cloudrun.tf
@@ -8,10 +8,14 @@ resource "google_artifact_registry_repository" "gcloudmaps" {
 
 
 
-resource "google_cloud_run_v2_service" "frontend" {
-  name     = "gcloudmaps-frontend"
+resource "google_cloud_run_v2_service" "frontend-production" {
+  name     = "gcloudmaps-frontend-production"
   location = var.region
-  ingress  = "INGRESS_TRAFFIC_INTERNAL_LOAD_BALANCER"
+  ingress  = "INGRESS_TRAFFIC_ALL"
+
+  lifecycle {
+    ignore_changes = [template[0].containers[0].image]
+  }
 
 
   template {
@@ -26,7 +30,7 @@ resource "google_cloud_run_v2_service" "frontend" {
     service_account = google_service_account.umsa-cloudrun.email
 
     containers {
-      image = "europe-west1-docker.pkg.dev/gcloudmaps/gcloudmaps/frontend"
+      image = "europe-west1-docker.pkg.dev/gcloudmaps/gcloudmaps/frontend-production"
       ports {
         container_port = 3000
       }
@@ -35,10 +39,14 @@ resource "google_cloud_run_v2_service" "frontend" {
 
 }
 
-resource "google_cloud_run_v2_service" "backend" {
-  name     = "gcloudmaps-backend"
+resource "google_cloud_run_v2_service" "backend-production" {
+  name     = "gcloudmaps-backend-production"
   location = var.region
-  ingress  = "INGRESS_TRAFFIC_INTERNAL_LOAD_BALANCER"
+  ingress  = "INGRESS_TRAFFIC_ALL"
+
+  lifecycle {
+    ignore_changes = [template[0].containers[0].image]
+  }
 
 
   template {
@@ -53,7 +61,7 @@ resource "google_cloud_run_v2_service" "backend" {
     service_account = google_service_account.umsa-cloudrun.email
 
     containers {
-      image = "europe-west1-docker.pkg.dev/gcloudmaps/gcloudmaps/backend"
+      image = "europe-west1-docker.pkg.dev/gcloudmaps/gcloudmaps/backend-production"
       ports {
         container_port = 3001
       }
@@ -63,11 +71,15 @@ resource "google_cloud_run_v2_service" "backend" {
 }
 
 
-resource "google_cloud_run_v2_service" "frontend-test" {
-  name     = "gcloudmaps-frontend-test"
+resource "google_cloud_run_v2_service" "frontend-development" {
+  name     = "gcloudmaps-frontend-development"
   location = var.region
   ingress  = "INGRESS_TRAFFIC_ALL"
 
+  lifecycle {
+    ignore_changes = [template[0].containers[0].image]
+  }
+
 
   template {
 
@@ -81,7 +93,7 @@ resource "google_cloud_run_v2_service" "frontend-test" {
     service_account = google_service_account.umsa-cloudrun.email
 
     containers {
-      image = "europe-west1-docker.pkg.dev/gcloudmaps/gcloudmaps/frontend"
+      image = "europe-west1-docker.pkg.dev/gcloudmaps/gcloudmaps/frontend-development"
       ports {
         container_port = 3000
       }
@@ -95,11 +107,15 @@ resource "google_cloud_run_v2_service" "frontend-test" {
 
 }
 
-resource "google_cloud_run_v2_service" "backend-test" {
-  name     = "gcloudmaps-backend-test"
+resource "google_cloud_run_v2_service" "backend-development" {
+  name     = "gcloudmaps-backend-development"
   location = var.region
   ingress  = "INGRESS_TRAFFIC_ALL"
 
+  lifecycle {
+    ignore_changes = [template[0].containers[0].image]
+  }
+
 
   template {
 
@@ -113,7 +129,7 @@ resource "google_cloud_run_v2_service" "backend-test" {
     service_account = google_service_account.umsa-cloudrun.email
 
     containers {
-      image = "europe-west1-docker.pkg.dev/gcloudmaps/gcloudmaps/backend"
+      image = "europe-west1-docker.pkg.dev/gcloudmaps/gcloudmaps/backend-development"
       ports {
         container_port = 3001
       }

diff --git a/infrastructure/config.tf b/infrastructure/config.tf
@@ -1,6 +1,6 @@
 
 terraform {
-  required_version = "= 1.4.5"
+  required_version = "= 1.7.1"
 
   backend "gcs" {
     bucket = "gcloudmaps-terraform-state"

diff --git a/infrastructure/iam.tf b/infrastructure/iam.tf
@@ -20,19 +20,38 @@ resource "google_service_account" "umsa-tf-apply" {
   description = "Service Account for Terraform Apply on GitHub Actions"
 }
 
-resource "google_cloud_run_service_iam_binding" "default" {
-  location = google_cloud_run_v2_service.frontend.location
-  service  = google_cloud_run_v2_service.frontend.name
+resource "google_cloud_run_service_iam_binding" "frontend-production" {
+  location = google_cloud_run_v2_service.frontend-production.location
+  service  = google_cloud_run_v2_service.frontend-production.name
   role     = "roles/run.invoker"
   members = [
     "allUsers"
   ]
 }
 
 
-resource "google_cloud_run_service_iam_binding" "backend" {
-  location = google_cloud_run_v2_service.backend.location
-  service  = google_cloud_run_v2_service.backend.name
+resource "google_cloud_run_service_iam_binding" "backend-production" {
+  location = google_cloud_run_v2_service.backend-production.location
+  service  = google_cloud_run_v2_service.backend-production.name
+  role     = "roles/run.invoker"
+  members = [
+    "allUsers"
+  ]
+}
+
+resource "google_cloud_run_service_iam_binding" "frontend-development" {
+  location = google_cloud_run_v2_service.frontend-development.location
+  service  = google_cloud_run_v2_service.frontend-development.name
+  role     = "roles/run.invoker"
+  members = [
+    "allUsers"
+  ]
+}
+
+
+resource "google_cloud_run_service_iam_binding" "backend-development" {
+  location = google_cloud_run_v2_service.backend-development.location
+  service  = google_cloud_run_v2_service.backend-development.name
   role     = "roles/run.invoker"
   members = [
     "allUsers"
@@ -68,33 +87,33 @@ resource "google_artifact_registry_repository_iam_member" "member-cloudbuild" {
 resource "google_cloud_run_service_iam_member" "member-frontend" {
   location = var.region
   project  = var.project
-  service  = google_cloud_run_v2_service.frontend.name
+  service  = google_cloud_run_v2_service.frontend-production.name
   role     = "roles/run.admin"
   member   = "serviceAccount:${google_service_account.umsa-deployment.email}"
 }
 
 resource "google_cloud_run_service_iam_member" "member-backend" {
   location = var.region
   project  = var.project
-  service  = google_cloud_run_v2_service.backend.name
+  service  = google_cloud_run_v2_service.backend-production.name
   role     = "roles/run.admin"
   member   = "serviceAccount:${google_service_account.umsa-deployment.email}"
 }
 
 
 
-resource "google_cloud_run_service_iam_member" "member-frontend-test" {
+resource "google_cloud_run_service_iam_member" "member-frontend-development" {
   location = var.region
   project  = var.project
-  service  = google_cloud_run_v2_service.frontend-test.name
+  service  = google_cloud_run_v2_service.frontend-development.name
   role     = "roles/run.admin"
   member   = "serviceAccount:${google_service_account.umsa-deployment.email}"
 }
 
-resource "google_cloud_run_service_iam_member" "member-backend-test" {
+resource "google_cloud_run_service_iam_member" "member-backend-development" {
   location = var.region
   project  = var.project
-  service  = google_cloud_run_v2_service.backend-test.name
+  service  = google_cloud_run_v2_service.backend-development.name
   role     = "roles/run.admin"
   member   = "serviceAccount:${google_service_account.umsa-deployment.email}"
 }
diff --git a/infrastructure/loadbalancer.tf b/infrastructure/loadbalancer.tf