diff --git a/CHANGES.md b/CHANGES.md index bc8e8ac9..7defd0f9 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -18,6 +18,7 @@ Notable changes between versions. ### Bare-Metal * Add a `worker` module to allow customizing individual worker nodes ([#1295](https://github.com/poseidon/typhoon/pull/1295)) +* Expose `-o OEM` parameter of `flatcar-install` script ([#1302](https://github.com/poseidon/typhoon/pull/1302)) ### Known Issues diff --git a/bare-metal/flatcar-linux/kubernetes/butane/install.yaml b/bare-metal/flatcar-linux/kubernetes/butane/install.yaml index fcf539a4..f3996e93 100644 --- a/bare-metal/flatcar-linux/kubernetes/butane/install.yaml +++ b/bare-metal/flatcar-linux/kubernetes/butane/install.yaml @@ -35,6 +35,7 @@ storage: -d ${install_disk} \ -C ${os_channel} \ -V ${os_version} \ + -o ${oem_type} \ ${baseurl_flag} \ -i ignition.json udevadm settle diff --git a/bare-metal/flatcar-linux/kubernetes/profiles.tf b/bare-metal/flatcar-linux/kubernetes/profiles.tf index 7b25ceea..6073a469 100644 --- a/bare-metal/flatcar-linux/kubernetes/profiles.tf +++ b/bare-metal/flatcar-linux/kubernetes/profiles.tf @@ -55,6 +55,7 @@ data "ct_config" "install" { mac = concat(var.controllers.*.mac, var.workers.*.mac)[count.index] install_disk = var.install_disk ssh_authorized_key = var.ssh_authorized_key + oem_type = var.oem_type # only cached profile adds -b baseurl baseurl_flag = var.cached_install ? "-b ${var.matchbox_http_endpoint}/assets/flatcar" : "" }) diff --git a/bare-metal/flatcar-linux/kubernetes/variables.tf b/bare-metal/flatcar-linux/kubernetes/variables.tf index 6623c038..2f379887 100644 --- a/bare-metal/flatcar-linux/kubernetes/variables.tf +++ b/bare-metal/flatcar-linux/kubernetes/variables.tf @@ -156,6 +156,17 @@ variable "enable_aggregation" { default = true } +variable "oem_type" { + type = string + description = <