Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename CLC files and favor Terraform list index syntax #605

Merged
merged 1 commit into from
Dec 29, 2019
Merged

Rename CLC files and favor Terraform list index syntax #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions aws/container-linux/kubernetes/ami.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ locals {
# 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)
channel = element(split("-", var.os_image), 1)
flavor = split("-", var.os_image)[0]
channel = split("-", var.os_image)[1]
}

data "aws_ami" "coreos" {
Expand Down
0 ...-linux/kubernetes/cl/controller.yaml.tmpl → ...ainer-linux/kubernetes/cl/controller.yaml
View file
Open in desktop
File renamed without changes.
15 changes: 6 additions & 9 deletions aws/container-linux/kubernetes/controllers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ resource "aws_route53_record" "etcds" {
ttl = 300

# private IPv4 address for etcd
records = [element(aws_instance.controllers.*.private_ip, count.index)]
records = [aws_instance.controllers.*.private_ip[count.index]]
}

# Controller instances
Expand All @@ -24,7 +24,7 @@ resource "aws_instance" "controllers" {
instance_type = var.controller_type

ami = local.ami_id
user_data = element(data.ct_config.controller-ignitions.*.rendered, count.index)
user_data = data.ct_config.controller-ignitions.*.rendered[count.index]

# storage
root_block_device {
Expand All @@ -36,7 +36,7 @@ resource "aws_instance" "controllers" {

# network
associate_public_ip_address = true
subnet_id = element(aws_subnet.public.*.id, count.index)
subnet_id = aws_subnet.public.*.id[count.index]
vpc_security_group_ids = [aws_security_group.controller.id]

lifecycle {
Expand All @@ -49,11 +49,8 @@ resource "aws_instance" "controllers" {

# Controller Ignition configs
data "ct_config" "controller-ignitions" {
count = var.controller_count
content = element(
data.template_file.controller-configs.*.rendered,
count.index,
)
count = var.controller_count
content = data.template_file.controller-configs.*.rendered[count.index]
pretty_print = false
snippets = var.controller_clc_snippets
}
Expand All @@ -62,7 +59,7 @@ data "ct_config" "controller-ignitions" {
data "template_file" "controller-configs" {
count = var.controller_count

template = file("${path.module}/cl/controller.yaml.tmpl")
template = file("${path.module}/cl/controller.yaml")

vars = {
# Cannot use cyclic dependencies on controllers or their DNS records
Expand Down
2 changes: 1 addition & 1 deletion aws/container-linux/kubernetes/network.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,6 @@ resource "aws_route_table_association" "public" {
count = length(data.aws_availability_zones.all.names)

route_table_id = aws_route_table.default.id
subnet_id = element(aws_subnet.public.*.id, count.index)
subnet_id = aws_subnet.public.*.id[count.index]
}

2 changes: 1 addition & 1 deletion aws/container-linux/kubernetes/nlb.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ resource "aws_lb_target_group_attachment" "controllers" {
count = var.controller_count

target_group_arn = aws_lb_target_group.controllers.arn
target_id = element(aws_instance.controllers.*.id, count.index)
target_id = aws_instance.controllers.*.id[count.index]
port = 6443
}

2 changes: 1 addition & 1 deletion aws/container-linux/kubernetes/ssh.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ locals {
# format assets for distribution
assets_bundle = [
# header with the unpack location
for key, value in module.bootstrap.assets_dist:
for key, value in module.bootstrap.assets_dist :
format("##### %s\n%s", key, value)
]
}
Expand Down
4 changes: 2 additions & 2 deletions aws/container-linux/kubernetes/workers/ami.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ locals {
# 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)
channel = element(split("-", var.os_image), 1)
flavor = split("-", var.os_image)[0]
channel = split("-", var.os_image)[1]
}

data "aws_ami" "coreos" {
Expand Down
0 ...ux/kubernetes/workers/cl/worker.yaml.tmpl → ...r-linux/kubernetes/workers/cl/worker.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion aws/container-linux/kubernetes/workers/workers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ data "ct_config" "worker-ignition" {

# Worker Container Linux config
data "template_file" "worker-config" {
template = file("${path.module}/cl/worker.yaml.tmpl")
template = file("${path.module}/cl/worker.yaml")

vars = {
kubeconfig = indent(10, var.kubeconfig)
Expand Down
4 changes: 2 additions & 2 deletions aws/fedora-coreos/kubernetes/ssh.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ locals {
# format assets for distribution
assets_bundle = [
# header with the unpack location
for key, value in module.bootstrap.assets_dist:
for key, value in module.bootstrap.assets_dist :
format("##### %s\n%s", key, value)
]
}
Expand All @@ -21,7 +21,7 @@ resource "null_resource" "copy-controller-secrets" {
user = "core"
timeout = "15m"
}

provisioner "file" {
content = join("\n", local.assets_bundle)
destination = "$HOME/assets"
Expand Down
Empty file removed aws/ignore/.gitkeep
View file
Open in desktop
Empty file.
0 ...-linux/kubernetes/cl/controller.yaml.tmpl → ...ainer-linux/kubernetes/cl/controller.yaml
View file
Open in desktop
File renamed without changes.
22 changes: 8 additions & 14 deletions azure/container-linux/kubernetes/controllers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,13 @@ resource "azurerm_dns_a_record" "etcds" {
ttl = 300

# private IPv4 address for etcd
records = [element(
azurerm_network_interface.controllers.*.private_ip_address,
count.index,
)]
records = [azurerm_network_interface.controllers.*.private_ip_address[count.index]]
}

locals {
# Channel for a Container Linux derivative
# coreos-stable -> Container Linux Stable
channel = element(split("-", var.os_image), 1)
channel = split("-", var.os_image)[1]
}

# Controller availability set to spread controllers
Expand Down Expand Up @@ -63,12 +60,12 @@ resource "azurerm_virtual_machine" "controllers" {
}

# network
network_interface_ids = [element(azurerm_network_interface.controllers.*.id, count.index)]
network_interface_ids = [azurerm_network_interface.controllers.*.id[count.index]]

os_profile {
computer_name = "${var.cluster_name}-controller-${count.index}"
admin_username = "core"
custom_data = element(data.ct_config.controller-ignitions.*.rendered, count.index)
custom_data = data.ct_config.controller-ignitions.*.rendered[count.index]
}

# Azure mandates setting an ssh_key, even though Ignition custom_data handles it too
Expand Down Expand Up @@ -108,7 +105,7 @@ resource "azurerm_network_interface" "controllers" {
private_ip_address_allocation = "dynamic"

# public IPv4
public_ip_address_id = element(azurerm_public_ip.controllers.*.id, count.index)
public_ip_address_id = azurerm_public_ip.controllers.*.id[count.index]
}
}

Expand All @@ -134,11 +131,8 @@ resource "azurerm_public_ip" "controllers" {

# Controller Ignition configs
data "ct_config" "controller-ignitions" {
count = var.controller_count
content = element(
data.template_file.controller-configs.*.rendered,
count.index,
)
count = var.controller_count
content = data.template_file.controller-configs.*.rendered[count.index]
pretty_print = false
snippets = var.controller_clc_snippets
}
Expand All @@ -147,7 +141,7 @@ data "ct_config" "controller-ignitions" {
data "template_file" "controller-configs" {
count = var.controller_count

template = file("${path.module}/cl/controller.yaml.tmpl")
template = file("${path.module}/cl/controller.yaml")

vars = {
# Cannot use cyclic dependencies on controllers or their DNS records
Expand Down
6 changes: 3 additions & 3 deletions azure/container-linux/kubernetes/ssh.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ locals {
# format assets for distribution
assets_bundle = [
# header with the unpack location
for key, value in module.bootstrap.assets_dist:
for key, value in module.bootstrap.assets_dist :
format("##### %s\n%s", key, value)
]
}
Expand All @@ -22,7 +22,7 @@ resource "null_resource" "copy-controller-secrets" {
user = "core"
timeout = "15m"
}

provisioner "file" {
content = join("\n", local.assets_bundle)
destination = "$HOME/assets"
Expand All @@ -45,7 +45,7 @@ resource "null_resource" "bootstrap" {

connection {
type = "ssh"
host = element(azurerm_public_ip.controllers.*.ip_address, 0)
host = azurerm_public_ip.controllers.*.ip_address[0]
user = "core"
timeout = "15m"
}
Expand Down
0 ...ux/kubernetes/workers/cl/worker.yaml.tmpl → ...r-linux/kubernetes/workers/cl/worker.yaml
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions azure/container-linux/kubernetes/workers/workers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
locals {
# Channel for a Container Linux derivative
# coreos-stable -> Container Linux Stable
channel = element(split("-", var.os_image), 1)
channel = split("-", var.os_image)[1]
}

# Workers scale set
Expand Down Expand Up @@ -104,7 +104,7 @@ data "ct_config" "worker-ignition" {

# Worker Container Linux configs
data "template_file" "worker-config" {
template = file("${path.module}/cl/worker.yaml.tmpl")
template = file("${path.module}/cl/worker.yaml")

vars = {
kubeconfig = indent(10, var.kubeconfig)
Expand Down
0 ...-linux/kubernetes/cl/controller.yaml.tmpl → ...ainer-linux/kubernetes/cl/controller.yaml
View file
Open in desktop
File renamed without changes.
0 ...ner-linux/kubernetes/cl/install.yaml.tmpl → ...ontainer-linux/kubernetes/cl/install.yaml
View file
Open in desktop
File renamed without changes.
0 ...iner-linux/kubernetes/cl/worker.yaml.tmpl → ...container-linux/kubernetes/cl/worker.yaml
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions bare-metal/container-linux/kubernetes/profiles.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ resource "matchbox_profile" "container-linux-install" {
data "template_file" "container-linux-install-configs" {
count = length(var.controllers) + length(var.workers)

template = file("${path.module}/cl/install.yaml.tmpl")
template = file("${path.module}/cl/install.yaml")

vars = {
os_flavor = local.flavor
Expand Down Expand Up @@ -72,7 +72,7 @@ resource "matchbox_profile" "cached-container-linux-install" {
data "template_file" "cached-container-linux-install-configs" {
count = length(var.controllers) + length(var.workers)

template = file("${path.module}/cl/install.yaml.tmpl")
template = file("${path.module}/cl/install.yaml")

vars = {
os_flavor = local.flavor
Expand Down Expand Up @@ -150,7 +150,7 @@ data "ct_config" "controller-ignitions" {
data "template_file" "controller-configs" {
count = length(var.controllers)

template = file("${path.module}/cl/controller.yaml.tmpl")
template = file("${path.module}/cl/controller.yaml")

vars = {
domain_name = var.controllers.*.domain[count.index]
Expand Down Expand Up @@ -180,7 +180,7 @@ data "ct_config" "worker-ignitions" {
data "template_file" "worker-configs" {
count = length(var.workers)

template = file("${path.module}/cl/worker.yaml.tmpl")
template = file("${path.module}/cl/worker.yaml")

vars = {
domain_name = var.workers.*.domain[count.index]
Expand Down
2 changes: 1 addition & 1 deletion bare-metal/container-linux/kubernetes/ssh.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ locals {
# format assets for distribution
assets_bundle = [
# header with the unpack location
for key, value in module.bootstrap.assets_dist:
for key, value in module.bootstrap.assets_dist :
format("##### %s\n%s", key, value)
]
}
Expand Down
2 changes: 1 addition & 1 deletion bare-metal/fedora-coreos/kubernetes/ssh.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ locals {
# format assets for distribution
assets_bundle = [
# header with the unpack location
for key, value in module.bootstrap.assets_dist:
for key, value in module.bootstrap.assets_dist :
format("##### %s\n%s", key, value)
]
}
Expand Down
Empty file removed bare-metal/ignore/.gitkeep
View file
Open in desktop
Empty file.
0 ...-linux/kubernetes/cl/controller.yaml.tmpl → ...ainer-linux/kubernetes/cl/controller.yaml
View file
Open in desktop
File renamed without changes.
0 ...iner-linux/kubernetes/cl/worker.yaml.tmpl → ...container-linux/kubernetes/cl/worker.yaml
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions digital-ocean/container-linux/kubernetes/controllers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ resource "digitalocean_record" "controllers" {
ttl = 300

# IPv4 addresses of controllers
value = element(digitalocean_droplet.controllers.*.ipv4_address, count.index)
value = digitalocean_droplet.controllers.*.ipv4_address[count.index]
}

# Discrete DNS records for each controller's private IPv4 for etcd usage
Expand All @@ -27,7 +27,7 @@ resource "digitalocean_record" "etcds" {
ttl = 300

# private IPv4 address for etcd
value = element(digitalocean_droplet.controllers.*.ipv4_address_private, count.index)
value = digitalocean_droplet.controllers.*.ipv4_address_private[count.index]
}

# Controller droplet instances
Expand All @@ -44,7 +44,7 @@ resource "digitalocean_droplet" "controllers" {
ipv6 = true
private_networking = true

user_data = element(data.ct_config.controller-ignitions.*.rendered, count.index)
user_data = data.ct_config.controller-ignitions.*.rendered[count.index]
ssh_keys = var.ssh_fingerprints

tags = [
Expand All @@ -64,7 +64,7 @@ resource "digitalocean_tag" "controllers" {
# Controller Ignition configs
data "ct_config" "controller-ignitions" {
count = var.controller_count
content = element(data.template_file.controller-configs.*.rendered, count.index)
content = data.template_file.controller-configs.*.rendered[count.index]
pretty_print = false
snippets = var.controller_clc_snippets
}
Expand All @@ -73,7 +73,7 @@ data "ct_config" "controller-ignitions" {
data "template_file" "controller-configs" {
count = var.controller_count

template = file("${path.module}/cl/controller.yaml.tmpl")
template = file("${path.module}/cl/controller.yaml")

vars = {
# Cannot use cyclic dependencies on controllers or their DNS records
Expand Down
2 changes: 1 addition & 1 deletion digital-ocean/container-linux/kubernetes/ssh.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ locals {
# format assets for distribution
assets_bundle = [
# header with the unpack location
for key, value in module.bootstrap.assets_dist:
for key, value in module.bootstrap.assets_dist :
format("##### %s\n%s", key, value)
]
}
Expand Down
6 changes: 3 additions & 3 deletions digital-ocean/container-linux/kubernetes/workers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ resource "digitalocean_record" "workers-record-a" {
name = "${var.cluster_name}-workers"
type = "A"
ttl = 300
value = element(digitalocean_droplet.workers.*.ipv4_address, count.index)
value = digitalocean_droplet.workers.*.ipv4_address[count.index]
}

resource "digitalocean_record" "workers-record-aaaa" {
Expand All @@ -20,7 +20,7 @@ resource "digitalocean_record" "workers-record-aaaa" {
name = "${var.cluster_name}-workers"
type = "AAAA"
ttl = 300
value = element(digitalocean_droplet.workers.*.ipv6_address, count.index)
value = digitalocean_droplet.workers.*.ipv6_address[count.index]
}

# Worker droplet instances
Expand Down Expand Up @@ -63,7 +63,7 @@ data "ct_config" "worker-ignition" {

# Worker Container Linux config
data "template_file" "worker-config" {
template = file("${path.module}/cl/worker.yaml.tmpl")
template = file("${path.module}/cl/worker.yaml")

vars = {
cluster_dns_service_ip = cidrhost(var.service_cidr, 10)
Expand Down
0 ...-linux/kubernetes/cl/controller.yaml.tmpl → ...ainer-linux/kubernetes/cl/controller.yaml
View file
Open in desktop
File renamed without changes.
Loading