Import from AlmaLinux stable repository

This commit is contained in:
eabdullin 2024-05-15 08:53:59 +00:00
parent ad35430c9e
commit 3d63faa4cc
5 changed files with 48 additions and 10 deletions

4
.gitignore vendored
View File

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

View File

@ -1,2 +1,2 @@
55e6b9fbffca79e2e0011a480215b90a40ec946c SOURCES/afterburn-5.4.1-vendor.tar.gz e70241437c228d9b030a59933502b7355e96e723 SOURCES/afterburn-5.5.1-vendor.tar.gz
115df2e902efcdda7f2cb85aa04a1bda978be7f0 SOURCES/afterburn-5.4.1.crate dbef61cf7e7e4d51b5b0f8acfffcecb0f295caea SOURCES/afterburn-5.5.1.crate

View File

@ -0,0 +1,27 @@
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

View File

@ -1,8 +1,8 @@
diff --git a/src/metadata.rs b/src/metadata.rs diff --git a/src/metadata.rs b/src/metadata.rs
index ececef15e11e..36f556789159 100644 index f27dc7e..4562459 100644
--- a/src/metadata.rs --- a/src/metadata.rs
+++ b/src/metadata.rs +++ b/src/metadata.rs
@@ -49,6 +49,7 @@ pub fn fetch_metadata(provider: &str) -> Result<Box<dyn providers::MetadataProvi @@ -51,6 +51,7 @@ pub fn fetch_metadata(provider: &str) -> Result<Box<dyn providers::MetadataProvi
match provider { match provider {
"aliyun" => box_result!(AliyunProvider::try_new()?), "aliyun" => box_result!(AliyunProvider::try_new()?),
"aws" => box_result!(AwsProvider::try_new()?), "aws" => box_result!(AwsProvider::try_new()?),
@ -10,11 +10,11 @@ index ececef15e11e..36f556789159 100644
"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()?),
@@ -56,6 +57,7 @@ pub fn fetch_metadata(provider: &str) -> Result<Box<dyn providers::MetadataProvi @@ -58,6 +59,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()?),
+ "gce" => box_result!(GcpProvider::try_new()?), + "gce" => box_result!(GcpProvider::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()?),
// IBM Cloud - Classic infrastructure.

View File

@ -7,8 +7,8 @@
%global crate afterburn %global crate afterburn
Name: rust-%{crate} Name: rust-%{crate}
Version: 5.4.1 Version: 5.5.1
Release: 1%{?dist} Release: 2%{?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,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 # 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}
@ -147,6 +148,16 @@ cp -a dracut/* %{buildroot}%{dracutmodulesdir}
%endif %endif
%changelog %changelog
* Thu Feb 1 2024 Michael Nguyen <mnguyen@redhat.com> - 5.5.1-2
- Add gcp-hostname.patch
* Tue Jan 23 2024 Michael Nguyen <mnguyen@redhat.com> - 5.5.1-1
- New release
- Update legacy-providers patch to work with new release source
* Thu Jun 08 2023 Steven Presti <spresti@redhat.com> - 5.4.3-1
- New release
* Mon Feb 06 2023 Benjamin Gilbert <bgilbert@redhat.com> - 5.4.1-1 * Mon Feb 06 2023 Benjamin Gilbert <bgilbert@redhat.com> - 5.4.1-1
- New release - New release
- Re-add support for "ec2" and "gce" providers (removed in 5.0.0) - Re-add support for "ec2" and "gce" providers (removed in 5.0.0)