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 4cd01ad added step-ca
4cd01ad is described below
commit 4cd01ad009b96afabd79ec6ec92c1d8e31fa15ca
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Fri Dec 6 11:58:26 2019 +0200
added step-ca
---
.../terraform/gcp/endpoint/main/iam.tf | 2 +-
.../terraform/gcp/endpoint/main/instance.tf | 12 ++++++------
.../terraform/gcp/endpoint/main/network.tf | 4 ++--
.../terraform/gcp/ssn-gke/main/variables.tf | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/infrastructure-provisioning/terraform/gcp/endpoint/main/iam.tf
b/infrastructure-provisioning/terraform/gcp/endpoint/main/iam.tf
index 012e217..b941bb1 100644
--- a/infrastructure-provisioning/terraform/gcp/endpoint/main/iam.tf
+++ b/infrastructure-provisioning/terraform/gcp/endpoint/main/iam.tf
@@ -32,7 +32,7 @@ resource "google_service_account" "endpoint_sa" {
resource "google_project_iam_custom_role" "endpoint_role" {
permissions = var.endpoint_policies
- role_id = "${replace("${local.endpoint_role_name}", "-", "_")}"
+ role_id = replace(local.endpoint_role_name, "-", "_")
title = local.endpoint_role_name
}
diff --git
a/infrastructure-provisioning/terraform/gcp/endpoint/main/instance.tf
b/infrastructure-provisioning/terraform/gcp/endpoint/main/instance.tf
index 637f115..96fa251 100644
--- a/infrastructure-provisioning/terraform/gcp/endpoint/main/instance.tf
+++ b/infrastructure-provisioning/terraform/gcp/endpoint/main/instance.tf
@@ -27,14 +27,14 @@ locals {
resource "google_compute_instance" "endpoint" {
name = local.endpoint_instance_name
machine_type = var.endpoint_shape
- tags = ["${replace("${local.endpoint_instance_name}", "_", "-")}"]
+ zone = var.zone
+ tags = [replace(local.endpoint_instance_name, "_", "-")]
labels = {
- name = "${local.endpoint_instance_name}"
- sbn = "${var.service_base_name}"
- product = "${var.product}"
- endpoint_id = "${var.endpoint_id}"
+ name = local.endpoint_instance_name
+ sbn = var.service_base_name
+ product = var.product
+ endpoint_id = var.endpoint_id
}
- zone = "${var.region}-${var.zone}"
boot_disk {
initialize_params {
diff --git a/infrastructure-provisioning/terraform/gcp/endpoint/main/network.tf
b/infrastructure-provisioning/terraform/gcp/endpoint/main/network.tf
index c4f5d89..c96aef4 100644
--- a/infrastructure-provisioning/terraform/gcp/endpoint/main/network.tf
+++ b/infrastructure-provisioning/terraform/gcp/endpoint/main/network.tf
@@ -56,7 +56,7 @@ resource "google_compute_firewall" "firewall-ingress" {
ports = ["22", "8084", "8085", "4822"]
}
target_tags = ["${var.service_base_name}-${var.endpoint_id}-endpoint"]
- source_ranges = ["${var.firewall_ing_cidr_range}"]
+ source_ranges = [var.firewall_ing_cidr_range]
}
@@ -68,5 +68,5 @@ resource "google_compute_firewall" "firewall-egress" {
protocol = "all"
}
target_tags = ["${var.service_base_name}-${var.endpoint_id}-endpoint"]
- destination_ranges = ["${var.firewall_eg_cidr_range}"]
+ destination_ranges = [var.firewall_eg_cidr_range]
}
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/variables.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/variables.tf
index 9aaa84c..ad20f43 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/variables.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/variables.tf
@@ -36,7 +36,7 @@ variable "region" {
}
variable "zone" {
- default = "a"
+ default = "us-west1-a"
}
variable "vpc_name" {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
