spec: new upstream version 5.6.0
resolves: #RHEL-44826
This commit is contained in:
parent
c158f4fe08
commit
86d3cc62e0
2
.gitignore
vendored
2
.gitignore
vendored
@ -23,3 +23,5 @@
|
|||||||
/afterburn-5.4.3-vendor.tar.gz
|
/afterburn-5.4.3-vendor.tar.gz
|
||||||
/afterburn-5.5.1.crate
|
/afterburn-5.5.1.crate
|
||||||
/afterburn-5.5.1-vendor.tar.gz
|
/afterburn-5.5.1-vendor.tar.gz
|
||||||
|
/afterburn-5.6.0.crate
|
||||||
|
/afterburn-5.6.0-vendor.tar.gz
|
||||||
|
@ -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
|
|
||||||
|
|
@ -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
|
diff --git a/src/metadata.rs b/src/metadata.rs
|
||||||
index f27dc7e..4562459 100644
|
index b89bf5b..e5021f7 100644
|
||||||
--- a/src/metadata.rs
|
--- a/src/metadata.rs
|
||||||
+++ b/src/metadata.rs
|
+++ b/src/metadata.rs
|
||||||
@@ -51,6 +51,7 @@ pub fn fetch_metadata(provider: &str) -> Result<Box<dyn providers::MetadataProvi
|
@@ -53,6 +53,7 @@ pub fn fetch_metadata(provider: &str) -> Result<Box<dyn providers::MetadataProvi
|
||||||
match provider {
|
"akamai" => box_result!(AkamaiProvider::try_new()?),
|
||||||
"aliyun" => box_result!(AliyunProvider::try_new()?),
|
"aliyun" => box_result!(AliyunProvider::try_new()?),
|
||||||
"aws" => box_result!(AwsProvider::try_new()?),
|
"aws" => box_result!(AwsProvider::try_new()?),
|
||||||
+ "ec2" => box_result!(AwsProvider::try_new()?),
|
+ "ec2" => box_result!(AwsProvider::try_new()?),
|
||||||
"azure" => box_result!(Azure::try_new()?),
|
"azure" => box_result!(Azure::try_new()?),
|
||||||
"azurestack" => box_result!(AzureStack::try_new()?),
|
"azurestack" => box_result!(AzureStack::try_new()?),
|
||||||
"cloudstack-metadata" => box_result!(CloudstackNetwork::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()?),
|
"digitalocean" => box_result!(DigitalOceanProvider::try_new()?),
|
||||||
"exoscale" => box_result!(ExoscaleProvider::try_new()?),
|
"exoscale" => box_result!(ExoscaleProvider::try_new()?),
|
||||||
"gcp" => box_result!(GcpProvider::try_new()?),
|
"gcp" => box_result!(GcpProvider::try_new()?),
|
||||||
@ -18,3 +27,6 @@ index f27dc7e..4562459 100644
|
|||||||
"hetzner" => box_result!(HetznerProvider::try_new()?),
|
"hetzner" => box_result!(HetznerProvider::try_new()?),
|
||||||
// IBM Cloud - VPC Generation 2.
|
// IBM Cloud - VPC Generation 2.
|
||||||
"ibmcloud" => box_result!(IBMGen2Provider::try_new()?),
|
"ibmcloud" => box_result!(IBMGen2Provider::try_new()?),
|
||||||
|
--
|
||||||
|
2.43.2
|
||||||
|
|
||||||
|
@ -7,8 +7,8 @@
|
|||||||
%global crate afterburn
|
%global crate afterburn
|
||||||
|
|
||||||
Name: rust-%{crate}
|
Name: rust-%{crate}
|
||||||
Version: 5.5.1
|
Version: 5.6.0
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Simple cloud provider agent (RHEL CoreOS only)
|
Summary: Simple cloud provider agent (RHEL CoreOS only)
|
||||||
|
|
||||||
# Upstream license specification: Apache-2.0
|
# 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
|
# 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
|
# from OCP 4.1 and 4.2 bootimages still call them by those names
|
||||||
Patch0: legacy-providers.patch
|
Patch0: legacy-providers.patch
|
||||||
Patch1: gcp-hostname.patch
|
|
||||||
|
|
||||||
ExclusiveArch: %{rust_arches}
|
ExclusiveArch: %{rust_arches}
|
||||||
%if 0%{?rhel} && !0%{?eln}
|
%if 0%{?rhel} && !0%{?eln}
|
||||||
@ -105,14 +104,7 @@ to run in the initramfs on boot.
|
|||||||
%autosetup -n %{crate}-%{version_no_tilde} -p1
|
%autosetup -n %{crate}-%{version_no_tilde} -p1
|
||||||
%if 0%{?rhel} && !0%{?eln}
|
%if 0%{?rhel} && !0%{?eln}
|
||||||
tar xvf %{SOURCE1}
|
tar xvf %{SOURCE1}
|
||||||
mkdir -p .cargo
|
%cargo_prep -v vendor
|
||||||
cat >.cargo/config << EOF
|
|
||||||
[source.crates-io]
|
|
||||||
replace-with = "vendored-sources"
|
|
||||||
|
|
||||||
[source.vendored-sources]
|
|
||||||
directory = "vendor"
|
|
||||||
EOF
|
|
||||||
%else
|
%else
|
||||||
%cargo_prep
|
%cargo_prep
|
||||||
%endif
|
%endif
|
||||||
@ -148,6 +140,9 @@ cp -a dracut/* %{buildroot}%{dracutmodulesdir}
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%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
|
* Thu Feb 1 2024 Michael Nguyen <mnguyen@redhat.com> - 5.5.1-2
|
||||||
- Add gcp-hostname.patch
|
- Add gcp-hostname.patch
|
||||||
|
|
||||||
|
4
sources
4
sources
@ -1,2 +1,2 @@
|
|||||||
SHA512 (afterburn-5.5.1.crate) = f937aafccbdfc49486b184fba2d99115407b90bf5ca54cf0d5de228a96f97a4e700f2fb96c7c0dc325d0989e99bd6d771d798ffec13172bde51b0115290bb3cc
|
SHA512 (afterburn-5.6.0.crate) = 0f8da2668962b19f24c508a49e3e9a3273c04a6c8b05cfde0637fb9c825afc939a8afae5e68b18e999a2f106c460af30d20c0713801ea9e86a477bdb4ff535b9
|
||||||
SHA512 (afterburn-5.5.1-vendor.tar.gz) = d58006184740e0f4b9a4321d4fd7dadc9ca683d440526cd3b689a914832f4a60b05a989b59291189d8f14158f807e34a9e3c6329ee7240faf44749a4745c675d
|
SHA512 (afterburn-5.6.0-vendor.tar.gz) = fc505dd2f91a9b611b9a2b16ec5b683e3ed44e81673697a510ebdc056a96f609ea9877ef814ae5965786affa302cfab81970e7c5b8ca05981a3b55a48ca06417
|
||||||
|
Loading…
Reference in New Issue
Block a user