This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1158
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1158 by this push:
new 59cb3c7 added gcp gke deploying
59cb3c7 is described below
commit 59cb3c7da1bcfb60c394e2f2a55fcede4892393b
Author: Oleh Martushevskyi <oleh_martushevs...@epam.com>
AuthorDate: Wed Dec 18 18:24:37 2019 +0200
added gcp gke deploying
---
infrastructure-provisioning/terraform/bin/dlab.py | 4 ++--
infrastructure-provisioning/terraform/gcp/endpoint/main/network.tf | 4 ++--
infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf | 2 +-
infrastructure-provisioning/terraform/gcp/ssn-gke/main/outputs.tf | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/infrastructure-provisioning/terraform/bin/dlab.py
b/infrastructure-provisioning/terraform/bin/dlab.py
index 8957490..b16c761 100644
--- a/infrastructure-provisioning/terraform/bin/dlab.py
+++ b/infrastructure-provisioning/terraform/bin/dlab.py
@@ -943,8 +943,8 @@ class AWSEndpointBuilder(AbstractDeployBuilder):
.add_str('--vpc_cidr',
'CIDR for VPC creation. Conflicts with vpc_id.',
default='172.31.0.0/16', group='endpoint')
- .add_str('--ssn_subnet',
- 'ID of AWS Subnet if you already have subnet created.',
+ .add_str('--subnet_id',
+ 'ID of Subnet if you already have subnet created.',
group='endpoint')
.add_str('--ssn_k8s_sg_id', 'ID of SSN SG.', group='endpoint')
.add_str('--subnet_cidr',
diff --git a/infrastructure-provisioning/terraform/gcp/endpoint/main/network.tf
b/infrastructure-provisioning/terraform/gcp/endpoint/main/network.tf
index 10c60d8..6a091c1 100644
--- a/infrastructure-provisioning/terraform/gcp/endpoint/main/network.tf
+++ b/infrastructure-provisioning/terraform/gcp/endpoint/main/network.tf
@@ -37,7 +37,7 @@ data "google_compute_network" "endpoint_vpc_data" {
}
resource "google_compute_subnetwork" "endpoint_subnet" {
- count = var.subnet_name == "" ? 1 : 0
+ count = var.subnet_id == "" ? 1 : 0
name = local.subnet_name
ip_cidr_range = var.subnet_cidr
region = var.region
@@ -45,7 +45,7 @@ resource "google_compute_subnetwork" "endpoint_subnet" {
}
data "google_compute_subnetwork" "endpoint_subnet_data" {
- name = var.subnet_name == "" ?
google_compute_subnetwork.endpoint_subnet.0.name : var.subnet_name
+ name = var.subnet_id == "" ?
google_compute_subnetwork.endpoint_subnet.0.name : var.subnet_id
}
resource "google_compute_firewall" "firewall-ingress" {
diff --git
a/infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf
b/infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf
index 7db5684..5d62063 100644
--- a/infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf
+++ b/infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf
@@ -55,7 +55,7 @@ variable "ami" {
default =
"/projects/ubuntu-os-cloud/global/images/ubuntu-1604-xenial-v20190628"
}
-variable "subnet_name" {
+variable "subnet_id" {
default = ""
}
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/outputs.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/outputs.tf
index e2868e0..68911de 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/outputs.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/outputs.tf
@@ -27,7 +27,7 @@ output "vpc_id" {
value = module.gke_cluster.vpc_name
}
-output "subnet_name" {
+output "subnet_id" {
value = module.gke_cluster.subnet_name
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
