From b8bfc1fd6de8a744d7f774dc6f89bb86c84b04a5 Mon Sep 17 00:00:00 2001
From: Mitch <mitchell@aztecprotocol.com>
Date: Tue, 26 Nov 2024 14:24:21 -0500
Subject: [PATCH] fix #10158

---
 spartan/terraform/deploy-release/deploy.sh      | 11 +++++++++--
 spartan/terraform/deploy-release/main.tf        | 12 ++++++------
 spartan/terraform/deploy-release/release.tfvars |  5 +----
 spartan/terraform/deploy-release/variables.tf   |  8 ++++----
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/spartan/terraform/deploy-release/deploy.sh b/spartan/terraform/deploy-release/deploy.sh
index e9574554524a..ac13466745f8 100755
--- a/spartan/terraform/deploy-release/deploy.sh
+++ b/spartan/terraform/deploy-release/deploy.sh
@@ -1,5 +1,12 @@
 #!/bin/bash
 
-RELEASE_NAME="rough-rhino"
+# Usage: ./deploy.sh <release_name> <aztec_docker_image>
+# Example: ./deploy.sh rough-rhino aztecprotocol/aztec:698cd3d62680629a3f1bfc0f82604534cedbccf3-x86_64
+
+set -eu
+
+RELEASE_NAME=$1
+AZTEC_DOCKER_IMAGE=$2
+
 terraform init -backend-config="key=deploy-network/${RELEASE_NAME}/terraform.tfstate"
-terraform apply -var-file="release.tfvars"
+terraform apply -var-file="release.tfvars" -var="RELEASE_NAME=${RELEASE_NAME}" -var="AZTEC_DOCKER_IMAGE=${AZTEC_DOCKER_IMAGE}"
diff --git a/spartan/terraform/deploy-release/main.tf b/spartan/terraform/deploy-release/main.tf
index 3b26f2473252..a55600ef041a 100644
--- a/spartan/terraform/deploy-release/main.tf
+++ b/spartan/terraform/deploy-release/main.tf
@@ -18,32 +18,32 @@ terraform {
 provider "kubernetes" {
   alias          = "gke-cluster"
   config_path    = "~/.kube/config"
-  config_context = var.gke_cluster_context
+  config_context = var.GKE_CLUSTER_CONTEXT
 }
 
 provider "helm" {
   alias = "gke-cluster"
   kubernetes {
     config_path    = "~/.kube/config"
-    config_context = var.gke_cluster_context
+    config_context = var.GKE_CLUSTER_CONTEXT
   }
 }
 
 # Aztec Helm release for gke-cluster
 resource "helm_release" "aztec-gke-cluster" {
   provider         = helm.gke-cluster
-  name             = var.release_name
+  name             = var.RELEASE_NAME
   repository       = "../../"
   chart            = "aztec-network"
-  namespace        = var.release_name
+  namespace        = var.RELEASE_NAME
   create_namespace = true
 
   # base values file
-  values = [file("../../aztec-network/values/${var.values_file}")]
+  values = [file("../../aztec-network/values/${var.VALUES_FILE}")]
 
   set {
     name  = "images.aztec.image"
-    value = var.aztec_docker_image
+    value = var.AZTEC_DOCKER_IMAGE
   }
 
   # Setting timeout and wait conditions
diff --git a/spartan/terraform/deploy-release/release.tfvars b/spartan/terraform/deploy-release/release.tfvars
index f3236423d9f1..916a85db918c 100644
--- a/spartan/terraform/deploy-release/release.tfvars
+++ b/spartan/terraform/deploy-release/release.tfvars
@@ -1,4 +1 @@
-release_name       = "rough-rhino"
-values_file        = "release.yaml"
-aztec_docker_image = "aztecprotocol/aztec:698cd3d62680629a3f1bfc0f82604534cedbccf3-x86_64"
-
+VALUES_FILE = "release.yaml"
diff --git a/spartan/terraform/deploy-release/variables.tf b/spartan/terraform/deploy-release/variables.tf
index ebccc9d3f67f..03930fa3d65b 100644
--- a/spartan/terraform/deploy-release/variables.tf
+++ b/spartan/terraform/deploy-release/variables.tf
@@ -1,20 +1,20 @@
-variable "gke_cluster_context" {
+variable "GKE_CLUSTER_CONTEXT" {
   description = "GKE cluster context"
   type        = string
   default     = "gke_testnet-440309_us-east4-a_spartan-gke"
 }
 
-variable "release_name" {
+variable "RELEASE_NAME" {
   description = "Name of helm deployment and k8s namespace"
   type        = string
 }
 
-variable "values_file" {
+variable "VALUES_FILE" {
   description = "Name of the values file to use for deployment"
   type        = string
 }
 
-variable "aztec_docker_image" {
+variable "AZTEC_DOCKER_IMAGE" {
   description = "Docker image to use for the aztec network"
   type        = string
 }