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

Rename Fedora CoreOS fcc directory to butane 

* Align both Fedora CoreOS and Flatcar Linux keeping Butane
Configs in a directory called butane
This commit is contained in:
Dalton Hubble 2022-08-10 09:10:18 -07:00
parent 679f8b878f
commit e5d0e2d48b
18 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
aws/fedora-coreos/kubernetes/fcc/controller.yaml → aws/fedora-coreos/kubernetes/butane/controller.yaml
View File

2
aws/fedora-coreos/kubernetes/controllers.tf
View File

@ -49,7 +49,7 @@ resource "aws_instance" "controllers" {
# Fedora CoreOS controllers # Fedora CoreOS controllers
data "ct_config" "controllers" { data "ct_config" "controllers" {
count = var.controller_count 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 # Cannot use cyclic dependencies on controllers or their DNS records
etcd_name = "etcd${count.index}" etcd_name = "etcd${count.index}"
etcd_domain = "${var.cluster_name}-etcd${count.index}.${var.dns_zone}" etcd_domain = "${var.cluster_name}-etcd${count.index}.${var.dns_zone}"

0
aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml → aws/fedora-coreos/kubernetes/workers/butane/worker.yaml
View File

2
aws/fedora-coreos/kubernetes/workers/workers.tf
View File

@ -70,7 +70,7 @@ resource "aws_launch_configuration" "worker" {
# Fedora CoreOS worker # Fedora CoreOS worker
data "ct_config" "worker" { data "ct_config" "worker" {
content = templatefile("${path.module}/fcc/worker.yaml", { content = templatefile("${path.module}/butane/worker.yaml", {
kubeconfig = indent(10, var.kubeconfig) kubeconfig = indent(10, var.kubeconfig)
ssh_authorized_key = var.ssh_authorized_key ssh_authorized_key = var.ssh_authorized_key
cluster_dns_service_ip = cidrhost(var.service_cidr, 10) cluster_dns_service_ip = cidrhost(var.service_cidr, 10)

0
azure/fedora-coreos/kubernetes/fcc/controller.yaml → azure/fedora-coreos/kubernetes/butane/controller.yaml
View File

2
azure/fedora-coreos/kubernetes/controllers.tf
View File

@ -114,7 +114,7 @@ resource "azurerm_network_interface_backend_address_pool_association" "controlle
# Fedora CoreOS controllers # Fedora CoreOS controllers
data "ct_config" "controllers" { data "ct_config" "controllers" {
count = var.controller_count 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 # Cannot use cyclic dependencies on controllers or their DNS records
etcd_name = "etcd${count.index}" etcd_name = "etcd${count.index}"
etcd_domain = "${var.cluster_name}-etcd${count.index}.${var.dns_zone}" etcd_domain = "${var.cluster_name}-etcd${count.index}.${var.dns_zone}"

0
azure/fedora-coreos/kubernetes/workers/fcc/worker.yaml → azure/fedora-coreos/kubernetes/workers/butane/worker.yaml
View File

2
azure/fedora-coreos/kubernetes/workers/workers.tf
View File

@ -72,7 +72,7 @@ resource "azurerm_monitor_autoscale_setting" "workers" {
# Fedora CoreOS worker # Fedora CoreOS worker
data "ct_config" "worker" { data "ct_config" "worker" {
content = templatefile("${path.module}/fcc/worker.yaml", { content = templatefile("${path.module}/butane/worker.yaml", {
kubeconfig = indent(10, var.kubeconfig) kubeconfig = indent(10, var.kubeconfig)
ssh_authorized_key = var.ssh_authorized_key ssh_authorized_key = var.ssh_authorized_key
cluster_dns_service_ip = cidrhost(var.service_cidr, 10) cluster_dns_service_ip = cidrhost(var.service_cidr, 10)

0
bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml → bare-metal/fedora-coreos/kubernetes/butane/controller.yaml
View File

0
bare-metal/fedora-coreos/kubernetes/fcc/worker.yaml → bare-metal/fedora-coreos/kubernetes/butane/worker.yaml
View File

4
bare-metal/fedora-coreos/kubernetes/profiles.tf
View File

@ -44,7 +44,7 @@ resource "matchbox_profile" "controllers" {
# Fedora CoreOS controllers # Fedora CoreOS controllers
data "ct_config" "controllers" { data "ct_config" "controllers" {
count = length(var.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] domain_name = var.controllers.*.domain[count.index]
etcd_name = var.controllers.*.name[count.index] etcd_name = var.controllers.*.name[count.index]
etcd_initial_cluster = join(",", formatlist("%s=https://%s:2380", var.controllers.*.name, var.controllers.*.domain)) 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 # Fedora CoreOS workers
data "ct_config" "workers" { data "ct_config" "workers" {
count = length(var.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] domain_name = var.workers.*.domain[count.index]
cluster_dns_service_ip = module.bootstrap.cluster_dns_service_ip cluster_dns_service_ip = module.bootstrap.cluster_dns_service_ip
cluster_domain_suffix = var.cluster_domain_suffix cluster_domain_suffix = var.cluster_domain_suffix

0
digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml → digital-ocean/fedora-coreos/kubernetes/butane/controller.yaml
View File

0
digital-ocean/fedora-coreos/kubernetes/fcc/worker.yaml → digital-ocean/fedora-coreos/kubernetes/butane/worker.yaml
View File

2
digital-ocean/fedora-coreos/kubernetes/controllers.tf
View File

@ -65,7 +65,7 @@ resource "digitalocean_tag" "controllers" {
# Fedora CoreOS controllers # Fedora CoreOS controllers
data "ct_config" "controllers" { data "ct_config" "controllers" {
count = var.controller_count 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 # Cannot use cyclic dependencies on controllers or their DNS records
etcd_name = "etcd${count.index}" etcd_name = "etcd${count.index}"
etcd_domain = "${var.cluster_name}-etcd${count.index}.${var.dns_zone}" etcd_domain = "${var.cluster_name}-etcd${count.index}.${var.dns_zone}"

2
digital-ocean/fedora-coreos/kubernetes/workers.tf
View File

@ -60,7 +60,7 @@ resource "digitalocean_tag" "workers" {
# Fedora CoreOS worker # Fedora CoreOS worker
data "ct_config" "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_dns_service_ip = cidrhost(var.service_cidr, 10)
cluster_domain_suffix = var.cluster_domain_suffix cluster_domain_suffix = var.cluster_domain_suffix
}) })

0
google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml → google-cloud/fedora-coreos/kubernetes/butane/controller.yaml
View File

2
google-cloud/fedora-coreos/kubernetes/controllers.tf
View File

@ -69,7 +69,7 @@ resource "google_compute_instance" "controllers" {
# Fedora CoreOS controllers # Fedora CoreOS controllers
data "ct_config" "controllers" { data "ct_config" "controllers" {
count = var.controller_count 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 # Cannot use cyclic dependencies on controllers or their DNS records
etcd_name = "etcd${count.index}" etcd_name = "etcd${count.index}"
etcd_domain = "${var.cluster_name}-etcd${count.index}.${var.dns_zone}" etcd_domain = "${var.cluster_name}-etcd${count.index}.${var.dns_zone}"

2
google-cloud/fedora-coreos/kubernetes/workers/workers.tf
View File

@ -74,7 +74,7 @@ resource "google_compute_instance_template" "worker" {
# Fedora CoreOS worker # Fedora CoreOS worker
data "ct_config" "worker" { data "ct_config" "worker" {
content = templatefile("${path.module}/fcc/worker.yaml", { content = templatefile("${path.module}/butane/worker.yaml", {
kubeconfig = indent(10, var.kubeconfig) kubeconfig = indent(10, var.kubeconfig)
ssh_authorized_key = var.ssh_authorized_key ssh_authorized_key = var.ssh_authorized_key
cluster_dns_service_ip = cidrhost(var.service_cidr, 10) cluster_dns_service_ip = cidrhost(var.service_cidr, 10)