diff --git a/aws/container-linux/kubernetes/ami.tf b/aws/container-linux/kubernetes/ami.tf index d995a4fa..c2b8efbb 100644 --- a/aws/container-linux/kubernetes/ami.tf +++ b/aws/container-linux/kubernetes/ami.tf @@ -3,7 +3,8 @@ locals { # coreos-stable -> Container Linux AMI # flatcar-stable -> Flatcar Linux AMI ami_id = "${local.flavor == "flatcar" ? data.aws_ami.flatcar.image_id : data.aws_ami.coreos.image_id}" - flavor = "${element(split("-", var.os_image), 0)}" + + flavor = "${element(split("-", var.os_image), 0)}" channel = "${element(split("-", var.os_image), 1)}" } @@ -46,4 +47,3 @@ data "aws_ami" "flatcar" { values = ["Flatcar-${local.channel}-*"] } } - diff --git a/aws/container-linux/kubernetes/security.tf b/aws/container-linux/kubernetes/security.tf index 47186f7f..8534200b 100644 --- a/aws/container-linux/kubernetes/security.tf +++ b/aws/container-linux/kubernetes/security.tf @@ -94,10 +94,10 @@ resource "aws_security_group_rule" "controller-node-exporter" { resource "aws_security_group_rule" "controller-kubelet" { security_group_id = "${aws_security_group.controller.id}" - type = "ingress" - protocol = "tcp" - from_port = 10250 - to_port = 10250 + type = "ingress" + protocol = "tcp" + from_port = 10250 + to_port = 10250 source_security_group_id = "${aws_security_group.worker.id}" } diff --git a/aws/container-linux/kubernetes/workers.tf b/aws/container-linux/kubernetes/workers.tf index 8547402b..365fd637 100644 --- a/aws/container-linux/kubernetes/workers.tf +++ b/aws/container-linux/kubernetes/workers.tf @@ -8,7 +8,7 @@ module "workers" { security_groups = ["${aws_security_group.worker.id}"] count = "${var.worker_count}" instance_type = "${var.worker_type}" - os_image = "${var.os_image}" + os_image = "${var.os_image}" disk_size = "${var.disk_size}" spot_price = "${var.worker_price}" diff --git a/aws/container-linux/kubernetes/workers/ami.tf b/aws/container-linux/kubernetes/workers/ami.tf index d995a4fa..c2b8efbb 100644 --- a/aws/container-linux/kubernetes/workers/ami.tf +++ b/aws/container-linux/kubernetes/workers/ami.tf @@ -3,7 +3,8 @@ locals { # coreos-stable -> Container Linux AMI # flatcar-stable -> Flatcar Linux AMI ami_id = "${local.flavor == "flatcar" ? data.aws_ami.flatcar.image_id : data.aws_ami.coreos.image_id}" - flavor = "${element(split("-", var.os_image), 0)}" + + flavor = "${element(split("-", var.os_image), 0)}" channel = "${element(split("-", var.os_image), 1)}" } @@ -46,4 +47,3 @@ data "aws_ami" "flatcar" { values = ["Flatcar-${local.channel}-*"] } } - diff --git a/aws/fedora-atomic/kubernetes/security.tf b/aws/fedora-atomic/kubernetes/security.tf index 47186f7f..8534200b 100644 --- a/aws/fedora-atomic/kubernetes/security.tf +++ b/aws/fedora-atomic/kubernetes/security.tf @@ -94,10 +94,10 @@ resource "aws_security_group_rule" "controller-node-exporter" { resource "aws_security_group_rule" "controller-kubelet" { security_group_id = "${aws_security_group.controller.id}" - type = "ingress" - protocol = "tcp" - from_port = 10250 - to_port = 10250 + type = "ingress" + protocol = "tcp" + from_port = 10250 + to_port = 10250 source_security_group_id = "${aws_security_group.worker.id}" }