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/18 10:40:50 UTC
[incubator-dlab] branch DLAB-terraform updated: added additional
listener
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 0c856cb added additional listener
0c856cb is described below
commit 0c856cb7eaf962807cb14cd866036dbc8d135301
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Thu Jul 18 13:40:41 2019 +0300
added additional listener
---
.../ssn-helm-charts/main/files/mongo_values.yaml | 6 +++-
.../terraform/aws/ssn-helm-charts/main/main.tf | 2 +-
.../aws/ssn-k8s/main/auto_scaling_groups.tf | 11 ++++---
.../terraform/aws/ssn-k8s/main/lb.tf | 37 ++++++++++++++++++----
.../terraform/aws/ssn-k8s/main/main.tf | 4 +++
5 files changed, 47 insertions(+), 13 deletions(-)
diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/files/mongo_values.yaml b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/files/mongo_values.yaml
index b6f903a..c0f2162 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/files/mongo_values.yaml
+++ b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/files/mongo_values.yaml
@@ -9,4 +9,8 @@ image:
tag: 4.0.10-debian-9-r13
persistence:
- enabled: false
\ No newline at end of file
+ enabled: false
+
+service:
+ type: NodePort
+ nodePort: 31017
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/main.tf b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/main.tf
index a6691b3..9ecbe1d 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/main.tf
+++ b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/main.tf
@@ -25,6 +25,6 @@ provider "helm" {
tiller_image = "gcr.io/kubernetes-helm/tiller:v2.14.1"
}
-output "mongo_dlabdb_password" {
+output "mongo_password" {
value = var.mongo_db_pwd
}
\ No newline at end of file
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 aee3428..76f90fa 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
@@ -30,7 +30,7 @@ data "template_file" "ssn_k8s_masters_user_data" {
k8s-region = var.region
k8s-bucket-name = aws_s3_bucket.ssn_k8s_bucket.id
k8s-nlb-dns-name = aws_lb.ssn_k8s_nlb.dns_name #aws_eip.k8s-lb-eip.public_ip
- k8s-tg-arn = aws_lb_target_group.ssn_k8s_nlb_target_group.arn
+ k8s-tg-arn = aws_lb_target_group.ssn_k8s_nlb_api_target_group.arn
k8s_os_user = var.os_user
}
}
@@ -86,8 +86,10 @@ resource "aws_autoscaling_group" "ssn_k8s_autoscaling_group_masters" {
launch_configuration = aws_launch_configuration.ssn_k8s_launch_conf_masters.name
min_size = var.ssn_k8s_masters_count
max_size = var.ssn_k8s_masters_count
- vpc_zone_identifier = compact([data.aws_subnet.k8s-subnet-a-data.id, data.aws_subnet.k8s-subnet-b-data.id, local.subnet_c_id])
- target_group_arns = [aws_lb_target_group.ssn_k8s_nlb_target_group.arn,
+ vpc_zone_identifier = compact([data.aws_subnet.k8s-subnet-a-data.id, data.aws_subnet.k8s-subnet-b-data.id,
+ local.subnet_c_id])
+ target_group_arns = [aws_lb_target_group.ssn_k8s_nlb_api_target_group.arn,
+ aws_lb_target_group.ssn_k8s_nlb_mongo_target_group.arn,
aws_lb_target_group.ssn_k8s_alb_target_group.arn]
lifecycle {
@@ -107,7 +109,8 @@ resource "aws_autoscaling_group" "ssn_k8s_autoscaling_group_workers" {
launch_configuration = aws_launch_configuration.ssn_k8s_launch_conf_workers.name
min_size = var.ssn_k8s_workers_count
max_size = var.ssn_k8s_workers_count
- vpc_zone_identifier = compact([data.aws_subnet.k8s-subnet-a-data.id, data.aws_subnet.k8s-subnet-b-data.id, local.subnet_c_id])
+ vpc_zone_identifier = compact([data.aws_subnet.k8s-subnet-a-data.id, data.aws_subnet.k8s-subnet-b-data.id,
+ local.subnet_c_id])
lifecycle {
create_before_destroy = true
diff --git a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/lb.tf b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/lb.tf
index 552481f..f7418f7 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/lb.tf
+++ b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/lb.tf
@@ -22,7 +22,8 @@
resource "aws_lb" "ssn_k8s_nlb" {
name = "${var.service_base_name}-ssn-nlb"
load_balancer_type = "network"
- subnets = compact([data.aws_subnet.k8s-subnet-a-data.id, data.aws_subnet.k8s-subnet-b-data.id, local.subnet_c_id])
+ subnets = compact([data.aws_subnet.k8s-subnet-a-data.id, data.aws_subnet.k8s-subnet-b-data.id,
+ local.subnet_c_id])
tags = {
Name = "${var.service_base_name}-ssn-nlb"
}
@@ -33,20 +34,31 @@ resource "aws_lb" "ssn_k8s_alb" {
internal = false
load_balancer_type = "application"
security_groups = [aws_security_group.ssn_k8s_sg.id]
- subnets = compact([data.aws_subnet.k8s-subnet-a-data.id, data.aws_subnet.k8s-subnet-b-data.id, local.subnet_c_id])
+ subnets = compact([data.aws_subnet.k8s-subnet-a-data.id, data.aws_subnet.k8s-subnet-b-data.id,
+ local.subnet_c_id])
tags = {
Name = "${var.service_base_name}-ssn-alb"
}
}
-resource "aws_lb_target_group" "ssn_k8s_nlb_target_group" {
- name = "${var.service_base_name}-ssn-nlb-target-group"
+resource "aws_lb_target_group" "ssn_k8s_nlb_api_target_group" {
+ name = "${var.service_base_name}-ssn-nlb-api-target-group"
port = 6443
protocol = "TCP"
vpc_id = data.aws_vpc.ssn_k8s_vpc_data.id
tags = {
- Name = "${var.service_base_name}-ssn-nlb-target-group"
+ Name = "${var.service_base_name}-ssn-nlb-api-target-group"
+ }
+}
+
+resource "aws_lb_target_group" "ssn_k8s_nlb_mongo_target_group" {
+ name = "${var.service_base_name}-ssn-nlb-mongo-target-group"
+ port = 31017
+ protocol = "TCP"
+ vpc_id = data.aws_vpc.ssn_k8s_vpc_data.id
+ tags = {
+ Name = "${var.service_base_name}-ssn-nlb-mongo-target-group"
}
}
@@ -71,13 +83,24 @@ resource "aws_lb_listener" "ssn_k8s_alb_listener" {
}
}
-resource "aws_lb_listener" "ssn_k8s_nlb_listener" {
+resource "aws_lb_listener" "ssn_k8s_nlb_api_listener" {
load_balancer_arn = aws_lb.ssn_k8s_nlb.arn
port = "6443"
protocol = "TCP"
default_action {
type = "forward"
- target_group_arn = aws_lb_target_group.ssn_k8s_nlb_target_group.arn
+ target_group_arn = aws_lb_target_group.ssn_k8s_nlb_api_target_group.arn
+ }
+}
+
+resource "aws_lb_listener" "ssn_k8s_nlb_mongo_listener" {
+ load_balancer_arn = aws_lb.ssn_k8s_nlb.arn
+ port = "27017"
+ protocol = "TCP"
+
+ default_action {
+ type = "forward"
+ target_group_arn = aws_lb_target_group.ssn_k8s_nlb_mongo_target_group.arn
}
}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/main.tf b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/main.tf
index e5718c5..14331a1 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/main.tf
+++ b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/main.tf
@@ -29,6 +29,10 @@ output "ssn_k8s_alb_dns_name" {
value = aws_lb.ssn_k8s_alb.dns_name
}
+output "ssn_k8s_nlb_dns_name" {
+ value = aws_lb.ssn_k8s_nlb.dns_name
+}
+
output "ssn_k8s_masters_ip_addresses" {
value = data.aws_instances.ssn_k8s_masters_instances.public_ips
depends_on = [data.aws_instances.ssn_k8s_masters_instances]
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org