You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2019/09/09 10:31:25 UTC
[incubator-dlab] branch DLAB-terraform updated: fixe issue with tag
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-terraform
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-terraform by this push:
new 5a9b6e1 fixe issue with tag
5a9b6e1 is described below
commit 5a9b6e1e8cbd24d63f03d02f9cec00e166eca289
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Mon Sep 9 13:31:17 2019 +0300
fixe issue with tag
---
infrastructure-provisioning/terraform/gcp/ssn-gke/main/gke.tf | 2 +-
.../terraform/gcp/ssn-gke/main/variables.tf | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/gke.tf b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/gke.tf
index 507f710..44a90ef 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/gke.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/gke.tf
@@ -36,7 +36,7 @@ resource "google_container_cluster" "ssn_k8s_gke_cluster" {
resource_labels = {
Name = local.gke_name
"${local.additional_tag[0]}" = local.additional_tag[1]
- "${var.tag_resource_id}" = "${var.service_base_name}:${local.gke_name}"
+ # "${var.tag_resource_id}" = "${var.service_base_name}:${local.gke_name}"
"${var.service_base_name}-Tag" = local.gke_name
}
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/variables.tf b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/variables.tf
index 725d823..7898592 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/variables.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/variables.tf
@@ -63,9 +63,10 @@ variable "gke_cluster_version" {
default = "1.12.8-gke.10"
}
-variable "tag_resource_id" {
- default = "user:tag"
-}
+// Couldn't assign in GCP
+//variable "tag_resource_id" {
+// default = "user:tag"
+//}
variable "ssn_k8s_workers_shape" {
default = "n1-standard-1"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org