diff --git a/.gitignore b/.gitignore index 22652d9..6b2e07e 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ /afterburn-5.2.0-vendor.tar.gz /afterburn-5.3.0.crate /afterburn-5.3.0-vendor.tar.gz +/afterburn-5.4.1.crate +/afterburn-5.4.1-vendor.tar.gz diff --git a/legacy-providers.patch b/legacy-providers.patch new file mode 100644 index 0000000..a93cd28 --- /dev/null +++ b/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/rust-afterburn.spec b/rust-afterburn.spec index 5ff3a2f..ef700f7 100644 --- a/rust-afterburn.spec +++ b/rust-afterburn.spec @@ -7,8 +7,8 @@ %global crate afterburn Name: rust-%{crate} -Version: 5.3.0 -Release: 2%{?dist} +Version: 5.4.1 +Release: 1%{?dist} Summary: Simple cloud provider agent (RHEL CoreOS only) # Upstream license specification: Apache-2.0 @@ -16,6 +16,9 @@ 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} @@ -144,6 +147,10 @@ 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. diff --git a/sources b/sources index 308e58b..04a4d90 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (afterburn-5.3.0.crate) = 1e110cda36d2258cbde27b8cd151b98b99e0877bdf6aa04d8706c139d4acc3d2405670b940cf3b63389213676f5a3b79ad36988e0090b282cf643cd7df050354 -SHA512 (afterburn-5.3.0-vendor.tar.gz) = 3ff99b18240b592f79fcf9226c1d6994d36e5aeabce442fc053d9ac270ab63e93803b2908ad5ed8de84cdda62b839bd884417d4b65aa64a4793caeaa62cb48f7 +SHA512 (afterburn-5.4.1.crate) = 614800bbfd784263fe2ac5c3e20904956d646965d468c8f97d00039eef92898395153099feadb1106b29e21a296ccff6b5513ff1be10a6206c4d50c127d7ea9f +SHA512 (afterburn-5.4.1-vendor.tar.gz) = 84a4a7fd480cb36105609a3f4d6984849253ed38c2b2f08f8c44498fba8ebc7e3e8cac9b3b4ff8f1508c5e4bd92831751dba7d8ee81d422ab36054c6e5ecdb87