From 0988aac2a508908e3cf3470e62e2a5053a30d675 Mon Sep 17 00:00:00 2001 From: Dev Date: Wed, 1 Apr 2020 09:41:12 +0100 Subject: [PATCH] Use local.network_project_id Signed-off-by: Dev --- autogen/main/firewall.tf.tmpl | 4 ++-- firewall.tf | 4 ++-- modules/beta-private-cluster-update-variant/firewall.tf | 4 ++-- modules/beta-private-cluster/firewall.tf | 4 ++-- modules/beta-public-cluster/firewall.tf | 4 ++-- modules/private-cluster-update-variant/firewall.tf | 4 ++-- modules/private-cluster/firewall.tf | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/autogen/main/firewall.tf.tmpl b/autogen/main/firewall.tf.tmpl index 9862f725d4..6673932e6d 100644 --- a/autogen/main/firewall.tf.tmpl +++ b/autogen/main/firewall.tf.tmpl @@ -28,7 +28,7 @@ resource "google_compute_firewall" "intra_egress" { count = var.firewall_enabled ? 1 : 0 name = "gke-${var.name}-allow-intra-cluster-egress" description = "Managed by terraform gke module: Allow pods to communicate with each other and the master" - project = var.network_project_id + project = local.network_project_id network = var.network priority = var.firewall_priority direction = "EGRESS" @@ -59,7 +59,7 @@ resource "google_compute_firewall" "master_ingress" { count = var.firewall_enabled ? 1 : 0 name = "gke-${var.name}-allow-master-ingress" description = "Managed by terraform gke module: Allow master to hit pods for admission controllers/webhooks" - project = var.network_project_id + project = local.network_project_id network = var.network priority = var.firewall_priority direction = "INGRESS" diff --git a/firewall.tf b/firewall.tf index 6b24e10927..943ed2911a 100644 --- a/firewall.tf +++ b/firewall.tf @@ -28,7 +28,7 @@ resource "google_compute_firewall" "intra_egress" { count = var.firewall_enabled ? 1 : 0 name = "gke-${var.name}-allow-intra-cluster-egress" description = "Managed by terraform gke module: Allow pods to communicate with each other and the master" - project = var.network_project_id + project = local.network_project_id network = var.network priority = var.firewall_priority direction = "EGRESS" @@ -59,7 +59,7 @@ resource "google_compute_firewall" "master_ingress" { count = var.firewall_enabled ? 1 : 0 name = "gke-${var.name}-allow-master-ingress" description = "Managed by terraform gke module: Allow master to hit pods for admission controllers/webhooks" - project = var.network_project_id + project = local.network_project_id network = var.network priority = var.firewall_priority direction = "INGRESS" diff --git a/modules/beta-private-cluster-update-variant/firewall.tf b/modules/beta-private-cluster-update-variant/firewall.tf index 6b24e10927..943ed2911a 100644 --- a/modules/beta-private-cluster-update-variant/firewall.tf +++ b/modules/beta-private-cluster-update-variant/firewall.tf @@ -28,7 +28,7 @@ resource "google_compute_firewall" "intra_egress" { count = var.firewall_enabled ? 1 : 0 name = "gke-${var.name}-allow-intra-cluster-egress" description = "Managed by terraform gke module: Allow pods to communicate with each other and the master" - project = var.network_project_id + project = local.network_project_id network = var.network priority = var.firewall_priority direction = "EGRESS" @@ -59,7 +59,7 @@ resource "google_compute_firewall" "master_ingress" { count = var.firewall_enabled ? 1 : 0 name = "gke-${var.name}-allow-master-ingress" description = "Managed by terraform gke module: Allow master to hit pods for admission controllers/webhooks" - project = var.network_project_id + project = local.network_project_id network = var.network priority = var.firewall_priority direction = "INGRESS" diff --git a/modules/beta-private-cluster/firewall.tf b/modules/beta-private-cluster/firewall.tf index 6b24e10927..943ed2911a 100644 --- a/modules/beta-private-cluster/firewall.tf +++ b/modules/beta-private-cluster/firewall.tf @@ -28,7 +28,7 @@ resource "google_compute_firewall" "intra_egress" { count = var.firewall_enabled ? 1 : 0 name = "gke-${var.name}-allow-intra-cluster-egress" description = "Managed by terraform gke module: Allow pods to communicate with each other and the master" - project = var.network_project_id + project = local.network_project_id network = var.network priority = var.firewall_priority direction = "EGRESS" @@ -59,7 +59,7 @@ resource "google_compute_firewall" "master_ingress" { count = var.firewall_enabled ? 1 : 0 name = "gke-${var.name}-allow-master-ingress" description = "Managed by terraform gke module: Allow master to hit pods for admission controllers/webhooks" - project = var.network_project_id + project = local.network_project_id network = var.network priority = var.firewall_priority direction = "INGRESS" diff --git a/modules/beta-public-cluster/firewall.tf b/modules/beta-public-cluster/firewall.tf index 6b24e10927..943ed2911a 100644 --- a/modules/beta-public-cluster/firewall.tf +++ b/modules/beta-public-cluster/firewall.tf @@ -28,7 +28,7 @@ resource "google_compute_firewall" "intra_egress" { count = var.firewall_enabled ? 1 : 0 name = "gke-${var.name}-allow-intra-cluster-egress" description = "Managed by terraform gke module: Allow pods to communicate with each other and the master" - project = var.network_project_id + project = local.network_project_id network = var.network priority = var.firewall_priority direction = "EGRESS" @@ -59,7 +59,7 @@ resource "google_compute_firewall" "master_ingress" { count = var.firewall_enabled ? 1 : 0 name = "gke-${var.name}-allow-master-ingress" description = "Managed by terraform gke module: Allow master to hit pods for admission controllers/webhooks" - project = var.network_project_id + project = local.network_project_id network = var.network priority = var.firewall_priority direction = "INGRESS" diff --git a/modules/private-cluster-update-variant/firewall.tf b/modules/private-cluster-update-variant/firewall.tf index 6b24e10927..943ed2911a 100644 --- a/modules/private-cluster-update-variant/firewall.tf +++ b/modules/private-cluster-update-variant/firewall.tf @@ -28,7 +28,7 @@ resource "google_compute_firewall" "intra_egress" { count = var.firewall_enabled ? 1 : 0 name = "gke-${var.name}-allow-intra-cluster-egress" description = "Managed by terraform gke module: Allow pods to communicate with each other and the master" - project = var.network_project_id + project = local.network_project_id network = var.network priority = var.firewall_priority direction = "EGRESS" @@ -59,7 +59,7 @@ resource "google_compute_firewall" "master_ingress" { count = var.firewall_enabled ? 1 : 0 name = "gke-${var.name}-allow-master-ingress" description = "Managed by terraform gke module: Allow master to hit pods for admission controllers/webhooks" - project = var.network_project_id + project = local.network_project_id network = var.network priority = var.firewall_priority direction = "INGRESS" diff --git a/modules/private-cluster/firewall.tf b/modules/private-cluster/firewall.tf index 6b24e10927..943ed2911a 100644 --- a/modules/private-cluster/firewall.tf +++ b/modules/private-cluster/firewall.tf @@ -28,7 +28,7 @@ resource "google_compute_firewall" "intra_egress" { count = var.firewall_enabled ? 1 : 0 name = "gke-${var.name}-allow-intra-cluster-egress" description = "Managed by terraform gke module: Allow pods to communicate with each other and the master" - project = var.network_project_id + project = local.network_project_id network = var.network priority = var.firewall_priority direction = "EGRESS" @@ -59,7 +59,7 @@ resource "google_compute_firewall" "master_ingress" { count = var.firewall_enabled ? 1 : 0 name = "gke-${var.name}-allow-master-ingress" description = "Managed by terraform gke module: Allow master to hit pods for admission controllers/webhooks" - project = var.network_project_id + project = local.network_project_id network = var.network priority = var.firewall_priority direction = "INGRESS"