Merge fix

AztecProtocol · Dec 5, 2024 · 2582b23 · 2582b23
1 parent 6b2a2ca
commit 2582b23
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/spartan/terraform/gke-cluster/firewall.tf b/spartan/terraform/gke-cluster/firewall.tf
@@ -8,7 +8,7 @@ resource "google_compute_firewall" "udp_ingress" {
   }
   direction     = "INGRESS"
   source_ranges = ["0.0.0.0/0"]
-  target_tags   = ["gke-node"]
+  target_tags   = ["gke-node, aztec-gke-node"]
 }
 
 # Create egress firewall rules for UDP
@@ -21,7 +21,7 @@ resource "google_compute_firewall" "udp_egress" {
   }
   direction          = "EGRESS"
   destination_ranges = ["0.0.0.0/0"]
-  target_tags        = ["gke-node"]
+  target_tags        = ["gke-node, aztec-gke-node"]
 }
 
 # Create ingress firewall rules for TCP
@@ -34,7 +34,7 @@ resource "google_compute_firewall" "tcp_ingress" {
   }
   direction     = "INGRESS"
   source_ranges = ["0.0.0.0/0"]
-  target_tags   = ["gke-node"]
+  target_tags   = ["gke-node, aztec-gke-node"]
 }
 
 # Create egress firewall rules for TCP
@@ -47,5 +47,5 @@ resource "google_compute_firewall" "tcp_egress" {
   }
   direction          = "EGRESS"
   destination_ranges = ["0.0.0.0/0"]
-  target_tags        = ["gke-node"]
+  target_tags        = ["gke-node, aztec-gke-node"]
 }
diff --git a/spartan/terraform/gke-cluster/main.tf b/spartan/terraform/gke-cluster/main.tf
@@ -20,9 +20,9 @@ provider "google" {
 
 # Create the service account
 resource "google_service_account" "gke_sa" {
-  account_id   = "gke-nodes-sa"
-  display_name = "GKE Nodes Service Account"
-  description  = "Service account for GKE nodes"
+  account_id   = "aztec-gke-nodes-sa"
+  display_name = "Aztec GKE Nodes Service Account"
+  description  = "Service account for aztec GKE nodes"
 }
 
 # Add IAM roles to the service account
@@ -90,7 +90,7 @@ resource "google_container_node_pool" "primary_nodes" {
   # Enable autoscaling
   autoscaling {
     min_node_count = 1
-    max_node_count = 5
+    max_node_count = 2
   }
 
   # Node configuration
@@ -105,7 +105,7 @@ resource "google_container_node_pool" "primary_nodes" {
     labels = {
       env = "production"
     }
-    tags = ["gke-node"]
+    tags = ["aztec-gke-node"]
   }
 
   # Management configuration
@@ -129,7 +129,7 @@ resource "google_container_node_pool" "aztec_nodes" {
 
   # Node configuration
   node_config {
-    machine_type = "t2d-standard-8"
+    machine_type = "t2d-standard-4"
 
     service_account = google_service_account.gke_sa.email
     oauth_scopes = [
@@ -139,7 +139,7 @@ resource "google_container_node_pool" "aztec_nodes" {
     labels = {
       env = "production"
     }
-    tags = ["gke-node", "aztec"]
+    tags = ["aztec-gke-node", "aztec"]
   }
 
   # Management configuration
@@ -151,7 +151,7 @@ resource "google_container_node_pool" "aztec_nodes" {
 
 # Create spot instance node pool with autoscaling
 resource "google_container_node_pool" "spot_nodes" {
-  name     = "spot-node-pool"
+  name     = "aztec-spot-node-pool"
   location = var.zone
   cluster  = google_container_cluster.primary.name
 
@@ -175,7 +175,7 @@ resource "google_container_node_pool" "spot_nodes" {
       env  = "production"
       pool = "spot"
     }
-    tags = ["gke-node", "spot"]
+    tags = ["aztec-gke-node", "spot"]
 
     # Spot instance termination handler
     taint {