This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1546
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1546 by this push:
new a319ef9 [DLAB-1546]: added name convention changes
a319ef9 is described below
commit a319ef9c993389ca5f163ce106a951e2289fa84d
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Tue Feb 25 14:49:37 2020 +0200
[DLAB-1546]: added name convention changes
---
infrastructure-provisioning/terraform/aws/endpoint/main/network.tf | 2 +-
.../terraform/aws/ssn-k8s/main/auto_scaling_groups.tf | 4 ++--
infrastructure-provisioning/terraform/aws/ssn-k8s/main/vpc.tf | 4 ++--
infrastructure-provisioning/terraform/azure/endpoint/main/instance.tf | 2 +-
infrastructure-provisioning/terraform/azure/endpoint/main/network.tf | 2 +-
infrastructure-provisioning/terraform/gcp/endpoint/main/network.tf | 4 ++--
.../terraform/gcp/ssn-gke/main/modules/gke/gke.tf | 2 +-
.../terraform/gcp/ssn-gke/main/modules/gke/vpc.tf | 4 ++--
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/infrastructure-provisioning/terraform/aws/endpoint/main/network.tf
b/infrastructure-provisioning/terraform/aws/endpoint/main/network.tf
index 4e0fc05..0abfe50 100644
--- a/infrastructure-provisioning/terraform/aws/endpoint/main/network.tf
+++ b/infrastructure-provisioning/terraform/aws/endpoint/main/network.tf
@@ -25,7 +25,7 @@ locals {
endpoint_vpc_name = "${var.service_base_name}-endpoint-vpc"
additional_tag = split(":", var.additional_tag)
endpoint_igw_name =
"${var.service_base_name}-${var.endpoint_id}-igw"
- endpoint_ip_name =
"${var.service_base_name}-${var.endpoint_id}-eip"
+ endpoint_ip_name =
"${var.service_base_name}-${var.endpoint_id}-static-ip"
projects_rt =
"${var.service_base_name}-${var.endpoint_id}-project-rt"
}
diff --git
a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/auto_scaling_groups.tf
b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/auto_scaling_groups.tf
index 792c950..69cfbcd 100644
---
a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/auto_scaling_groups.tf
+++
b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/auto_scaling_groups.tf
@@ -21,8 +21,8 @@
locals {
subnet_c_id = data.aws_subnet.k8s-subnet-c-data == [] ?
"" : data.aws_subnet.k8s-subnet-c-data.0.id
- ssn_k8s_launch_conf_masters_name =
"${var.service_base_name}-ssn-launch-conf-masters"
- ssn_k8s_launch_conf_workers_name =
"${var.service_base_name}-ssn-launch-conf-workers"
+ ssn_k8s_launch_conf_masters_name = "${var.service_base_name}-ssn-lc-masters"
+ ssn_k8s_launch_conf_workers_name = "${var.service_base_name}-ssn-lc-workers"
ssn_k8s_ag_masters_name = "${var.service_base_name}-ssn-masters"
ssn_k8s_ag_workers_name = "${var.service_base_name}-ssn-workers"
cluster_name = "${var.service_base_name}-k8s-cluster"
diff --git a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/vpc.tf
b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/vpc.tf
index 2ce9d08..a21ee81 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/vpc.tf
+++ b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/vpc.tf
@@ -21,8 +21,8 @@
locals {
additional_tag = split(":", var.additional_tag)
- ssn_vpc_name = "${var.service_base_name}-ssn-vpc"
- ssn_igw_name = "${var.service_base_name}-ssn-igw"
+ ssn_vpc_name = "${var.service_base_name}-vpc"
+ ssn_igw_name = "${var.service_base_name}-igw"
ssn_subnet_a_name = "${var.service_base_name}-ssn-subnet-az-a"
ssn_subnet_b_name = "${var.service_base_name}-ssn-subnet-az-b"
ssn_subnet_c_name = "${var.service_base_name}-ssn-subnet-az-c"
diff --git
a/infrastructure-provisioning/terraform/azure/endpoint/main/instance.tf
b/infrastructure-provisioning/terraform/azure/endpoint/main/instance.tf
index 989c32c..7729479 100644
--- a/infrastructure-provisioning/terraform/azure/endpoint/main/instance.tf
+++ b/infrastructure-provisioning/terraform/azure/endpoint/main/instance.tf
@@ -21,7 +21,7 @@
locals {
endpoint_instance_name =
"${var.service_base_name}-${var.endpoint_id}-endpoint"
- endpoint_instance_disk_name =
"${var.service_base_name}-${var.endpoint_id}-endpoint-disk"
+ endpoint_instance_disk_name =
"${var.service_base_name}-${var.endpoint_id}-endpoint-volume"
}
data "tls_public_key" "enpoint_key" {
diff --git
a/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf
b/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf
index ac782f9..880d150 100644
--- a/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf
+++ b/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf
@@ -23,7 +23,7 @@ locals {
endpoint_subnet_name =
"${var.service_base_name}-${var.endpoint_id}-subnet"
endpoint_vpc_name = "${var.service_base_name}-endpoint-vpc"
additional_tag = split(":", var.additional_tag)
- endpoint_ip_name =
"${var.service_base_name}-${var.endpoint_id}-eip"
+ endpoint_ip_name =
"${var.service_base_name}-${var.endpoint_id}-static-ip"
endpoint_nif_name =
"${var.service_base_name}-${var.endpoint_id}-nif"
}
diff --git a/infrastructure-provisioning/terraform/gcp/endpoint/main/network.tf
b/infrastructure-provisioning/terraform/gcp/endpoint/main/network.tf
index c84621f..cd965ef 100644
--- a/infrastructure-provisioning/terraform/gcp/endpoint/main/network.tf
+++ b/infrastructure-provisioning/terraform/gcp/endpoint/main/network.tf
@@ -22,8 +22,8 @@
locals {
vpc_id = "${var.service_base_name}-${var.endpoint_id}-vpc"
subnet_name = "${var.service_base_name}-${var.endpoint_id}-subnet"
- firewall_ingress_name =
"${var.service_base_name}-${var.endpoint_id}-ing-rule"
- firewall_egress_name = "${var.service_base_name}-${var.endpoint_id}-eg-rule"
+ firewall_ingress_name =
"${var.service_base_name}-${var.endpoint_id}-ingress-sg"
+ firewall_egress_name =
"${var.service_base_name}-${var.endpoint_id}-egress-sg"
}
resource "google_compute_network" "endpoint_vpc" {
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/gke.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/gke.tf
index b1d1e7d..21bdf0a 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/gke.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/gke.tf
@@ -21,7 +21,7 @@
locals {
additional_tag = split(":", var.additional_tag)
- gke_name = "${var.service_base_name}-cluster"
+ gke_name = "${var.service_base_name}-k8s-cluster"
gke_node_pool_name = "${var.service_base_name}-node-pool"
}
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/vpc.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/vpc.tf
index 04f7ec7..c3bbdcb 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/vpc.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/vpc.tf
@@ -20,8 +20,8 @@
#
******************************************************************************
locals {
- ssn_vpc_name = "${var.service_base_name}-ssn-vpc"
- ssn_subnet_name = "${var.service_base_name}-ssn-subnet"
+ ssn_vpc_name = "${var.service_base_name}-vpc"
+ ssn_subnet_name = "${var.service_base_name}-subnet"
}
resource "google_compute_network" "ssn_gke_vpc" {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]