Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add repository for hashicorp/consul, and disable the consul-consul-client #2764

Merged
merged 1 commit into from
Oct 17, 2022
Merged

Add repository for hashicorp/consul, and disable the consul-consul-client #2764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build/includes/google-cloud.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 8 additions & 2 deletions build/terraform/e2e/module.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@ provider "helm" {
}

resource "helm_release" "consul" {
chart = "hashicorp/consul"
name = "consul"
repository = "https://helm.releases.hashicorp.com"
chart = "consul"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am actually very confused as to why it's not "hashicorp/consul" (since that's what the docs say), but as long as it works, I don't mind! 😄

name = "consul"

set {
name = "server.replicas"
Expand All @@ -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" {
Expand Down