import rust-afterburn-5.6.0-1.el9

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/afterburn-5.5.1-vendor.tar.gz
-SOURCES/afterburn-5.5.1.crate
+SOURCES/afterburn-5.6.0-vendor.tar.gz
+SOURCES/afterburn-5.6.0.crate

.rust-afterburn.metadata

@@ -1,2 +1,2 @@
-e70241437c228d9b030a59933502b7355e96e723 SOURCES/afterburn-5.5.1-vendor.tar.gz
-dbef61cf7e7e4d51b5b0f8acfffcecb0f295caea SOURCES/afterburn-5.5.1.crate
+5676e290f3d19e25a2007ae2825251cb027ea0c1 SOURCES/afterburn-5.6.0-vendor.tar.gz
+ad9a72bd56faac2fa98ba40224463aec110246d8 SOURCES/afterburn-5.6.0.crate

SOURCES/gcp-hostname.patch

@@ -1,27 +0,0 @@
-From d613c69d4b133b0287c5205118a2df992c3962a0 Mon Sep 17 00:00:00 2001
-From: Michael Nguyen <mnguyen@redhat.com>
-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
-

SOURCES/legacy-providers.patch

@@ -1,16 +1,25 @@
+From c3fda955572ae6f6e9101fb15f62dee8d323e508 Mon Sep 17 00:00:00 2001
+From: Steven Presti <spresti@redhat.com>
+Date: Tue, 25 Jun 2024 10:16:14 -0400
+Subject: [PATCH] metadata: add legacy-providers
+
+---
+ src/metadata.rs | 2 ++
+ 1 file changed, 2 insertions(+)
+
 diff --git a/src/metadata.rs b/src/metadata.rs
-index f27dc7e..4562459 100644
+index b89bf5b..e5021f7 100644
 --- a/src/metadata.rs
 +++ b/src/metadata.rs
-@@ -51,6 +51,7 @@ pub fn fetch_metadata(provider: &str) -> Result<Box<dyn providers::MetadataProvi
-     match provider {
+@@ -53,6 +53,7 @@ pub fn fetch_metadata(provider: &str) -> Result<Box<dyn providers::MetadataProvi
+         "akamai" => box_result!(AkamaiProvider::try_new()?),
          "aliyun" => box_result!(AliyunProvider::try_new()?),
          "aws" => box_result!(AwsProvider::try_new()?),
 +        "ec2" => box_result!(AwsProvider::try_new()?),
          "azure" => box_result!(Azure::try_new()?),
          "azurestack" => box_result!(AzureStack::try_new()?),
          "cloudstack-metadata" => box_result!(CloudstackNetwork::try_new()?),
-@@ -58,6 +59,7 @@ pub fn fetch_metadata(provider: &str) -> Result<Box<dyn providers::MetadataProvi
+@@ -60,6 +61,7 @@ pub fn fetch_metadata(provider: &str) -> Result<Box<dyn providers::MetadataProvi
          "digitalocean" => box_result!(DigitalOceanProvider::try_new()?),
          "exoscale" => box_result!(ExoscaleProvider::try_new()?),
          "gcp" => box_result!(GcpProvider::try_new()?),
@@ -18,3 +27,6 @@ index f27dc7e..4562459 100644
          "hetzner" => box_result!(HetznerProvider::try_new()?),
          // IBM Cloud - VPC Generation 2.
          "ibmcloud" => box_result!(IBMGen2Provider::try_new()?),
+-- 
+2.43.2
+

SPECS/rust-afterburn.spec

@@ -7,8 +7,8 @@
 %global crate afterburn
 
 Name:           rust-%{crate}
-Version:        5.5.1
-Release:        2%{?dist}
+Version:        5.6.0
+Release:        1%{?dist}
 Summary:        Simple cloud provider agent (RHEL CoreOS only)
 
 # Upstream license specification: Apache-2.0
@@ -19,7 +19,6 @@ 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}
@@ -105,14 +104,7 @@ to run in the initramfs on boot.
 %autosetup -n %{crate}-%{version_no_tilde} -p1
 %if 0%{?rhel} && !0%{?eln}
 tar xvf %{SOURCE1}
-mkdir -p .cargo
-cat >.cargo/config << EOF
-[source.crates-io]
-replace-with = "vendored-sources"
-
-[source.vendored-sources]
-directory = "vendor"
-EOF
+%cargo_prep -v vendor
 %else
 %cargo_prep
 %endif
@@ -148,6 +140,9 @@ cp -a dracut/* %{buildroot}%{dracutmodulesdir}
 %endif
 
 %changelog
+* Tue Jun 25 2024 Steven Presti <spresti@redhat.com> - 5.6.0-1
+- New release
+
 * Thu Feb 1 2024 Michael Nguyen <mnguyen@redhat.com> - 5.5.1-2
 - Add gcp-hostname.patch