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/07/02 10:54:49 UTC
[incubator-dlab] 01/01: formatted code
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-terraform-k8s
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit cce204cb7d9e84713c21fe04f69edf3ee048dec8
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Tue Jul 2 13:54:39 2019 +0300
formatted code
---
.../terraform/aws/main/main.tf | 4 +-
.../terraform/aws/main/variables.tf | 4 +-
.../aws/modules/ssn-k8s/auto_scaling_groups.tf | 44 +++++++++++-----------
.../terraform/aws/modules/ssn-k8s/lb.tf | 20 +++++-----
.../terraform/aws/modules/ssn-k8s/role_policy.tf | 26 ++++++-------
.../terraform/aws/modules/ssn-k8s/s3.tf | 3 +-
.../aws/modules/ssn-k8s/security_groups.tf | 18 ++++-----
.../terraform/aws/modules/ssn-k8s/vpc.tf | 30 +++++++--------
8 files changed, 75 insertions(+), 74 deletions(-)
diff --git a/infrastructure-provisioning/terraform/aws/main/main.tf b/infrastructure-provisioning/terraform/aws/main/main.tf
index 3d77b3c..b6000b0 100644
--- a/infrastructure-provisioning/terraform/aws/main/main.tf
+++ b/infrastructure-provisioning/terraform/aws/main/main.tf
@@ -1,7 +1,7 @@
provider "aws" {
region = var.region
- access_key = var.access_key_var
- secret_key = var.secret_key_var
+ access_key = var.access_key_id
+ secret_key = var.secret_access_key
}
module "ssn-k8s" {
diff --git a/infrastructure-provisioning/terraform/aws/main/variables.tf b/infrastructure-provisioning/terraform/aws/main/variables.tf
index fb1c3c5..cc417f7 100644
--- a/infrastructure-provisioning/terraform/aws/main/variables.tf
+++ b/infrastructure-provisioning/terraform/aws/main/variables.tf
@@ -1,6 +1,6 @@
-variable "access_key_var" {}
+variable "access_key_id" {}
-variable "secret_key_var" {}
+variable "secret_access_key" {}
variable "region" {
default = "us-west-2"
diff --git a/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/auto_scaling_groups.tf b/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/auto_scaling_groups.tf
index 7ba0971..2e20934 100644
--- a/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/auto_scaling_groups.tf
+++ b/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/auto_scaling_groups.tf
@@ -1,29 +1,29 @@
-data "template_file" "k8s-masters-user-data" {
+data "template_file" "ssn_k8s_masters_user_data" {
template = file("../modules/ssn-k8s/files/masters-user-data.sh")
vars = {
k8s-asg = "${var.service_base_name}-master"
k8s-region = var.region
- k8s-bucket-name = aws_s3_bucket.k8s-bucket.id
+ k8s-bucket-name = aws_s3_bucket.ssn_k8s_bucket.id
k8s-eip = aws_eip.k8s-lb-eip.public_ip
- k8s-tg-arn = aws_lb_target_group.k8s-lb-target-group.arn
+ k8s-tg-arn = aws_lb_target_group.ssn_k8s_lb_target_group.arn
k8s-os-user = var.os-user
}
}
-data "template_file" "k8s-workers-user-data" {
+data "template_file" "ssn_k8s_workers_user_data" {
template = file("../modules/ssn-k8s/files/workers-user-data.sh")
vars = {
- k8s-bucket-name = aws_s3_bucket.k8s-bucket.id
+ k8s-bucket-name = aws_s3_bucket.ssn_k8s_bucket.id
k8s-os-user = var.os-user
}
}
-resource "aws_launch_configuration" "as_conf_masters" {
- name = "${var.service_base_name}-as-conf-masters"
+resource "aws_launch_configuration" "ssn_k8s_launch_conf_masters" {
+ name = "${var.service_base_name}-ssn-launch-conf-masters"
image_id = var.ami[var.env_os]
instance_type = var.masters_shape
key_name = var.key_name
- security_groups = [aws_security_group.k8s-sg.id]
+ security_groups = [aws_security_group.ssn_k8s_sg.id]
iam_instance_profile = aws_iam_instance_profile.k8s-profile.name
root_block_device {
volume_type = "gp2"
@@ -34,15 +34,15 @@ resource "aws_launch_configuration" "as_conf_masters" {
lifecycle {
create_before_destroy = true
}
- user_data = data.template_file.k8s-masters-user-data.rendered
+ user_data = data.template_file.ssn_k8s_masters_user_data.rendered
}
-resource "aws_launch_configuration" "as_conf_workers" {
- name = "${var.service_base_name}-as-conf-workers"
+resource "aws_launch_configuration" "ssn_k8s_launch_conf_workers" {
+ name = "${var.service_base_name}-ssn-launch-conf-workers"
image_id = var.ami[var.env_os]
instance_type = var.workers_shape
key_name = var.key_name
- security_groups = [aws_security_group.k8s-sg.id]
+ security_groups = [aws_security_group.ssn_k8s_sg.id]
iam_instance_profile = aws_iam_instance_profile.k8s-profile.name
root_block_device {
volume_type = "gp2"
@@ -53,16 +53,16 @@ resource "aws_launch_configuration" "as_conf_workers" {
lifecycle {
create_before_destroy = true
}
- user_data = data.template_file.k8s-workers-user-data.rendered
+ user_data = data.template_file.ssn_k8s_workers_user_data.rendered
}
-resource "aws_autoscaling_group" "autoscaling_group_masters" {
- name = "${var.service_base_name}-master"
- launch_configuration = aws_launch_configuration.as_conf_masters.name
+resource "aws_autoscaling_group" "ssn_k8s_autoscaling_group_masters" {
+ name = "${var.service_base_name}-ssn-masters"
+ launch_configuration = aws_launch_configuration.ssn_k8s_launch_conf_masters.name
min_size = var.masters_count
max_size = var.masters_count
vpc_zone_identifier = [data.aws_subnet.k8s-subnet-data.id]
- target_group_arns = [aws_lb_target_group.k8s-lb-target-group.arn]
+ target_group_arns = [aws_lb_target_group.ssn_k8s_lb_target_group.arn]
lifecycle {
create_before_destroy = true
@@ -70,15 +70,15 @@ resource "aws_autoscaling_group" "autoscaling_group_masters" {
tags = [
{
key = "Name"
- value = "${var.service_base_name}-master"
+ value = "${var.service_base_name}-ssn-masters"
propagate_at_launch = true
}
]
}
-resource "aws_autoscaling_group" "autoscaling_group_workers" {
- name = "${var.service_base_name}-worker"
- launch_configuration = aws_launch_configuration.as_conf_workers.name
+resource "aws_autoscaling_group" "ssn_k8s_autoscaling_group_workers" {
+ name = "${var.service_base_name}-ssn-workers"
+ launch_configuration = aws_launch_configuration.ssn_k8s_launch_conf_workers.name
min_size = var.workers_count
max_size = var.workers_count
vpc_zone_identifier = [data.aws_subnet.k8s-subnet-data.id]
@@ -89,7 +89,7 @@ resource "aws_autoscaling_group" "autoscaling_group_workers" {
tags = [
{
key = "Name"
- value = "${var.service_base_name}-worker"
+ value = "${var.service_base_name}-ssn-workers"
propagate_at_launch = true
}
]
diff --git a/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/lb.tf b/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/lb.tf
index 277d893..891a353 100644
--- a/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/lb.tf
+++ b/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/lb.tf
@@ -1,5 +1,5 @@
-resource "aws_lb" "k8s-lb" {
- name = "${var.service_base_name}-lb"
+resource "aws_lb" "ssn_k8s_lb" {
+ name = "${var.service_base_name}-ssn-lb"
load_balancer_type = "network"
subnet_mapping {
@@ -7,27 +7,27 @@ resource "aws_lb" "k8s-lb" {
allocation_id = aws_eip.k8s-lb-eip.id
}
tags = {
- Name = "${var.service_base_name}-lb"
+ Name = "${var.service_base_name}-ssn-lb"
}
}
-resource "aws_lb_target_group" "k8s-lb-target-group" {
- name = "${var.service_base_name}-lb-target-group"
+resource "aws_lb_target_group" "ssn_k8s_lb_target_group" {
+ name = "${var.service_base_name}-ssn-lb-target-group"
port = 6443
protocol = "TCP"
- vpc_id = data.aws_vpc.k8s-vpc-data.id
+ vpc_id = data.aws_vpc.ssn_k8s_vpc_data.id
tags = {
- Name = "${var.service_base_name}-lb-target-group"
+ Name = "${var.service_base_name}-ssn-lb-target-group"
}
}
-resource "aws_lb_listener" "k8s-lb-listener" {
- load_balancer_arn = aws_lb.k8s-lb.arn
+resource "aws_lb_listener" "ssn_k8s_lb_listener" {
+ load_balancer_arn = aws_lb.ssn_k8s_lb.arn
port = "6443"
protocol = "TCP"
default_action {
type = "forward"
- target_group_arn = aws_lb_target_group.k8s-lb-target-group.arn
+ target_group_arn = aws_lb_target_group.ssn_k8s_lb_target_group.arn
}
}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/role_policy.tf b/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/role_policy.tf
index bb7ce24..41358bf 100644
--- a/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/role_policy.tf
+++ b/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/role_policy.tf
@@ -1,30 +1,30 @@
-data "template_file" "k8s-s3-policy" {
+data "template_file" "ssn_k8s_s3_policy" {
template = file("../modules/ssn-k8s/files/ssn-policy.json.tpl")
vars = {
- bucket_arn = aws_s3_bucket.k8s-bucket.arn
+ bucket_arn = aws_s3_bucket.ssn_k8s_bucket.arn
}
}
-resource "aws_iam_policy" "k8s-policy" {
- name = "${var.service_base_name}-policy"
- description = "Policy for K8S"
- policy = data.template_file.k8s-s3-policy.rendered
+resource "aws_iam_policy" "ssn_k8s_policy" {
+ name = "${var.service_base_name}-ssn-policy"
+ description = "Policy for SSN K8S"
+ policy = data.template_file.ssn_k8s_s3_policy.rendered
}
-resource "aws_iam_role" "k8s-role" {
- name = "${var.service_base_name}-role"
+resource "aws_iam_role" "ssn_k8s_role" {
+ name = "${var.service_base_name}-ssn-role"
assume_role_policy = file("../modules/ssn-k8s/files/assume-policy.json")
tags = {
- Name = "${var.service_base_name}-role"
+ Name = "${var.service_base_name}-ssn-role"
}
}
-resource "aws_iam_role_policy_attachment" "k8s-attach" {
- role = aws_iam_role.k8s-role.name
- policy_arn = aws_iam_policy.k8s-policy.arn
+resource "aws_iam_role_policy_attachment" "ssn_k8s_policy_attachment" {
+ role = aws_iam_role.ssn_k8s_role.name
+ policy_arn = aws_iam_policy.ssn_k8s_policy.arn
}
resource "aws_iam_instance_profile" "k8s-profile" {
name = "${var.service_base_name}-instance-profile"
- role = aws_iam_role.k8s-role.name
+ role = aws_iam_role.ssn_k8s_role.name
}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/s3.tf b/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/s3.tf
index 70fc57a..0e8b631 100644
--- a/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/s3.tf
+++ b/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/s3.tf
@@ -1,4 +1,4 @@
-resource "aws_s3_bucket" "k8s-bucket" {
+resource "aws_s3_bucket" "ssn_k8s_bucket" {
bucket = "${var.service_base_name}-ssn-bucket"
acl = "private"
tags = {
@@ -6,3 +6,4 @@ resource "aws_s3_bucket" "k8s-bucket" {
}
# force_destroy = true
}
+
diff --git a/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/security_groups.tf b/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/security_groups.tf
index b4a3ea9..e2f3c73 100644
--- a/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/security_groups.tf
+++ b/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/security_groups.tf
@@ -1,18 +1,18 @@
-data "aws_eip" "k8s-lb-eip" {
+data "aws_eip" "ssn_k8s_lb_eip" {
id = aws_eip.k8s-lb-eip.id
- depends_on = [aws_lb_listener.k8s-lb-listener]
+ depends_on = [aws_lb_listener.ssn_k8s_lb_listener]
}
-resource "aws_security_group" "k8s-sg" {
- name = "${var.service_base_name}-sg"
- description = "SG for K8S cluster"
- vpc_id = data.aws_vpc.k8s-vpc-data.id
+resource "aws_security_group" "ssn_k8s_sg" {
+ name = "${var.service_base_name}-ssn-sg"
+ description = "SG for SSN K8S cluster"
+ vpc_id = data.aws_vpc.ssn_k8s_vpc_data.id
ingress {
from_port = 0
to_port = 0
protocol = -1
- cidr_blocks = [data.aws_vpc.k8s-vpc-data.cidr_block]
+ cidr_blocks = [data.aws_vpc.ssn_k8s_vpc_data.cidr_block]
}
ingress {
from_port = 22
@@ -31,7 +31,7 @@ resource "aws_security_group" "k8s-sg" {
from_port = 0
to_port = 0
protocol = -1
- cidr_blocks = ["${data.aws_eip.k8s-lb-eip.public_ip}/32", "${data.aws_eip.k8s-lb-eip.private_ip}/32"]
+ cidr_blocks = ["${data.aws_eip.ssn_k8s_lb_eip.public_ip}/32", "${data.aws_eip.ssn_k8s_lb_eip.private_ip}/32"]
}
egress {
@@ -42,6 +42,6 @@ resource "aws_security_group" "k8s-sg" {
}
tags = {
- Name = "${var.service_base_name}-sg"
+ Name = "${var.service_base_name}-ssn-sg"
}
}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/vpc.tf b/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/vpc.tf
index c5ce7c1..a77d5d4 100644
--- a/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/vpc.tf
+++ b/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/vpc.tf
@@ -1,4 +1,4 @@
-resource "aws_vpc" "k8s-vpc" {
+resource "aws_vpc" "ssn_k8s_vpc" {
count = var.vpc_id == "" ? 1 : 0
cidr_block = var.vpc_cidr
instance_tenancy = "default"
@@ -6,49 +6,49 @@ resource "aws_vpc" "k8s-vpc" {
enable_dns_support = true
tags = {
- Name = "${var.service_base_name}-vpc"
+ Name = "${var.service_base_name}-ssn-vpc"
}
}
-resource "aws_internet_gateway" "k8s-igw" {
+resource "aws_internet_gateway" "ssn_k8s_igw" {
count = var.vpc_id == "" ? 1 : 0
- vpc_id = aws_vpc.k8s-vpc.0.id
+ vpc_id = aws_vpc.ssn_k8s_vpc.0.id
tags = {
- Name = "${var.service_base_name}-igw"
+ Name = "${var.service_base_name}-ssn-igw"
}
}
-resource "aws_route" "k8s-r" {
+resource "aws_route" "ssn_k8s_route" {
count = var.vpc_id == "" ? 1 : 0
- route_table_id = aws_vpc.k8s-vpc.0.main_route_table_id
+ route_table_id = aws_vpc.ssn_k8s_vpc.0.main_route_table_id
destination_cidr_block = "0.0.0.0/0"
- gateway_id = aws_internet_gateway.k8s-igw.0.id
+ gateway_id = aws_internet_gateway.ssn_k8s_igw.0.id
}
-data "aws_vpc" "k8s-vpc-data" {
- id = var.vpc_id == "" ? aws_vpc.k8s-vpc.0.id : var.vpc_id
+data "aws_vpc" "ssn_k8s_vpc_data" {
+ id = var.vpc_id == "" ? aws_vpc.ssn_k8s_vpc.0.id : var.vpc_id
}
-resource "aws_subnet" "k8s-subnet" {
+resource "aws_subnet" "ssn_k8s_subnet" {
count = var.subnet_id == "" ? 1 : 0
- vpc_id = data.aws_vpc.k8s-vpc-data.id
+ vpc_id = data.aws_vpc.ssn_k8s_vpc_data.id
availability_zone = "${var.region}${var.zone}"
cidr_block = var.subnet_cidr
map_public_ip_on_launch = true
tags = {
- Name = "${var.service_base_name}-subnet"
+ Name = "${var.service_base_name}-ssn-subnet"
}
}
data "aws_subnet" "k8s-subnet-data" {
- id = var.subnet_id == "" ? aws_subnet.k8s-subnet.0.id : var.subnet_id
+ id = var.subnet_id == "" ? aws_subnet.ssn_k8s_subnet.0.id : var.subnet_id
}
resource "aws_eip" "k8s-lb-eip" {
vpc = true
tags = {
- Name = "${var.service_base_name}-eip"
+ Name = "${var.service_base_name}-ssn-eip"
}
}
\ 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