diff --git a/aws/container-linux/kubernetes/ssh.tf b/aws/container-linux/kubernetes/ssh.tf index 1821e195..1d13aa55 100644 --- a/aws/container-linux/kubernetes/ssh.tf +++ b/aws/container-linux/kubernetes/ssh.tf @@ -1,7 +1,7 @@ # Secure copy assets to controllers. resource "null_resource" "copy-controller-secrets" { count = var.controller_count - + depends_on = [ module.bootstrap, ] @@ -47,7 +47,7 @@ resource "null_resource" "copy-controller-secrets" { content = module.bootstrap.etcd_peer_key destination = "$HOME/etcd-peer.key" } - + provisioner "file" { source = var.asset_dir destination = "$HOME/assets" diff --git a/aws/container-linux/kubernetes/variables.tf b/aws/container-linux/kubernetes/variables.tf index ba9c172c..b0189ce2 100644 --- a/aws/container-linux/kubernetes/variables.tf +++ b/aws/container-linux/kubernetes/variables.tf @@ -126,37 +126,37 @@ variable "pod_cidr" { } variable "service_cidr" { - type = string + type = string description = < coreos flavor, stable channel # flatcar-stable -> flatcar flavor, stable channel - flavor = split("-", var.os_channel)[0] + flavor = split("-", var.os_channel)[0] channel = split("-", var.os_channel)[1] } @@ -34,12 +34,12 @@ data "template_file" "container-linux-install-configs" { template = file("${path.module}/cl/install.yaml.tmpl") vars = { - os_flavor = local.flavor - os_channel = local.channel - os_version = var.os_version - ignition_endpoint = format("%s/ignition", var.matchbox_http_endpoint) - install_disk = var.install_disk - ssh_authorized_key = var.ssh_authorized_key + os_flavor = local.flavor + os_channel = local.channel + os_version = var.os_version + ignition_endpoint = format("%s/ignition", var.matchbox_http_endpoint) + install_disk = var.install_disk + ssh_authorized_key = var.ssh_authorized_key # only cached-container-linux profile adds -b baseurl baseurl_flag = "" } @@ -75,12 +75,12 @@ data "template_file" "cached-container-linux-install-configs" { template = file("${path.module}/cl/install.yaml.tmpl") vars = { - os_flavor = local.flavor - os_channel = local.channel - os_version = var.os_version - ignition_endpoint = format("%s/ignition", var.matchbox_http_endpoint) - install_disk = var.install_disk - ssh_authorized_key = var.ssh_authorized_key + os_flavor = local.flavor + os_channel = local.channel + os_version = var.os_version + ignition_endpoint = format("%s/ignition", var.matchbox_http_endpoint) + install_disk = var.install_disk + ssh_authorized_key = var.ssh_authorized_key # profile uses -b baseurl to install from matchbox cache baseurl_flag = "-b ${var.matchbox_http_endpoint}/assets/${local.flavor}" } @@ -156,7 +156,7 @@ data "template_file" "controller-configs" { 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)) - cgroup_driver = var.os_channel == "flatcar-edge" ? "systemd" : "cgroupfs" + cgroup_driver = var.os_channel == "flatcar-edge" ? "systemd" : "cgroupfs" cluster_dns_service_ip = module.bootstrap.cluster_dns_service_ip cluster_domain_suffix = var.cluster_domain_suffix ssh_authorized_key = var.ssh_authorized_key @@ -184,7 +184,7 @@ data "template_file" "worker-configs" { vars = { domain_name = var.workers.*.domain[count.index] - cgroup_driver = var.os_channel == "flatcar-edge" ? "systemd" : "cgroupfs" + cgroup_driver = var.os_channel == "flatcar-edge" ? "systemd" : "cgroupfs" cluster_dns_service_ip = module.bootstrap.cluster_dns_service_ip cluster_domain_suffix = var.cluster_domain_suffix ssh_authorized_key = var.ssh_authorized_key diff --git a/bare-metal/container-linux/kubernetes/ssh.tf b/bare-metal/container-linux/kubernetes/ssh.tf index 54e59fca..5edea88e 100644 --- a/bare-metal/container-linux/kubernetes/ssh.tf +++ b/bare-metal/container-linux/kubernetes/ssh.tf @@ -57,7 +57,7 @@ resource "null_resource" "copy-controller-secrets" { content = module.bootstrap.etcd_peer_key destination = "$HOME/etcd-peer.key" } - + provisioner "file" { source = var.asset_dir destination = "$HOME/assets" diff --git a/bare-metal/container-linux/kubernetes/variables.tf b/bare-metal/container-linux/kubernetes/variables.tf index 52565857..4ebdbf06 100644 --- a/bare-metal/container-linux/kubernetes/variables.tf +++ b/bare-metal/container-linux/kubernetes/variables.tf @@ -24,8 +24,8 @@ variable "os_version" { variable "controllers" { type = list(object({ - name = string - mac = string + name = string + mac = string domain = string })) description = <