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

chore: upgraded versions.tf to include minor bumps from tpg v5 #125

Merged
merged 2 commits into from
Oct 20, 2023
Merged

chore: upgraded versions.tf to include minor bumps from tpg v5 #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ee554f
chore: upgraded versions.tf to include minor bumps from tpg v5
g-awmalik Oct 6, 2023
dddf707
fixes router creation logic
g-awmalik Oct 19, 2023
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
11 changes: 2 additions & 9 deletions modules/vpn_ha/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,10 @@ resource "google_compute_external_vpn_gateway" "external_gateway" {
}
}

data "google_compute_router" "router" {
name = var.router_name == null ? "" : var.router_name
network = var.network
project = var.project_id
region = var.region
}

resource "google_compute_router" "router" {
provider = google-beta
count = data.google_compute_router.router.name == null ? 1 : 0
name = var.router_name != "" ? var.router_name : "vpn-${var.name}"
count = var.router_name == "" ? 1 : 0
name = "vpn-${var.name}"
project = var.project_id
region = var.region
network = var.network
Expand Down
4 changes: 2 additions & 2 deletions modules/vpn_ha/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 4.74, < 5.0"
version = ">= 4.74, < 6"
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 4.74, < 5.0"
version = ">= 4.74, < 6"
}
random = {
source = "hashicorp/random"
Expand Down
2 changes: 1 addition & 1 deletion versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 3.30.0, < 5.0"
version = ">= 3.30.0, < 6"
}
random = {
source = "hashicorp/random"
Expand Down