diff --git a/.gitignore b/.gitignore index bc6a753..3f95d93 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/afterburn-5.3.0-vendor.tar.gz -SOURCES/afterburn-5.3.0.crate +SOURCES/afterburn-5.4.1-vendor.tar.gz +SOURCES/afterburn-5.4.1.crate diff --git a/.rust-afterburn.metadata b/.rust-afterburn.metadata index 7b9b15d..099407b 100644 --- a/.rust-afterburn.metadata +++ b/.rust-afterburn.metadata @@ -1,2 +1,2 @@ -73a080dc846d959ef70f2a01e0c997f00cf5bb65 SOURCES/afterburn-5.3.0-vendor.tar.gz -29bf83b6e4b7f53b1e20480a97dc54bb9d7cf8d3 SOURCES/afterburn-5.3.0.crate +55e6b9fbffca79e2e0011a480215b90a40ec946c SOURCES/afterburn-5.4.1-vendor.tar.gz +115df2e902efcdda7f2cb85aa04a1bda978be7f0 SOURCES/afterburn-5.4.1.crate diff --git a/SOURCES/legacy-providers.patch b/SOURCES/legacy-providers.patch new file mode 100644 index 0000000..a93cd28 --- /dev/null +++ b/SOURCES/legacy-providers.patch @@ -0,0 +1,20 @@ +diff --git a/src/metadata.rs b/src/metadata.rs +index ececef15e11e..36f556789159 100644 +--- a/src/metadata.rs ++++ b/src/metadata.rs +@@ -49,6 +49,7 @@ pub fn fetch_metadata(provider: &str) -> Result 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()?), +@@ -56,6 +57,7 @@ pub fn fetch_metadata(provider: &str) -> Result box_result!(DigitalOceanProvider::try_new()?), + "exoscale" => box_result!(ExoscaleProvider::try_new()?), + "gcp" => box_result!(GcpProvider::try_new()?), ++ "gce" => box_result!(GcpProvider::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 b131e0c..ef700f7 100644 --- a/SPECS/rust-afterburn.spec +++ b/SPECS/rust-afterburn.spec @@ -7,15 +7,18 @@ %global crate afterburn Name: rust-%{crate} -Version: 5.3.0 +Version: 5.4.1 Release: 1%{?dist} -Summary: Simple cloud provider agent +Summary: Simple cloud provider agent (RHEL CoreOS only) # Upstream license specification: Apache-2.0 License: ASL 2.0 URL: https://crates.io/crates/afterburn Source0: %{crates_source} Source1: https://github.com/coreos/%{crate}/releases/download/v%{version}/%{crate}-%{version}-vendor.tar.gz +# 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 ExclusiveArch: %{rust_arches} %if 0%{?rhel} && !0%{?eln} @@ -31,7 +34,12 @@ BuildRequires: rust-packaging BuildRequires: systemd %global _description %{expand: -Simple cloud provider agent.} +This software is currently only supported on RHEL CoreOS. + +Afterburn is a one-shot agent for cloud-like platforms which interacts with +provider-specific metadata endpoints. It is typically used in conjunction +with Ignition. +} %description %{_description} @@ -139,6 +147,14 @@ cp -a dracut/* %{buildroot}%{dracutmodulesdir} %endif %changelog +* 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) + +* Mon Jan 9 2023 Steven Presti - 5.3.0-2 +- Update description and summary to indicate this package is + only supported on RHEL CoreOS. + * Mon May 2 2022 Sohan Kunkerkar - 5.3.0-1 - Update to 5.3.0