Homec4science
Diffusion Terracluster (master) Browse

R10965/patches/0003-Network-bug-fix.patch
0ec66f863bd0master

Last Change
Raw File

0003-Network-bug-fix.patch
View Options

From 40faa56bffeb5a5e51e85c41b11d2458a856bd12 Mon Sep 17 00:00:00 2001
From: "Antonio J. Russo" <antonio.russo@epfl.ch>
Date: Wed, 18 Nov 2020 05:59:00 +0100
Subject: [PATCH 3/3] Network bug fix
---
tf/modules/network/main.tf | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/tf/modules/network/main.tf b/tf/modules/network/main.tf
index 4f1e4c3..56f313f 100644
--- a/tf/modules/network/main.tf
+++ b/tf/modules/network/main.tf
@@ -60,7 +60,7 @@ resource "google_compute_subnetwork" "cluster_subnet" {
resource "google_compute_firewall" "cluster_ssh_firewall" {
count = ((var.shared_vpc_host_project == null &&
- length(google_compute_network.cluster_network) > 0 &&
+ var.network_name == null &&
(var.disable_login_public_ips == false ||
var.disable_controller_public_ips == false ||
var.disable_compute_public_ips == false))
@@ -79,7 +79,7 @@ resource "google_compute_firewall" "cluster_ssh_firewall" {
resource "google_compute_firewall" "cluster_iap_ssh_firewall" {
count = ((var.shared_vpc_host_project == null &&
- length(google_compute_network.cluster_network) > 0 &&
+ var.network_name == null &&
var.disable_login_public_ips &&
var.disable_controller_public_ips &&
var.disable_compute_public_ips)
@@ -97,7 +97,9 @@ resource "google_compute_firewall" "cluster_iap_ssh_firewall" {
}
resource "google_compute_firewall" "cluster_internal_firewall" {
- count = length(google_compute_network.cluster_network)
+ count = ((var.network_name == null)
+ ? 1
+ : 0)
name = "${var.cluster_name}-allow-internal"
--
2.25.1
c4science · Help