diff --git a/aws/fedora-coreos/kubernetes/fcc/controller.yaml b/aws/fedora-coreos/kubernetes/butane/controller.yaml similarity index 100% rename from aws/fedora-coreos/kubernetes/fcc/controller.yaml rename to aws/fedora-coreos/kubernetes/butane/controller.yaml diff --git a/aws/fedora-coreos/kubernetes/controllers.tf b/aws/fedora-coreos/kubernetes/controllers.tf index 1b9a463e..a6691f1b 100644 --- a/aws/fedora-coreos/kubernetes/controllers.tf +++ b/aws/fedora-coreos/kubernetes/controllers.tf @@ -49,7 +49,7 @@ resource "aws_instance" "controllers" { # Fedora CoreOS controllers data "ct_config" "controllers" { count = var.controller_count - content = templatefile("${path.module}/fcc/controller.yaml", { + content = templatefile("${path.module}/butane/controller.yaml", { # Cannot use cyclic dependencies on controllers or their DNS records etcd_name = "etcd${count.index}" etcd_domain = "${var.cluster_name}-etcd${count.index}.${var.dns_zone}" diff --git a/aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml b/aws/fedora-coreos/kubernetes/workers/butane/worker.yaml similarity index 100% rename from aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml rename to aws/fedora-coreos/kubernetes/workers/butane/worker.yaml diff --git a/aws/fedora-coreos/kubernetes/workers/workers.tf b/aws/fedora-coreos/kubernetes/workers/workers.tf index 3db1e257..2973845e 100644 --- a/aws/fedora-coreos/kubernetes/workers/workers.tf +++ b/aws/fedora-coreos/kubernetes/workers/workers.tf @@ -70,7 +70,7 @@ resource "aws_launch_configuration" "worker" { # Fedora CoreOS worker data "ct_config" "worker" { - content = templatefile("${path.module}/fcc/worker.yaml", { + content = templatefile("${path.module}/butane/worker.yaml", { kubeconfig = indent(10, var.kubeconfig) ssh_authorized_key = var.ssh_authorized_key cluster_dns_service_ip = cidrhost(var.service_cidr, 10) diff --git a/azure/fedora-coreos/kubernetes/fcc/controller.yaml b/azure/fedora-coreos/kubernetes/butane/controller.yaml similarity index 100% rename from azure/fedora-coreos/kubernetes/fcc/controller.yaml rename to azure/fedora-coreos/kubernetes/butane/controller.yaml diff --git a/azure/fedora-coreos/kubernetes/controllers.tf b/azure/fedora-coreos/kubernetes/controllers.tf index b72f50d5..bb396499 100644 --- a/azure/fedora-coreos/kubernetes/controllers.tf +++ b/azure/fedora-coreos/kubernetes/controllers.tf @@ -114,7 +114,7 @@ resource "azurerm_network_interface_backend_address_pool_association" "controlle # Fedora CoreOS controllers data "ct_config" "controllers" { count = var.controller_count - content = templatefile("${path.module}/fcc/controller.yaml", { + content = templatefile("${path.module}/butane/controller.yaml", { # Cannot use cyclic dependencies on controllers or their DNS records etcd_name = "etcd${count.index}" etcd_domain = "${var.cluster_name}-etcd${count.index}.${var.dns_zone}" diff --git a/azure/fedora-coreos/kubernetes/workers/fcc/worker.yaml b/azure/fedora-coreos/kubernetes/workers/butane/worker.yaml similarity index 100% rename from azure/fedora-coreos/kubernetes/workers/fcc/worker.yaml rename to azure/fedora-coreos/kubernetes/workers/butane/worker.yaml diff --git a/azure/fedora-coreos/kubernetes/workers/workers.tf b/azure/fedora-coreos/kubernetes/workers/workers.tf index 387a485c..dcf570a7 100644 --- a/azure/fedora-coreos/kubernetes/workers/workers.tf +++ b/azure/fedora-coreos/kubernetes/workers/workers.tf @@ -72,7 +72,7 @@ resource "azurerm_monitor_autoscale_setting" "workers" { # Fedora CoreOS worker data "ct_config" "worker" { - content = templatefile("${path.module}/fcc/worker.yaml", { + content = templatefile("${path.module}/butane/worker.yaml", { kubeconfig = indent(10, var.kubeconfig) ssh_authorized_key = var.ssh_authorized_key cluster_dns_service_ip = cidrhost(var.service_cidr, 10) diff --git a/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml b/bare-metal/fedora-coreos/kubernetes/butane/controller.yaml similarity index 100% rename from bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml rename to bare-metal/fedora-coreos/kubernetes/butane/controller.yaml diff --git a/bare-metal/fedora-coreos/kubernetes/fcc/worker.yaml b/bare-metal/fedora-coreos/kubernetes/butane/worker.yaml similarity index 100% rename from bare-metal/fedora-coreos/kubernetes/fcc/worker.yaml rename to bare-metal/fedora-coreos/kubernetes/butane/worker.yaml diff --git a/bare-metal/fedora-coreos/kubernetes/profiles.tf b/bare-metal/fedora-coreos/kubernetes/profiles.tf index 3f88968c..d161a39f 100644 --- a/bare-metal/fedora-coreos/kubernetes/profiles.tf +++ b/bare-metal/fedora-coreos/kubernetes/profiles.tf @@ -44,7 +44,7 @@ resource "matchbox_profile" "controllers" { # Fedora CoreOS controllers data "ct_config" "controllers" { count = length(var.controllers) - content = templatefile("${path.module}/fcc/controller.yaml", { + content = templatefile("${path.module}/butane/controller.yaml", { domain_name = var.controllers.*.domain[count.index] etcd_name = var.controllers.*.name[count.index] etcd_initial_cluster = join(",", formatlist("%s=https://%s:2380", var.controllers.*.name, var.controllers.*.domain)) @@ -71,7 +71,7 @@ resource "matchbox_profile" "workers" { # Fedora CoreOS workers data "ct_config" "workers" { count = length(var.workers) - content = templatefile("${path.module}/fcc/worker.yaml", { + content = templatefile("${path.module}/butane/worker.yaml", { domain_name = var.workers.*.domain[count.index] cluster_dns_service_ip = module.bootstrap.cluster_dns_service_ip cluster_domain_suffix = var.cluster_domain_suffix diff --git a/digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml b/digital-ocean/fedora-coreos/kubernetes/butane/controller.yaml similarity index 100% rename from digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml rename to digital-ocean/fedora-coreos/kubernetes/butane/controller.yaml diff --git a/digital-ocean/fedora-coreos/kubernetes/fcc/worker.yaml b/digital-ocean/fedora-coreos/kubernetes/butane/worker.yaml similarity index 100% rename from digital-ocean/fedora-coreos/kubernetes/fcc/worker.yaml rename to digital-ocean/fedora-coreos/kubernetes/butane/worker.yaml diff --git a/digital-ocean/fedora-coreos/kubernetes/controllers.tf b/digital-ocean/fedora-coreos/kubernetes/controllers.tf index 85608a9f..32568036 100644 --- a/digital-ocean/fedora-coreos/kubernetes/controllers.tf +++ b/digital-ocean/fedora-coreos/kubernetes/controllers.tf @@ -65,7 +65,7 @@ resource "digitalocean_tag" "controllers" { # Fedora CoreOS controllers data "ct_config" "controllers" { count = var.controller_count - content = templatefile("${path.module}/fcc/controller.yaml", { + content = templatefile("${path.module}/butane/controller.yaml", { # Cannot use cyclic dependencies on controllers or their DNS records etcd_name = "etcd${count.index}" etcd_domain = "${var.cluster_name}-etcd${count.index}.${var.dns_zone}" diff --git a/digital-ocean/fedora-coreos/kubernetes/workers.tf b/digital-ocean/fedora-coreos/kubernetes/workers.tf index 5e139b38..2dd48572 100644 --- a/digital-ocean/fedora-coreos/kubernetes/workers.tf +++ b/digital-ocean/fedora-coreos/kubernetes/workers.tf @@ -60,7 +60,7 @@ resource "digitalocean_tag" "workers" { # Fedora CoreOS worker data "ct_config" "worker" { - content = templatefile("${path.module}/fcc/worker.yaml", { + content = templatefile("${path.module}/butane/worker.yaml", { cluster_dns_service_ip = cidrhost(var.service_cidr, 10) cluster_domain_suffix = var.cluster_domain_suffix }) diff --git a/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml b/google-cloud/fedora-coreos/kubernetes/butane/controller.yaml similarity index 100% rename from google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml rename to google-cloud/fedora-coreos/kubernetes/butane/controller.yaml diff --git a/google-cloud/fedora-coreos/kubernetes/controllers.tf b/google-cloud/fedora-coreos/kubernetes/controllers.tf index fd28b1eb..3ae436b3 100644 --- a/google-cloud/fedora-coreos/kubernetes/controllers.tf +++ b/google-cloud/fedora-coreos/kubernetes/controllers.tf @@ -69,7 +69,7 @@ resource "google_compute_instance" "controllers" { # Fedora CoreOS controllers data "ct_config" "controllers" { count = var.controller_count - content = templatefile("${path.module}/fcc/controller.yaml", { + content = templatefile("${path.module}/butane/controller.yaml", { # Cannot use cyclic dependencies on controllers or their DNS records etcd_name = "etcd${count.index}" etcd_domain = "${var.cluster_name}-etcd${count.index}.${var.dns_zone}" diff --git a/google-cloud/fedora-coreos/kubernetes/workers/workers.tf b/google-cloud/fedora-coreos/kubernetes/workers/workers.tf index ce75cd5f..14a92b36 100644 --- a/google-cloud/fedora-coreos/kubernetes/workers/workers.tf +++ b/google-cloud/fedora-coreos/kubernetes/workers/workers.tf @@ -74,7 +74,7 @@ resource "google_compute_instance_template" "worker" { # Fedora CoreOS worker data "ct_config" "worker" { - content = templatefile("${path.module}/fcc/worker.yaml", { + content = templatefile("${path.module}/butane/worker.yaml", { kubeconfig = indent(10, var.kubeconfig) ssh_authorized_key = var.ssh_authorized_key cluster_dns_service_ip = cidrhost(var.service_cidr, 10)