deploy dev with modules

nizamra · nizamra · commit 8f6df7578dce · 2026-02-22T20:47:19.000+02:00
diff --git a/bootstrap/bucket.tf b/bootstrap/bucket.tf
@@ -23,7 +23,7 @@ resource "google_storage_bucket" "terraform_state" {
   labels = {
     environment = "bootstrap"
     managed_by  = "terraform"
-    project     = "gcp-capstone"
+    project     = "gcp-passline"
   }
 
   depends_on = [google_project_service.required_apis]
diff --git a/infra/envs/dev/main.tf b/infra/envs/dev/main.tf
@@ -1,27 +1,27 @@
 # Set up the default VPC and Subnet dynamically, no hardcode IDs
-data "google_compute_network" "default" {
+data "google_compute_network" "vpc" {
   name = var.vpc_network_name
 }
 
 data "google_compute_subnetwork" "default" {
-  name   = "${var.vpc_network_name}-${var.region}"
+  name   = "default"
   region = var.region
 }
 
 module "artifact_registry" {
-  source = "./artifact-registry"
+  source = "../../modules/artifact-registry"
 
   project_id      = var.project_id
   region          = var.region
   repository_name = "bookshelf-docker-repo"
 }
 
 module "gke_cluster" {
-  source = "./gke-cluster"
+  source = "../../modules/gke-cluster"
 
-  project_id        = var.project_id
-  region            = var.region
-  cluster_name      = "bookshelf-dev-cluster"
-  network_name      = data.google_compute_network.default.name
-  subnetwork_name   = data.google_compute_subnetwork.default.name
+  project_id      = var.project_id
+  region          = var.region
+  cluster_name    = "bookshelf-dev-cluster"
+  network_name    = data.google_compute_network.vpc.name
+  subnetwork_name = data.google_compute_subnetwork.default.name
 }
diff --git a/infra/envs/dev/values.tfvars b/infra/envs/dev/values.tfvars
@@ -1,7 +1,5 @@
-project_id        = "gcp-capstone-481414"
-region            = "us-central1"
-state_bucket_name = "gcp-passline-481414-tf-state"
+project_id = "gcp-capstone-481414"
+region     = "us-central1"
 
 # Network configuration
-vpc_network_name = "default-net"
-vpc_subnetwork_name = "default-subnet"
+vpc_network_name = "default"
diff --git a/infra/envs/dev/values.tfvars.example b/infra/envs/dev/values.tfvars.example
@@ -1,3 +1,3 @@
 project_id        = "gcp-passline"
 region            = "us-central1"
-state_bucket_name = "gcp-tf-state"
+vpc_network_name  = "default"
diff --git a/infra/envs/dev/variables.tf b/infra/envs/dev/variables.tf
@@ -11,10 +11,5 @@ variable "region" {
 # Network variables
 variable "vpc_network_name" {
   description = "The name of the VPC network (usually 'default' for new projects)"
-  type       = string
+  type        = string
 }
-
-variable "vpc_subnetwork_name" {
-  description = "The name of the subnetwork (usually 'default' for the region)"
-  type       = string
-}
diff --git a/infra/envs/prod/backend.tf b/infra/envs/prod/backend.tf
@@ -3,4 +3,4 @@ terraform {
     bucket = "gcp-passline-481414-tf-state"
     prefix = "passline/prod"
   }
-}
+}
diff --git a/infra/envs/prod/main.tf b/infra/envs/prod/main.tf
@@ -1 +1,27 @@
+# Set up the default VPC and Subnet dynamically, no hardcode IDs
+data "google_compute_network" "vpc" {
+  name = var.vpc_network_name
+}
 
+data "google_compute_subnetwork" "default" {
+  name   = "default"
+  region = var.region
+}
+
+module "artifact_registry" {
+  source = "../../modules/artifact-registry"
+
+  project_id      = var.project_id
+  region          = var.region
+  repository_name = "bookshelf-docker-repo"
+}
+
+module "gke_cluster" {
+  source = "../../modules/gke-cluster"
+
+  project_id      = var.project_id
+  region          = var.region
+  cluster_name    = "bookshelf-prod-cluster"
+  network_name    = data.google_compute_network.vpc.name
+  subnetwork_name = data.google_compute_subnetwork.default.name
+}
diff --git a/infra/envs/prod/outputs.tf b/infra/envs/prod/outputs.tf
@@ -1 +1,7 @@
+output "artifact_registry_url" {
+  value = module.artifact_registry.repository_url
+}
 
+output "gke_cluster_endpoint" {
+  value = module.gke_cluster.cluster_endpoint
+}
diff --git a/infra/envs/prod/providers.tf b/infra/envs/prod/providers.tf
@@ -11,4 +11,4 @@ terraform {
 provider "google" {
   project = var.project_id
   region  = var.region
-}
+}
diff --git a/infra/envs/prod/values.tfvars b/infra/envs/prod/values.tfvars
@@ -1,3 +1,5 @@
-project_id        = "gcp-capstone-481414"
-region            = "us-central1"
-state_bucket_name = "gcp-passline-481414-tf-state"
+project_id = "gcp-capstone-481414"
+region     = "us-central1"
+
+# Network configuration
+vpc_network_name = "default"
diff --git a/infra/envs/prod/values.tfvars.example b/infra/envs/prod/values.tfvars.example
@@ -1,3 +1,3 @@
 project_id        = "gcp-passline"
 region            = "us-central1"
-state_bucket_name = "gcp-tf-state"
+vpc_network_name  = "default"
diff --git a/infra/envs/prod/variables.tf b/infra/envs/prod/variables.tf
@@ -6,4 +6,10 @@ variable "project_id" {
 variable "region" {
   description = "The GCP region"
   type        = string
-}
+}
+
+# Network variables
+variable "vpc_network_name" {
+  description = "The name of the VPC network (usually 'default' for new projects)"
+  type        = string
+}
diff --git a/infra/modules/artifact-registry/main.tf b/infra/modules/artifact-registry/main.tf
@@ -9,7 +9,7 @@ resource "google_artifact_registry_repository" "docker_repo" {
     id     = "delete-old-untagged"
     action = "DELETE"
     condition {
-      tag_state = "UNTAGGED"
+      tag_state  = "UNTAGGED"
       older_than = "7d"
     }
   }
diff --git a/infra/modules/artifact-registry/outputs.tf b/infra/modules/artifact-registry/outputs.tf
@@ -1,4 +1,4 @@
 output "repository_url" {
   description = "Full URL of the docker repository"
-  value       = google_artifact_registry_repository.docker_repo.repository_url
+  value       = google_artifact_registry_repository.docker_repo.registry_uri
 }
diff --git a/infra/modules/artifact-registry/variables.tf b/infra/modules/artifact-registry/variables.tf
diff --git a/infra/modules/gke-cluster/main.tf b/infra/modules/gke-cluster/main.tf
@@ -3,7 +3,7 @@ resource "google_container_cluster" "primary" {
   location = var.region
   project  = var.project_id
 
-  enable_autopilot = true 
+  enable_autopilot = true
 
   # Network configuration
   network    = var.network_name
@@ -20,9 +20,7 @@ resource "google_container_cluster" "primary" {
     workload_pool = "${var.project_id}.svc.id.goog"
   }
 
-  # Remove default node pool
-  remove_default_node_pool = true
-  initial_node_count       = 1
+  initial_node_count = 1
 
   # Authentication
   master_authorized_networks_config {
diff --git a/infra/modules/gke-cluster/outputs.tf b/infra/modules/gke-cluster/outputs.tf
diff --git a/infra/modules/gke-cluster/variables.tf b/infra/modules/gke-cluster/variables.tf

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ resource "google_storage_bucket" "terraform_state" {`
`23`	`23`	`labels = {`
`24`	`24`	`environment = "bootstrap"`
`25`	`25`	`managed_by = "terraform"`
`26`		`- project = "gcp-capstone"`
	`26`	`+ project = "gcp-passline"`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`depends_on = [google_project_service.required_apis]`
Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,4 @@ terraform {`
`3`	`3`	`bucket = "gcp-passline-481414-tf-state"`
`4`	`4`	`prefix = "passline/prod"`
`5`	`5`	`}`
`6`		`-}`
	`6`	`+}`