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/09 13:33:22 UTC
[incubator-dlab] branch DLAB-1158 updated: added needed tags
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 fc302c4 added needed tags
fc302c4 is described below
commit fc302c4ad097a0231fa2a9f8b9f877083cb63a0a
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Wed Oct 9 16:33:13 2019 +0300
added needed tags
---
.../aws/ssn-k8s/main/auto_scaling_groups.tf | 12 ++++
.../aws/ssn-k8s/main/files/masters-user-data.sh | 1 +
.../terraform/aws/ssn-k8s/main/lb.tf | 45 ++++++++------
.../terraform/aws/ssn-k8s/main/role_policy.tf | 9 +--
.../terraform/aws/ssn-k8s/main/s3.tf | 18 +++---
.../terraform/aws/ssn-k8s/main/security_groups.tf | 9 +--
.../terraform/aws/ssn-k8s/main/vpc.tf | 72 ++++++++++++----------
7 files changed, 98 insertions(+), 68 deletions(-)
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 4c428e3..6ed8599 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
@@ -25,6 +25,7 @@ locals {
ssn_k8s_launch_conf_workers_name = "${var.service_base_name}-ssn-launch-conf-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"
}
resource "random_string" "ssn_keystore_password" {
@@ -50,6 +51,7 @@ data "template_file" "ssn_k8s_masters_user_data" {
endpoint_keystore_password = random_string.endpoint_keystore_password.result
endpoint_elastic_ip = aws_eip.k8s-endpoint-eip.public_ip
kubernetes_version = var.kubernetes_version
+ cluster_name = local.cluster_name
}
}
@@ -134,6 +136,11 @@ resource "aws_autoscaling_group" "ssn_k8s_autoscaling_group_masters" {
key = "${var.service_base_name}-Tag"
value = local.ssn_k8s_ag_masters_name
propagate_at_launch = true
+ },
+ {
+ key = "kubernetes.io/cluster/${local.cluster_name}"
+ value = "owned"
+ propagate_at_launch = true
}
]
}
@@ -169,6 +176,11 @@ resource "aws_autoscaling_group" "ssn_k8s_autoscaling_group_workers" {
key = "${var.service_base_name}-Tag"
value = local.ssn_k8s_ag_workers_name
propagate_at_launch = true
+ },
+ {
+ key = "kubernetes.io/cluster/${local.cluster_name}"
+ value = "owned"
+ propagate_at_launch = true
}
]
}
diff --git a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/masters-user-data.sh b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/masters-user-data.sh
index e6647a8..2014e40 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/masters-user-data.sh
+++ b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/masters-user-data.sh
@@ -85,6 +85,7 @@ controllerManager:
cloud-provider: aws
configure-cloud-routes: "false"
controlPlaneEndpoint: "${k8s-nlb-dns-name}:6443"
+clusterName: "${cluster_name}"
---
apiVersion: kubeadm.k8s.io/v1beta2
kind: InitConfiguration
diff --git a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/lb.tf b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/lb.tf
index 266340c..31346fd 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/lb.tf
+++ b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/lb.tf
@@ -33,10 +33,11 @@ resource "aws_lb" "ssn_k8s_nlb" {
subnets = compact([data.aws_subnet.k8s-subnet-a-data.id, data.aws_subnet.k8s-subnet-b-data.id,
local.subnet_c_id])
tags = {
- Name = local.ssn_nlb_name
- "${local.additional_tag[0]}" = local.additional_tag[1]
- "${var.tag_resource_id}" = "${var.service_base_name}:${local.ssn_nlb_name}"
- "${var.service_base_name}-Tag" = local.ssn_nlb_name
+ Name = local.ssn_nlb_name
+ "${local.additional_tag[0]}" = local.additional_tag[1]
+ "${var.tag_resource_id}" = "${var.service_base_name}:${local.ssn_nlb_name}"
+ "${var.service_base_name}-Tag" = local.ssn_nlb_name
+ "kubernetes.io/cluster/${local.cluster_name}" = "owned"
}
}
@@ -49,10 +50,11 @@ resource "aws_lb" "ssn_k8s_alb" {
local.subnet_c_id])
tags = {
- Name = local.ssn_alb_name
- "${local.additional_tag[0]}" = local.additional_tag[1]
- "${var.tag_resource_id}" = "${var.service_base_name}:${local.ssn_alb_name}"
- "${var.service_base_name}-Tag" = local.ssn_alb_name
+ Name = local.ssn_alb_name
+ "${local.additional_tag[0]}" = local.additional_tag[1]
+ "${var.tag_resource_id}" = "${var.service_base_name}:${local.ssn_alb_name}"
+ "${var.service_base_name}-Tag" = local.ssn_alb_name
+ "kubernetes.io/cluster/${local.cluster_name}" = "owned"
}
}
@@ -62,10 +64,11 @@ resource "aws_lb_target_group" "ssn_k8s_nlb_api_target_group" {
protocol = "TCP"
vpc_id = data.aws_vpc.ssn_k8s_vpc_data.id
tags = {
- Name = local.ssn_k8s_nlb_api_tg_name
- "${local.additional_tag[0]}" = local.additional_tag[1]
- "${var.tag_resource_id}" = "${var.service_base_name}:${local.ssn_k8s_nlb_api_tg_name}"
- "${var.service_base_name}-Tag" = local.ssn_k8s_nlb_api_tg_name
+ Name = local.ssn_k8s_nlb_api_tg_name
+ "${local.additional_tag[0]}" = local.additional_tag[1]
+ "${var.tag_resource_id}" = "${var.service_base_name}:${local.ssn_k8s_nlb_api_tg_name}"
+ "${var.service_base_name}-Tag" = local.ssn_k8s_nlb_api_tg_name
+ "kubernetes.io/cluster/${local.cluster_name}" = "owned"
}
}
@@ -75,10 +78,11 @@ resource "aws_lb_target_group" "ssn_k8s_nlb_ss_target_group" {
protocol = "TCP"
vpc_id = data.aws_vpc.ssn_k8s_vpc_data.id
tags = {
- Name = local.ssn_k8s_nlb_ss_tg_name
- "${local.additional_tag[0]}" = local.additional_tag[1]
- "${var.tag_resource_id}" = "${var.service_base_name}:${local.ssn_k8s_nlb_ss_tg_name}"
- "${var.service_base_name}-Tag" = local.ssn_k8s_nlb_ss_tg_name
+ Name = local.ssn_k8s_nlb_ss_tg_name
+ "${local.additional_tag[0]}" = local.additional_tag[1]
+ "${var.tag_resource_id}" = "${var.service_base_name}:${local.ssn_k8s_nlb_ss_tg_name}"
+ "${var.service_base_name}-Tag" = local.ssn_k8s_nlb_ss_tg_name
+ "kubernetes.io/cluster/${local.cluster_name}" = "owned"
}
}
@@ -88,10 +92,11 @@ resource "aws_lb_target_group" "ssn_k8s_alb_target_group" {
protocol = "HTTP"
vpc_id = data.aws_vpc.ssn_k8s_vpc_data.id
tags = {
- Name = local.ssn_k8s_alb_tg_name
- "${local.additional_tag[0]}" = local.additional_tag[1]
- "${var.tag_resource_id}" = "${var.service_base_name}:${local.ssn_k8s_alb_tg_name}"
- "${var.service_base_name}-Tag" = local.ssn_k8s_alb_tg_name
+ Name = local.ssn_k8s_alb_tg_name
+ "${local.additional_tag[0]}" = local.additional_tag[1]
+ "${var.tag_resource_id}" = "${var.service_base_name}:${local.ssn_k8s_alb_tg_name}"
+ "${var.service_base_name}-Tag" = local.ssn_k8s_alb_tg_name
+ "kubernetes.io/cluster/${local.cluster_name}" = "owned"
}
}
diff --git a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/role_policy.tf b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/role_policy.tf
index ed85b5d..79c5969 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/role_policy.tf
+++ b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/role_policy.tf
@@ -38,10 +38,11 @@ resource "aws_iam_role" "ssn_k8s_role" {
name = local.ssn_role_name
assume_role_policy = file("./files/assume-policy.json")
tags = {
- Name = local.ssn_role_name
- "${local.additional_tag[0]}" = local.additional_tag[1]
- "${var.tag_resource_id}" = "${var.service_base_name}:${local.ssn_role_name}"
- "${var.service_base_name}-Tag" = local.ssn_role_name
+ Name = local.ssn_role_name
+ "${local.additional_tag[0]}" = local.additional_tag[1]
+ "${var.tag_resource_id}" = "${var.service_base_name}:${local.ssn_role_name}"
+ "${var.service_base_name}-Tag" = local.ssn_role_name
+ "kubernetes.io/cluster/${local.cluster_name}" = "owned"
}
}
diff --git a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/s3.tf b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/s3.tf
index 3026189..d0e95b7 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/s3.tf
+++ b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/s3.tf
@@ -28,10 +28,11 @@ resource "aws_s3_bucket" "ssn_k8s_bucket" {
bucket = local.ssn_s3_name
acl = "private"
tags = {
- Name = local.ssn_s3_name
- "${local.additional_tag[0]}" = local.additional_tag[1]
- "${var.tag_resource_id}" = "${var.service_base_name}:${local.ssn_s3_name}"
- "${var.service_base_name}-Tag" = local.ssn_s3_name
+ Name = local.ssn_s3_name
+ "${local.additional_tag[0]}" = local.additional_tag[1]
+ "${var.tag_resource_id}" = "${var.service_base_name}:${local.ssn_s3_name}"
+ "${var.service_base_name}-Tag" = local.ssn_s3_name
+ "kubernetes.io/cluster/${local.cluster_name}" = "owned"
}
force_destroy = true
}
@@ -40,10 +41,11 @@ 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
+ 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/aws/ssn-k8s/main/security_groups.tf b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/security_groups.tf
index 3f363a7..92b2a06 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/security_groups.tf
+++ b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/security_groups.tf
@@ -77,9 +77,10 @@ resource "aws_security_group" "ssn_k8s_sg" {
}
tags = {
- Name = local.ssn_sg_name
- "${local.additional_tag[0]}" = local.additional_tag[1]
- "${var.tag_resource_id}" = "${var.service_base_name}:${local.ssn_sg_name}"
- "${var.service_base_name}-Tag" = local.ssn_sg_name
+ Name = local.ssn_sg_name
+ "${local.additional_tag[0]}" = local.additional_tag[1]
+ "${var.tag_resource_id}" = "${var.service_base_name}:${local.ssn_sg_name}"
+ "${var.service_base_name}-Tag" = local.ssn_sg_name
+ "kubernetes.io/cluster/${local.cluster_name}" = "owned"
}
}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/vpc.tf b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/vpc.tf
index e768823..6d597b3 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/vpc.tf
+++ b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/vpc.tf
@@ -39,10 +39,11 @@ resource "aws_vpc" "ssn_k8s_vpc" {
enable_dns_support = true
tags = {
- Name = local.ssn_vpc_name
- "${local.additional_tag[0]}" = local.additional_tag[1]
- "${var.tag_resource_id}" = "${var.service_base_name}:${local.ssn_vpc_name}"
- "${var.service_base_name}-Tag" = local.ssn_vpc_name
+ Name = local.ssn_vpc_name
+ "${local.additional_tag[0]}" = local.additional_tag[1]
+ "${var.tag_resource_id}" = "${var.service_base_name}:${local.ssn_vpc_name}"
+ "${var.service_base_name}-Tag" = local.ssn_vpc_name
+ "kubernetes.io/cluster/${local.cluster_name}" = "owned"
}
}
@@ -51,10 +52,11 @@ resource "aws_internet_gateway" "ssn_k8s_igw" {
vpc_id = aws_vpc.ssn_k8s_vpc.0.id
tags = {
- Name = local.ssn_igw_name
- "${local.additional_tag[0]}" = local.additional_tag[1]
- "${var.tag_resource_id}" = "${var.service_base_name}:${local.ssn_igw_name}"
- "${var.service_base_name}-Tag" = local.ssn_igw_name
+ Name = local.ssn_igw_name
+ "${local.additional_tag[0]}" = local.additional_tag[1]
+ "${var.tag_resource_id}" = "${var.service_base_name}:${local.ssn_igw_name}"
+ "${var.service_base_name}-Tag" = local.ssn_igw_name
+ "kubernetes.io/cluster/${local.cluster_name}" = "owned"
}
}
@@ -77,10 +79,11 @@ resource "aws_subnet" "ssn_k8s_subnet_a" {
map_public_ip_on_launch = true
tags = {
- Name = local.ssn_subnet_a_name
- "${local.additional_tag[0]}" = local.additional_tag[1]
- "${var.tag_resource_id}" = "${var.service_base_name}:${local.ssn_subnet_a_name}"
- "${var.service_base_name}-Tag" = local.ssn_subnet_a_name
+ Name = local.ssn_subnet_a_name
+ "${local.additional_tag[0]}" = local.additional_tag[1]
+ "${var.tag_resource_id}" = "${var.service_base_name}:${local.ssn_subnet_a_name}"
+ "${var.service_base_name}-Tag" = local.ssn_subnet_a_name
+ "kubernetes.io/cluster/${local.cluster_name}" = "owned"
}
}
@@ -92,10 +95,11 @@ resource "aws_subnet" "ssn_k8s_subnet_b" {
map_public_ip_on_launch = true
tags = {
- Name = local.ssn_subnet_b_name
- "${local.additional_tag[0]}" = local.additional_tag[1]
- "${var.tag_resource_id}" = "${var.service_base_name}:${local.ssn_subnet_b_name}"
- "${var.service_base_name}-Tag" = local.ssn_subnet_b_name
+ Name = local.ssn_subnet_b_name
+ "${local.additional_tag[0]}" = local.additional_tag[1]
+ "${var.tag_resource_id}" = "${var.service_base_name}:${local.ssn_subnet_b_name}"
+ "${var.service_base_name}-Tag" = local.ssn_subnet_b_name
+ "kubernetes.io/cluster/${local.cluster_name}" = "owned"
}
}
@@ -107,10 +111,11 @@ resource "aws_subnet" "ssn_k8s_subnet_c" {
map_public_ip_on_launch = true
tags = {
- Name = local.ssn_subnet_c_name
- "${local.additional_tag[0]}" = local.additional_tag[1]
- "${var.tag_resource_id}" = "${var.service_base_name}:${local.ssn_subnet_c_name}"
- "${var.service_base_name}-Tag" = local.ssn_subnet_c_name
+ Name = local.ssn_subnet_c_name
+ "${local.additional_tag[0]}" = local.additional_tag[1]
+ "${var.tag_resource_id}" = "${var.service_base_name}:${local.ssn_subnet_c_name}"
+ "${var.service_base_name}-Tag" = local.ssn_subnet_c_name
+ "kubernetes.io/cluster/${local.cluster_name}" = "owned"
}
}
@@ -130,20 +135,22 @@ data "aws_subnet" "k8s-subnet-c-data" {
resource "aws_eip" "k8s-endpoint-eip" {
vpc = true
tags = {
- Name = local.endpoint_ip_name
- "${local.additional_tag[0]}" = local.additional_tag[1]
- "${var.tag_resource_id}" = "${var.service_base_name}:${local.endpoint_ip_name}"
- "${var.service_base_name}-Tag" = local.endpoint_ip_name
+ Name = local.endpoint_ip_name
+ "${local.additional_tag[0]}" = local.additional_tag[1]
+ "${var.tag_resource_id}" = "${var.service_base_name}:${local.endpoint_ip_name}"
+ "${var.service_base_name}-Tag" = local.endpoint_ip_name
+ "kubernetes.io/cluster/${local.cluster_name}" = "owned"
}
}
resource "aws_route_table" "ssn-k8s-users-route-table" {
vpc_id = data.aws_vpc.ssn_k8s_vpc_data.id
tags = {
- Name = local.endpoint_rt_name
- "${var.service_base_name}-Tag" = var.service_base_name
- "${local.additional_tag[0]}" = local.additional_tag[1]
- "${var.tag_resource_id}" = "${var.service_base_name}:${local.endpoint_rt_name}"
+ Name = local.endpoint_rt_name
+ "${var.service_base_name}-Tag" = var.service_base_name
+ "${local.additional_tag[0]}" = local.additional_tag[1]
+ "${var.tag_resource_id}" = "${var.service_base_name}:${local.endpoint_rt_name}"
+ "kubernetes.io/cluster/${local.cluster_name}" = "owned"
}
}
@@ -151,10 +158,11 @@ resource "aws_vpc_endpoint" "ssn-k8s-users-s3-endpoint" {
vpc_id = data.aws_vpc.ssn_k8s_vpc_data.id
service_name = "com.amazonaws.${var.region}.s3"
tags = {
- Name = local.endpoint_s3_name
- "${local.additional_tag[0]}" = local.additional_tag[1]
- "${var.tag_resource_id}" = "${var.service_base_name}:${local.endpoint_s3_name}"
- "${var.service_base_name}-Tag" = local.endpoint_s3_name
+ Name = local.endpoint_s3_name
+ "${local.additional_tag[0]}" = local.additional_tag[1]
+ "${var.tag_resource_id}" = "${var.service_base_name}:${local.endpoint_s3_name}"
+ "${var.service_base_name}-Tag" = local.endpoint_s3_name
+ "kubernetes.io/cluster/${local.cluster_name}" = "owned"
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org