diff --git a/.gitignore b/.gitignore index 3f95d93..e4241e1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/afterburn-5.4.1-vendor.tar.gz -SOURCES/afterburn-5.4.1.crate +SOURCES/afterburn-5.5.1-vendor.tar.gz +SOURCES/afterburn-5.5.1.crate diff --git a/.rust-afterburn.metadata b/.rust-afterburn.metadata index 099407b..0a5c4d5 100644 --- a/.rust-afterburn.metadata +++ b/.rust-afterburn.metadata @@ -1,2 +1,2 @@ -55e6b9fbffca79e2e0011a480215b90a40ec946c SOURCES/afterburn-5.4.1-vendor.tar.gz -115df2e902efcdda7f2cb85aa04a1bda978be7f0 SOURCES/afterburn-5.4.1.crate +e70241437c228d9b030a59933502b7355e96e723 SOURCES/afterburn-5.5.1-vendor.tar.gz +dbef61cf7e7e4d51b5b0f8acfffcecb0f295caea SOURCES/afterburn-5.5.1.crate diff --git a/SOURCES/gcp-hostname.patch b/SOURCES/gcp-hostname.patch new file mode 100644 index 0000000..f8bfcf1 --- /dev/null +++ b/SOURCES/gcp-hostname.patch @@ -0,0 +1,27 @@ +From d613c69d4b133b0287c5205118a2df992c3962a0 Mon Sep 17 00:00:00 2001 +From: Michael Nguyen +Date: Thu, 1 Feb 2024 17:20:24 -0500 +Subject: [PATCH] Turn on Afterburn hostname support for GCP + +On GCP the DHCP server send the FQDN as the shortname in DHCP. +So when the code that truncates the hostname in the kubelet runs, +NM gets ornery that it didn't change the hostname and flips it back to the long name +--- + dracut/30afterburn/afterburn-hostname.service | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/dracut/30afterburn/afterburn-hostname.service b/dracut/30afterburn/afterburn-hostname.service +index 485cd82..8c55a9a 100644 +--- a/dracut/30afterburn/afterburn-hostname.service ++++ b/dracut/30afterburn/afterburn-hostname.service +@@ -9,6 +9,7 @@ ConditionKernelCommandLine=|ignition.platform.id=azure + ConditionKernelCommandLine=|ignition.platform.id=azurestack + ConditionKernelCommandLine=|ignition.platform.id=digitalocean + ConditionKernelCommandLine=|ignition.platform.id=exoscale ++ConditionKernelCommandLine=|ignition.platform.id=gcp + ConditionKernelCommandLine=|ignition.platform.id=hetzner + ConditionKernelCommandLine=|ignition.platform.id=ibmcloud + ConditionKernelCommandLine=|ignition.platform.id=kubevirt +-- +2.43.0 + diff --git a/SOURCES/legacy-providers.patch b/SOURCES/legacy-providers.patch index a93cd28..fb9a752 100644 --- a/SOURCES/legacy-providers.patch +++ b/SOURCES/legacy-providers.patch @@ -1,8 +1,8 @@ diff --git a/src/metadata.rs b/src/metadata.rs -index ececef15e11e..36f556789159 100644 +index f27dc7e..4562459 100644 --- a/src/metadata.rs +++ b/src/metadata.rs -@@ -49,6 +49,7 @@ pub fn fetch_metadata(provider: &str) -> Result Result box_result!(AliyunProvider::try_new()?), "aws" => box_result!(AwsProvider::try_new()?), @@ -10,11 +10,11 @@ index ececef15e11e..36f556789159 100644 "azure" => box_result!(Azure::try_new()?), "azurestack" => box_result!(AzureStack::try_new()?), "cloudstack-metadata" => box_result!(CloudstackNetwork::try_new()?), -@@ -56,6 +57,7 @@ pub fn fetch_metadata(provider: &str) -> Result Result box_result!(DigitalOceanProvider::try_new()?), "exoscale" => box_result!(ExoscaleProvider::try_new()?), "gcp" => box_result!(GcpProvider::try_new()?), + "gce" => box_result!(GcpProvider::try_new()?), + "hetzner" => box_result!(HetznerProvider::try_new()?), // IBM Cloud - VPC Generation 2. "ibmcloud" => box_result!(IBMGen2Provider::try_new()?), - // IBM Cloud - Classic infrastructure. diff --git a/SPECS/rust-afterburn.spec b/SPECS/rust-afterburn.spec index ef700f7..98f9c55 100644 --- a/SPECS/rust-afterburn.spec +++ b/SPECS/rust-afterburn.spec @@ -7,8 +7,8 @@ %global crate afterburn Name: rust-%{crate} -Version: 5.4.1 -Release: 1%{?dist} +Version: 5.5.1 +Release: 2%{?dist} Summary: Simple cloud provider agent (RHEL CoreOS only) # Upstream license specification: Apache-2.0 @@ -19,6 +19,7 @@ Source1: https://github.com/coreos/%{crate}/releases/download/v%{version} # Re-add support for "ec2" and "gce" providers, since RHCOS nodes installed # from OCP 4.1 and 4.2 bootimages still call them by those names Patch0: legacy-providers.patch +Patch1: gcp-hostname.patch ExclusiveArch: %{rust_arches} %if 0%{?rhel} && !0%{?eln} @@ -147,6 +148,16 @@ cp -a dracut/* %{buildroot}%{dracutmodulesdir} %endif %changelog +* Thu Feb 1 2024 Michael Nguyen - 5.5.1-2 +- Add gcp-hostname.patch + +* Tue Jan 23 2024 Michael Nguyen - 5.5.1-1 +- New release +- Update legacy-providers patch to work with new release source + +* Thu Jun 08 2023 Steven Presti - 5.4.3-1 +- New release + * Mon Feb 06 2023 Benjamin Gilbert - 5.4.1-1 - New release - Re-add support for "ec2" and "gce" providers (removed in 5.0.0)