From 9b405a19b2292ca8127787e0c75e0283d4de36e7 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Sat, 27 Oct 2018 16:24:59 -0700 Subject: [PATCH] Fix minor naming inconsistencies in Ignition and CLC data --- aws/container-linux/kubernetes/controllers.tf | 19 +++++++++--------- .../kubernetes/workers/workers.tf | 17 ++++++++-------- azure/container-linux/kubernetes/require.tf | 1 - .../kubernetes/workers/workers.tf | 8 ++++---- .../container-linux/kubernetes/controllers.tf | 20 +++++++++---------- .../container-linux/kubernetes/workers.tf | 17 ++++++++-------- 6 files changed, 42 insertions(+), 40 deletions(-) diff --git a/aws/container-linux/kubernetes/controllers.tf b/aws/container-linux/kubernetes/controllers.tf index 428cdff9..2cb0314a 100644 --- a/aws/container-linux/kubernetes/controllers.tf +++ b/aws/container-linux/kubernetes/controllers.tf @@ -43,8 +43,16 @@ resource "aws_instance" "controllers" { } } -# Controller Container Linux Config -data "template_file" "controller_config" { +# Controller Ignition configs +data "ct_config" "controller-ignitions" { + count = "${var.controller_count}" + content = "${element(data.template_file.controller-configs.*.rendered, count.index)}" + pretty_print = false + snippets = ["${var.controller_clc_snippets}"] +} + +# Controller Container Linux configs +data "template_file" "controller-configs" { count = "${var.controller_count}" template = "${file("${path.module}/cl/controller.yaml.tmpl")}" @@ -74,10 +82,3 @@ data "template_file" "etcds" { dns_zone = "${var.dns_zone}" } } - -data "ct_config" "controller-ignitions" { - count = "${var.controller_count}" - content = "${element(data.template_file.controller_config.*.rendered, count.index)}" - pretty_print = false - snippets = ["${var.controller_clc_snippets}"] -} diff --git a/aws/container-linux/kubernetes/workers/workers.tf b/aws/container-linux/kubernetes/workers/workers.tf index 783b311d..4b676232 100644 --- a/aws/container-linux/kubernetes/workers/workers.tf +++ b/aws/container-linux/kubernetes/workers/workers.tf @@ -65,8 +65,15 @@ resource "aws_launch_configuration" "worker" { } } -# Worker Container Linux Config -data "template_file" "worker_config" { +# Worker Ignition config +data "ct_config" "worker-ignition" { + content = "${data.template_file.worker-config.rendered}" + pretty_print = false + snippets = ["${var.clc_snippets}"] +} + +# Worker Container Linux config +data "template_file" "worker-config" { template = "${file("${path.module}/cl/worker.yaml.tmpl")}" vars = { @@ -76,9 +83,3 @@ data "template_file" "worker_config" { cluster_domain_suffix = "${var.cluster_domain_suffix}" } } - -data "ct_config" "worker-ignition" { - content = "${data.template_file.worker_config.rendered}" - pretty_print = false - snippets = ["${var.clc_snippets}"] -} diff --git a/azure/container-linux/kubernetes/require.tf b/azure/container-linux/kubernetes/require.tf index 731af74e..bd2e49f6 100644 --- a/azure/container-linux/kubernetes/require.tf +++ b/azure/container-linux/kubernetes/require.tf @@ -23,4 +23,3 @@ provider "template" { provider "tls" { version = "~> 1.0" } - diff --git a/azure/container-linux/kubernetes/workers/workers.tf b/azure/container-linux/kubernetes/workers/workers.tf index 7ca1c600..1d838ed6 100644 --- a/azure/container-linux/kubernetes/workers/workers.tf +++ b/azure/container-linux/kubernetes/workers/workers.tf @@ -37,7 +37,7 @@ resource "azurerm_virtual_machine_scale_set" "workers" { os_profile { computer_name_prefix = "${var.name}-worker-" admin_username = "core" - custom_data = "${element(data.ct_config.worker-ignitions.*.rendered, count.index)}" + custom_data = "${data.ct_config.worker-ignition.rendered}" } # Azure mandates setting an ssh_key, even though Ignition custom_data handles it too @@ -93,14 +93,14 @@ resource "azurerm_autoscale_setting" "workers" { } # Worker Ignition configs -data "ct_config" "worker-ignitions" { - content = "${data.template_file.worker-configs.rendered}" +data "ct_config" "worker-ignition" { + content = "${data.template_file.worker-config.rendered}" pretty_print = false snippets = ["${var.clc_snippets}"] } # Worker Container Linux configs -data "template_file" "worker-configs" { +data "template_file" "worker-config" { template = "${file("${path.module}/cl/worker.yaml.tmpl")}" vars = { diff --git a/digital-ocean/container-linux/kubernetes/controllers.tf b/digital-ocean/container-linux/kubernetes/controllers.tf index ec24ece5..afe85ba4 100644 --- a/digital-ocean/container-linux/kubernetes/controllers.tf +++ b/digital-ocean/container-linux/kubernetes/controllers.tf @@ -57,8 +57,16 @@ resource "digitalocean_tag" "controllers" { name = "${var.cluster_name}-controller" } -# Controller Container Linux Config -data "template_file" "controller_config" { +# Controller Ignition configs +data "ct_config" "controller-ignitions" { + count = "${var.controller_count}" + content = "${element(data.template_file.controller-configs.*.rendered, count.index)}" + pretty_print = false + snippets = ["${var.controller_clc_snippets}"] +} + +# Controller Container Linux configs +data "template_file" "controller-configs" { count = "${var.controller_count}" template = "${file("${path.module}/cl/controller.yaml.tmpl")}" @@ -85,11 +93,3 @@ data "template_file" "etcds" { dns_zone = "${var.dns_zone}" } } - -data "ct_config" "controller-ignitions" { - count = "${var.controller_count}" - content = "${element(data.template_file.controller_config.*.rendered, count.index)}" - pretty_print = false - - snippets = ["${var.controller_clc_snippets}"] -} diff --git a/digital-ocean/container-linux/kubernetes/workers.tf b/digital-ocean/container-linux/kubernetes/workers.tf index 7acff3af..36818487 100644 --- a/digital-ocean/container-linux/kubernetes/workers.tf +++ b/digital-ocean/container-linux/kubernetes/workers.tf @@ -38,8 +38,15 @@ resource "digitalocean_tag" "workers" { name = "${var.cluster_name}-worker" } -# Worker Container Linux Config -data "template_file" "worker_config" { +# Worker Ignition config +data "ct_config" "worker-ignition" { + content = "${data.template_file.worker-config.rendered}" + pretty_print = false + snippets = ["${var.worker_clc_snippets}"] +} + +# Worker Container Linux config +data "template_file" "worker-config" { template = "${file("${path.module}/cl/worker.yaml.tmpl")}" vars = { @@ -47,9 +54,3 @@ data "template_file" "worker_config" { cluster_domain_suffix = "${var.cluster_domain_suffix}" } } - -data "ct_config" "worker-ignition" { - content = "${data.template_file.worker_config.rendered}" - pretty_print = false - snippets = ["${var.worker_clc_snippets}"] -}