CadolesKube
/
typhoon
mirror of https://github.com/puppetmaster/typhoon.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Re-run terraform fmt for formatting

This commit is contained in:
Dalton Hubble 2018-05-14 23:38:16 -07:00
parent c2b719dc75
commit 983489bb52
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
aws/container-linux/kubernetes/ami.tf
View File

@ -3,7 +3,8 @@ locals {
# coreos-stable -> Container Linux AMI # coreos-stable -> Container Linux AMI
# flatcar-stable -> Flatcar Linux AMI # flatcar-stable -> Flatcar Linux AMI
ami_id = "${local.flavor == "flatcar" ? data.aws_ami.flatcar.image_id : data.aws_ami.coreos.image_id}" 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)}" channel = "${element(split("-", var.os_image), 1)}"
} }
@ -46,4 +47,3 @@ data "aws_ami" "flatcar" {
values = ["Flatcar-${local.channel}-*"] values = ["Flatcar-${local.channel}-*"]
} }
} }

8
aws/container-linux/kubernetes/security.tf
View File

@ -94,10 +94,10 @@ resource "aws_security_group_rule" "controller-node-exporter" {
resource "aws_security_group_rule" "controller-kubelet" { resource "aws_security_group_rule" "controller-kubelet" {
security_group_id = "${aws_security_group.controller.id}" security_group_id = "${aws_security_group.controller.id}"
type = "ingress" type = "ingress"
protocol = "tcp" protocol = "tcp"
from_port = 10250 from_port = 10250
to_port = 10250 to_port = 10250
source_security_group_id = "${aws_security_group.worker.id}" source_security_group_id = "${aws_security_group.worker.id}"
} }

2
aws/container-linux/kubernetes/workers.tf
View File

@ -8,7 +8,7 @@ module "workers" {
security_groups = ["${aws_security_group.worker.id}"] security_groups = ["${aws_security_group.worker.id}"]
count = "${var.worker_count}" count = "${var.worker_count}"
instance_type = "${var.worker_type}" instance_type = "${var.worker_type}"
os_image = "${var.os_image}" os_image = "${var.os_image}"
disk_size = "${var.disk_size}" disk_size = "${var.disk_size}"
spot_price = "${var.worker_price}" spot_price = "${var.worker_price}"

4
aws/container-linux/kubernetes/workers/ami.tf
View File

@ -3,7 +3,8 @@ locals {
# coreos-stable -> Container Linux AMI # coreos-stable -> Container Linux AMI
# flatcar-stable -> Flatcar Linux AMI # flatcar-stable -> Flatcar Linux AMI
ami_id = "${local.flavor == "flatcar" ? data.aws_ami.flatcar.image_id : data.aws_ami.coreos.image_id}" 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)}" channel = "${element(split("-", var.os_image), 1)}"
} }
@ -46,4 +47,3 @@ data "aws_ami" "flatcar" {
values = ["Flatcar-${local.channel}-*"] values = ["Flatcar-${local.channel}-*"]
} }
} }

8
aws/fedora-atomic/kubernetes/security.tf
View File

@ -94,10 +94,10 @@ resource "aws_security_group_rule" "controller-node-exporter" {
resource "aws_security_group_rule" "controller-kubelet" { resource "aws_security_group_rule" "controller-kubelet" {
security_group_id = "${aws_security_group.controller.id}" security_group_id = "${aws_security_group.controller.id}"
type = "ingress" type = "ingress"
protocol = "tcp" protocol = "tcp"
from_port = 10250 from_port = 10250
to_port = 10250 to_port = 10250
source_security_group_id = "${aws_security_group.worker.id}" source_security_group_id = "${aws_security_group.worker.id}"
} }