Sync from SUSE:SLFO:Main google-guest-configs revision 22bbe03bde9c9cb2bfa95f279d3d9907

This commit is contained in:
Adrian Schröter 2025-01-13 12:15:35 +01:00
parent 0f63695e25
commit f725e8671f
5 changed files with 142 additions and 5 deletions

View File

@ -0,0 +1,14 @@
--- src/usr/bin/google_set_hostname.orig
+++ src/usr/bin/google_set_hostname
@@ -53,7 +53,10 @@ if [ -n "$new_host_name" ] && [ -n "$new
fi
# Add an entry for reaching the metadata server in /etc/hosts.
- echo "169.254.169.254 metadata.google.internal # Added by Google" >> /etc/hosts
+ has_metadata_entry=$(egrep '^169\.254\.169\.254' /etc/hosts)
+ if [ -z "$has_metadata_entry" ]; then
+ echo "169.254.169.254 metadata.google.internal # Added by Google" >> /etc/hosts
+ fi
fi
# /sbin/dhclient-scripts in both ubuntu and centos have some problems for us:

BIN
google-guest-configs-20231214.00.tar.gz (Stored with Git LFS)

Binary file not shown.

BIN
google-guest-configs-20241205.00.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,3 +1,110 @@
-------------------------------------------------------------------
Mon Dec 30 14:47:09 UTC 2024 - Robert Schweikert <rjschwei@suse.com>
- Add ggc-no-dup-metasrv-entry.patch
+ Follow up to (bsc#1234289, bsc#1234293). Avoid duplicate entries for
the metadata server in /etc/hosts
-------------------------------------------------------------------
Thu Dec 12 14:55:24 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to version 20241205.00 (bsc#1234254, bsc#1234255)
* Update google_set_multiqueue to configure
vCPU ranges based on VM platform (#90)
- from version 20241204.00
* Restore google_set_multiqueue changes for A3Ultra (#93)
* Depend on networkd-dispatcher in Ubuntu (#94)
- Include components to set hostname and /etc/hosts entries (bsc#1234289, bsc#1234293)
* Add sysconfig and sysconfig-network to BuildRequires
* Install google_set_hostname into %{_bindir}
* Install google_up.sh into %{_sysconfdir}/sysconfig/network/scripts/
* Add code to add and remove POST_UP_SCRIPT="compat:suse:google_up.sh"
to /etc/sysconfig/network/ifcfg-eth0 in %post and %postun sections
-------------------------------------------------------------------
Tue Dec 3 13:05:43 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to version 20241121.00 (bsc#1233625, bsc#1233626)
* Temporarily revert google_set_multiqueue changes for release (#92)
- from version 20241115.00
* Remove IDPF devices from renaming rules (#91)
- from version 20241112.00
* Revert "Revert 3 commits:" (#89)
- from version 20241108.00
* Revert 3 commits: (#87)
- from version 20241107.00
* gce-nic-naming: Exit 1 so that udev ignores the rule on error (#86)
- from version 20241106.00
* Remove Apt IPv4 only config for Debian and Ubuntu (#85)
- from version 20241031.00
* Add GCE intent based NIC naming tools (#84)
- from version 20241025.00
* Update google_set_multiqueue to skip set_irq
if NIC is not a gvnic device (#83)
- Add new binary gce-nic-naming to %{_bindir} in %files section
-------------------------------------------------------------------
Tue Oct 22 06:46:40 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to version 20241021.00 (bsc#1231775, bsc#1231776)
* Add GCE-specific config for systemd-resolved (#82)
- from version 20241015.00
* Update google_set_multiqueue to enable on A3Ultra family (#79)
- from version 20241013.00
* Update OWNERS (#81)
- from version 20241010.00
* Depend on jq in enterprise linux (#80)
- from version 20241008.00
* Always use IP from primary NIC in the
networkd-dispatcher routable hook (#78)
-------------------------------------------------------------------
Mon Sep 30 11:14:31 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to version 20240925.00
* Call google_set_hostname on openSUSE and when the agent
is configured to manage hostname and FQDN, let it (#75)
- from version 20240924.00
* Include systemd-networkd hook in Ubuntu packaging (#77)
- from version 20240905.00
* Update packaging as of Ubuntu devel packaging (#65)
- from version 20240830.00
* Fix the name for A3 Edge VMs (#76)
-------------------------------------------------------------------
Mon Aug 5 10:33:39 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to version 20240725.00
* Fix: hostnamectl command (#74)
-------------------------------------------------------------------
Fri Jun 14 09:55:48 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to version 20240607.00
* Update is_a3_platform to include A3-edge shape (#73)
-------------------------------------------------------------------
Thu May 16 12:23:40 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to version 20240514.00
* Add systemd-networkd hostname hook (#71)
- from version 20240501.00
* Add hostname hook for NetworkManager without
dhclient compat script (#70)
-------------------------------------------------------------------
Fri Mar 22 13:26:48 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to version 20240307.00 (bsc#1221146, bsc#1221900, bsc#1221901)
* Support dot in NVMe device ids (#68)
- from version 20240304.00
* google_set_hostname: Extract rsyslog service name
with a regexp for valid systemd unit names (#67)
- from version 20240228.00
* Remove quintonamore from OWNERS (#64)
- from version 20240119.00
* Setup smp affinity for IRQs and XPS on A3+ VMs (#63)
-------------------------------------------------------------------
Thu Jan 4 11:55:25 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>

View File

@ -23,13 +23,17 @@
%define _udevdir %(pkg-config --variable udev_dir udev)
%endif
Name: google-guest-configs
Version: 20231214.00
Version: 20241205.00
Release: 0
Summary: Google Cloud Guest Configs
License: Apache-2.0
Group: System/Daemons
URL: https://github.com/GoogleCloudPlatform/guest-configs
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
# FIXME (https://github.com/GoogleCloudPlatform/guest-configs/pull/96)
Patch1: ggc-no-dup-metasrv-entry.patch
BuildRequires: sysconfig
BuildRequires: sysconfig-netconfig
BuildRequires: systemd-rpm-macros
%if 0%{?suse_version} && 0%{?suse_version} <= 1315
BuildRequires: pkg-config
@ -43,6 +47,7 @@ Google Cloud Guest Configs
%prep
%setup -q -n guest-configs-%{version}
%patch -P 1
%build
# Nothing to build
@ -52,6 +57,8 @@ mkdir -p %{buildroot}%{_modprobedir}
cp -av src/etc/modprobe.d/* %{buildroot}%{_modprobedir}
mkdir -p %{buildroot}%{_sysconfdir}/rsyslog.d
cp -av src/etc/rsyslog.d/* %{buildroot}%{_sysconfdir}/rsyslog.d/
mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/network/scripts
cp -av src/etc/sysconfig/network/scripts/google_up.sh %{buildroot}%{_sysconfdir}/sysconfig/network/scripts/
mkdir -p %{buildroot}%{_sysctldir}
cp -av src/etc/sysctl.d/* %{buildroot}%{_sysctldir}
mkdir -p %{buildroot}%{_udevrulesdir}
@ -60,19 +67,28 @@ cp -av src/lib/udev/google_nvme_id %{buildroot}/%{_udevdir}/
mkdir -p %{buildroot}%{_bindir}
cp -av src/usr/bin/* %{buildroot}%{_bindir}/
%post
grep 'POST_UP_SCRIPT="compat:suse:google_up.sh"' %{_sysconfdir}/sysconfig/network/ifcfg-eth0 >/dev/null \
|| echo 'POST_UP_SCRIPT="compat:suse:google_up.sh"' >> %{_sysconfdir}/sysconfig/network/ifcfg-eth0
%postun
sed -i '/POST_UP_SCRIPT="compat:suse:google_up.sh"/d' %{_sysconfdir}/sysconfig/network/ifcfg-eth0
%files
%defattr(0644,root,root,0755)
%doc README.md
%license LICENSE
%attr(0755,root,root) %{_bindir}/google_optimize_local_ssd
%exclude %attr(0755,root,root) %{_bindir}/google_set_hostname
%attr(0755,root,root) %{_bindir}/google_set_hostname
%attr(0755,root,root) %{_bindir}/google_set_multiqueue
%if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150300
%dir %{_modprobedir}
%endif
%attr(0755, root, root) %{_bindir}/gce-nic-naming
%dir %{_sysconfdir}/rsyslog.d
%{_modprobedir}/gce-blacklist.conf
%config %{_sysconfdir}/rsyslog.d/*
%config %{_sysconfdir}/sysconfig/network/scripts/*
%{_sysctldir}/*
%attr(0755,root,root) %{_udevdir}/google_nvme_id
%{_udevrulesdir}/*