Add repository for hashicorp/consul, and disable the consul-consul-cl…

…ient (#2764)
googleforgames · Oct 17, 2022 · b68324f · b68324f
1 parent ba9b8f4
commit b68324f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/build/includes/google-cloud.mk b/build/includes/google-cloud.mk
@@ -51,6 +51,7 @@ gcloud-e2e-test-cluster:
       	terraform apply -auto-approve -var project="$(GCP_PROJECT)"'
 
 # Deletes the gcloud e2e cluster and cleanup any left pvc volumes
+clean-gcloud-e2e-test-cluster: GCP_PROJECT ?= $(current_project)
 clean-gcloud-e2e-test-cluster: $(ensure-build-image)
 clean-gcloud-e2e-test-cluster:
 	$(MAKE) terraform-init DIRECTORY=e2e

diff --git a/build/terraform/e2e/module.tf b/build/terraform/e2e/module.tf
@@ -58,8 +58,9 @@ provider "helm" {
 }
 
 resource "helm_release" "consul" {
-  chart = "hashicorp/consul"
-  name  = "consul"
+  repository = "https://helm.releases.hashicorp.com"
+  chart      = "consul"
+  name       = "consul"
 
   set {
     name  = "server.replicas"
@@ -70,6 +71,11 @@ resource "helm_release" "consul" {
     name  = "ui.service.type"
     value = "ClusterIP"
   }
+
+  set {
+    name  = "client.enabled"
+    value = "false"
+  }
 }
 
 resource "google_compute_firewall" "tcp" {