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/10/11 10:55:34 UTC

[incubator-dlab] branch DLAB-1158 updated: removed unimportant buckets;

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 71f9037  removed unimportant buckets;
71f9037 is described below

commit 71f90371df109c5a26b70040a3fcfc38a03beaf4
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Fri Oct 11 13:55:21 2019 +0300

    removed unimportant buckets;
---
 .../terraform/aws/ssn-k8s/main/s3.tf                       | 14 --------------
 .../terraform/gcp/ssn-gke/main/modules/gke/buckets.tf      | 11 -----------
 2 files changed, 25 deletions(-)

diff --git a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/s3.tf b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/s3.tf
index d0e95b7..622956b 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/s3.tf
+++ b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/s3.tf
@@ -21,7 +21,6 @@
 
 locals {
   ssn_s3_name = "${var.service_base_name}-ssn-bucket"
-  ssn_s3_shared_name = "${var.service_base_name}-shared-bucket"
 }
 
 resource "aws_s3_bucket" "ssn_k8s_bucket" {
@@ -37,16 +36,3 @@ resource "aws_s3_bucket" "ssn_k8s_bucket" {
   force_destroy = true
 }
 
-resource "aws_s3_bucket" "ssn_k8s_shared_bucket" {
-  bucket = local.ssn_s3_shared_name
-  acl    = "private"
-  tags   = {
-    Name                                          = local.ssn_s3_shared_name
-    "${local.additional_tag[0]}"                  = local.additional_tag[1]
-    "${var.tag_resource_id}"                      = "${var.service_base_name}:${local.ssn_s3_shared_name}"
-    "${var.service_base_name}-Tag"                = local.ssn_s3_shared_name
-    "kubernetes.io/cluster/${local.cluster_name}" = "owned"
-  }
-  force_destroy = true
-}
-
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/buckets.tf b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/buckets.tf
index 23b3477..6aca365 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/buckets.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/buckets.tf
@@ -21,7 +21,6 @@
 
 locals {
   ssn_bucket_name = "${var.service_base_name}-ssn-bucket"
-  ssn_shared_bucket_name = "${var.service_base_name}-shared-bucket"
 }
 
 resource "google_storage_bucket" "ssn_bucket" {
@@ -32,14 +31,4 @@ resource "google_storage_bucket" "ssn_bucket" {
     "${local.additional_tag[0]}"      = local.additional_tag[1]
     "${var.service_base_name}-tag"    = local.ssn_bucket_name
   }
-}
-
-resource "google_storage_bucket" "ssn_shared_bucket" {
-  name     = local.ssn_shared_bucket_name
-  force_destroy = true
-  labels = {
-    name                              = local.ssn_shared_bucket_name
-    "${local.additional_tag[0]}"      = local.additional_tag[1]
-    "${var.service_base_name}-tag"    = local.ssn_shared_bucket_name
-  }
 }
\ No newline at end of file


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org