Merge branch 'master' into bf-add-port-80

Brandon Ferguson · web-flow · commit 89d4762f9c7c · 2019-11-07T22:07:09.000+01:00
diff --git a/primary_lb.tf b/primary_lb.tf
@@ -8,6 +8,8 @@ resource "aws_elb" "cluster_api" {
 
   security_groups = ["${module.common.intra_vpc_and_egress_sg_id}"]
 
+  idle_timeout = 3600 # for kubectl commands
+
   listener {
     instance_protocol = "TCP"
     instance_port     = 6443
