diff --git a/_service b/_service
index da7319a..7bea40c 100644
--- a/_service
+++ b/_service
@@ -3,8 +3,8 @@
https://github.com/GoogleCloudPlatform/guest-agent/
git
.git
- 20231214.00
- 20231214.00
+ 20250116.00
+ 20250116.00
enable
@@ -15,6 +15,6 @@
guest-agent
- guest-agent-20231214.00.tar.gz
+ guest-agent-20250116.00.tar.gz
diff --git a/_servicedata b/_servicedata
index 011cb8f..7cf775c 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
https://github.com/GoogleCloudPlatform/guest-agent/
- b1c6ecf632c2f5ebc20935139a2650202561b324
\ No newline at end of file
+ 4dbdb5da9cb233c43adcea8affd01bf5d291b9bd
\ No newline at end of file
diff --git a/dont_overwrite_ifcfg.patch b/dont_overwrite_ifcfg.patch
deleted file mode 100644
index eb37819..0000000
--- a/dont_overwrite_ifcfg.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Nru guest-agent-20211019.00.orig/google_guest_agent/addresses.go guest-agent-20211019.00/google_guest_agent/addresses.go
---- guest-agent-20211019.00.orig/google_guest_agent/addresses.go 2021-10-20 00:09:13.000000000 +0200
-+++ guest-agent-20211019.00/google_guest_agent/addresses.go 2021-10-22 11:32:04.447560133 +0200
-@@ -558,7 +558,12 @@
- logger.Debugf("write enabling ifcfg-%s config", iface)
-
- var ifcfg *os.File
-- ifcfg, err = os.Create("/etc/sysconfig/network/ifcfg-" + iface)
-+ filename := "/etc/sysconfig/network/ifcfg-" + iface
-+ _, err = os.Stat(filename)
-+ if ! os.IsNotExist(err) {
-+ return nil
-+ }
-+ ifcfg, err = os.Create(filename)
- if err != nil {
- return err
- }
diff --git a/google-guest-agent.changes b/google-guest-agent.changes
index 5ebd165..f461556 100644
--- a/google-guest-agent.changes
+++ b/google-guest-agent.changes
@@ -1,3 +1,341 @@
+-------------------------------------------------------------------
+Wed Feb 05 12:58:23 UTC 2025 - rjschwei@suse.com
+
+- Update to version 20250116.00: (bsc#1236403)
+ * networkd(vlan): remove the interface in addition to config (#468)
+ * Implement support for vlan dynamic removal, update dhclient to remove
+ only if configured (#465)
+ * Update logging library (#479)
+ * Remove Pat from owners file. (#478)
+
+-------------------------------------------------------------------
+Mon Jan 13 19:33:18 UTC 2025 - rjschwei@suse.com
+
+- Update to version 20241209.01: (bsc#1235664)
+ * readme: add notes about plugin manager (#476)
+ * Update metadata script runner to honor cloud logging config flag (#475)
+ * Fixing fallback from systemd-networkd to dhclient (#471)
+ * network: fix nmcli check pattern (#472)
+ * Update readme with guest agent manager (#469)
+ * Add missing packaging spec (#466)
+ * Bring back side-by-side packaging (#464)
+ * Avoid changing permissions of directory if parent is / (#463)
+ * network: force NetworkManager to connect to primary nic (#461)
+ * Revert plugin manager packaging (#460)
+ * Add GOPATH to PATH in debian build (#459)
+ * Add plugin manager to debian build (#457)
+ * rpm packaging: fix plugin manager assumptions (#458)
+ * packaging: add plugin manager to rhel packaging (#454)
+
+-------------------------------------------------------------------
+Tue Oct 22 06:30:47 UTC 2024 - John Paul Adrian Glaubitz
+
+- Update to version 20241018.01 (bsc#1231775, bsc#1231776)
+ * Add support for including agent manager in guest-agent package (#456)
+ * plugin manager: Introduce the systemd service file (#455)
+ * documentation: Update metadata script runner details (#453)
+- from version 20241013.00
+ * Update OWNERS (#452)
+- from version 20241011.01
+ * SUSE no overwrite bug fix, Ubuntu 18.04 exception (#451)
+- from version 20241011.00
+ * Skip MDS setup by default for this release (#450)
+- from version 20241010.01
+ * Revert "network/netplan: Adjust link-local accordingly (#443)" (#448)
+ * Set enable regardless of previous check failed or not (#447)
+- from version 20241009.03
+ * Avoid unnecessary reloads, check before overwriting configs (#446)
+- from version 20241009.02
+ * network/netplan: Do generate instead of apply (#445)
+- from version 20241009.01
+ * Skip SetupInterfaces if configs are already applied (#444)
+ * network/netplan: Adjust link-local accordingly (#443)
+ * Repeated logging could be mistaken for a recurring issue,
+ log mds mtls endpoint error only once (#439)
+ * Retry MDS PUT operation, reload netplan/networkctl
+ only if configs are changed (#438)
+ * Log interface state after setting up network (#437)
+ * network: Debian 12 rollback only if default netplan is ok (#436)
+- from version 20240930.01
+ * Change mtls mds defaults, update log message to assure error is harmless (#434)
+- from version 20240930.00
+ * network: Restore Debian 12 netplan configuration. (#433)
+ * network: Remove primary NIC left over configs. (#432)
+ * Update VLAN interfaces format to match with MDS (#431)
+ * Fix panics in agent when setting up VLAN with netplan (#430)
+ * Add VLAN NIC support for NetworkManager (#429)
+ * Fix debian12 netplan config issue, use ptr receiver (#428)
+ * Update README to reflect new network manager changes (#427)
+ * Introduce a configuration toggle for enabling/disabling cloud logging (#413)
+ * Adapt and update config key to be consistent with MDS (#426)
+ * Allow users to enable/disable the mds mtls via metadata key (#423)
+ * Make primary nic management config consistent across all network managers (#422)
+ * Document disabling account manager on AD (#421)
+ * Update README with MDS MTLS docs (#418)
+ * Avoid writing configuration files when they already exist on wicked and (#410)
+ * Update golang.org/x/net dependencies to catch up on CVEs (#412)
+ * Get rid of deperecated dependencies in snapshot service generate code (#411)
+ * Fix where agent panics on nil event (#409)
+ * Configure primary nic if only set in cfg file (#408)
+ * Update NIC management strategy (#402)
+ * Only release dhclient leases for an interface if the
+ respective dhclient is still running (#407)
+ * Disable OS Login without pruning off any extra suffix. (#400)
+ * Skip root cert rotation if installed once (#405)
+ * Add ipv6 support to guest agent (#404)
+ * Update Accounts documentation (#403)
+ * Update google-startup-scripts.service to enable logging (#399)
+ * Network subsystem remove os rules (#396)
+ * oslogin: Don't remove sshca watcher when oslogin is disabled (#398)
+ * Update dependencies to catch up on CVE fixes (#397)
+ * Network manager netplan implementation (#386)
+ * Update dependencies to catch up on CVE fixes (#391)
+ * Log current available routes on error (#388)
+ * Fix command monitor bugs (#389)
+ * windows account: Ignore "user already belogs to group" error (#387)
+ * Add more error logging in snapshot handling requests, use common retry util (#384)
+ * All non-200 status code from MDS should raise error (#383)
+ * Change metadata key to enable-oslogin-certificates (#382)
+ * Update dhclient pid/lease file directory to abide apparmor rules (#381)
+ * Add COS homedir-gid patch to upstream. (#365)
+ * Add require-oslogin-certificates logic to disable keys (#368)
+ * systemd-networkd: Support Debian 12's version (#372)
+ * Minor update typo in comment (#380)
+ * NetworkManager: Only set secondary interfaces as up (#378)
+ * address manager: Make sure we check for oldMetadata (#375)
+ * network: Early setup network (#374)
+ * NetworkManager: Fix ipv6 and ipv4 mode attribute (#373)
+ * Network Manager: Make sure we clean up ifcfg files (#371)
+ * metadata script runner: Fix script download (#370)
+ * oslogin: Avoid adding extra empty line at the end of /etc/security/group.conf (#369)
+ * Dynamic vlan (#361)
+ * Check for nil response (#366)
+ * Create NetworkManager implementation (#362)
+ * Skip interface manager on Windows (#363)
+ * network: Remove ignore setup (#360)
+ * Create wicked network service implementation and its respective unit (#356)
+ * Update metadata script runner, add tests (#357)
+ * Refactor guest-agent to use common retry util (#355)
+ * Flush logs before exiting #358 (#359)
+ * Create systemd-networkd unit tests. (#354)
+ * Update network manager unit tests (#351)
+ * Implement retry util (#350)
+ * Refactor utils package to not dump everything unrelated into one file (#352)
+ * Set version on metadata script runner (#353)
+ * Implement cleanup of deprecated configuration directives (#348)
+ * Ignore DHCP offered routes only for secondary nics (#347)
+ * Deprecate DHClient in favor of systemd-networkd (#342)
+ * Generate windows and linux licenses (#346)
+ * Remove quintonamore from OWNERS (#345)
+ * Delete integration tests (#343)
+
+-------------------------------------------------------------------
+Wed Aug 28 11:02:37 UTC 2024 - John Paul Adrian Glaubitz
+
+- Update to version 20240816.00
+ * Add configuration toggle to enable/disable use
+ of OS native certificate stores (#419)
+ * Fix dependencies in stable branch #412 (#415)
+ * Update dep: golang.org/x/crypto to v0.17.0
+ * Update dep: google.golang.org/protobuf to 1.33.0
+ * Update dep: golang.org/x/net to 0.17.0
+ * Update dep: google.golang.org/grpc to v1.57.1
+- from version 20240813.00
+ * Update README with MDS MTLS docs (#418)
+- from version 20240808.01
+ * Avoid writing configuration files when they already
+ exist on wicked and NetworkManager (#410)
+- from version 20240808.00
+ * Update golang.org/x/net dependencies
+ to catch up on CVEs (#412)
+- from version 20240805.00
+ * Get rid of deperecated dependencies in
+ snapshot service generate code (#411)
+- Drop dont_overwrite_ifcfg.patch, fixed upstream
+
+-------------------------------------------------------------------
+Mon Aug 5 07:26:29 UTC 2024 - John Paul Adrian Glaubitz
+
+- Update to version 20240802.00
+ * Fix where agent panics on nil event (#409)
+- from version 20240801.00
+ * Configure primary nic if only set in cfg file (#408)
+ * Update NIC management strategy (#402)
+ * Only release dhclient leases for an interface if the respective dhclient is still running (#407)
+ * Disable OS Login without pruning off any extra suffix. (#400)
+ * Skip root cert rotation if installed once (#405)
+ * Add ipv6 support to guest agent (#404)
+ * Update Accounts documentation (#403)
+ * Update google-startup-scripts.service to enable logging (#399)
+ * Network subsystem remove os rules (#396)
+ * oslogin: don't remove sshca watcher when oslogin is disabled (#398)
+ * Update dependencies to catch up on CVE fixes (#397)
+ * Network manager netplan implementation (#386)
+ * Update dependencies to catch up on CVE fixes (#391)
+ * Log current available routes on error (#388)
+ * Fix command monitor bugs (#389)
+ * Windows account: ignore "user already belogs to group" error (#387)
+ * Add more error logging in snapshot handling requests, use common retry util (#384)
+ * All non-200 status code from MDS should raise error (#383)
+ * Change metadata key to enable-oslogin-certificates (#382)
+ * Update dhclient pid/lease file directory to abide apparmor rules (#381)
+ * Add COS homedir-gid patch to upstream. (#365)
+ * Add require-oslogin-certificates logic to disable keys (#368)
+ * systemd-networkd: support debian 12's version (#372)
+ * Minor update typo in comment (#380)
+ * NetworkManager: only set secondary interfaces as up (#378)
+ * address manager: make sure we check for oldMetadata (#375)
+ * network: early setup network (#374)
+ * NetworkManager: fix ipv6 and ipv4 mode attribute (#373)
+ * Network Manager: make sure we clean up ifcfg files (#371)
+ * metadata script runner: fix script download (#370)
+ * oslogin: avoid adding extra empty line at the end of /etc/security/group.conf (#369)
+ * Dynamic vlan (#361)
+ * Check for nil response (#366)
+ * Create NetworkManager implementation (#362)
+ * Skip interface manager on Windows (#363)
+ * network: remove ignore setup (#360)
+ * Create wicked network service implementation and its respective unit (#356)
+ * Update metadata script runner, add tests (#357)
+ * Refactor guest-agent to use common retry util (#355)
+ * Flush logs before exiting #358 (#359)
+ * Create systemd-networkd unit tests. (#354)
+ * Update network manager unit tests (#351)
+ * Implement retry util (#350)
+ * Refactor utils package to not dump everything unrelated into one file (#352)
+ * Set version on metadata script runner (#353)
+ * Implement cleanup of deprecated configuration directives (#348)
+ * Ignore DHCP offered routes only for secondary nics (#347)
+ * Deprecate DHClient in favor of systemd-networkd (#342)
+ * Generate windows and linux licenses (#346)
+ * Remove quintonamore from OWNERS (#345)
+ * Delete integration tests (#343)
+- from version 20240716.00
+ * Update dep: golang.org/x/crypto to v0.17.0
+ * Update dep: google.golang.org/protobuf to 1.33.0
+ * Update dep: golang.org/x/net to 0.17.0
+ * Update dep: google.golang.org/grpc to v1.57.1
+
+-------------------------------------------------------------------
+Tue Jul 2 13:00:54 UTC 2024 - John Paul Adrian Glaubitz
+
+- Update to version 20240701.00
+ * Update google-startup-scripts.service to enable logging (#399)
+
+-------------------------------------------------------------------
+Fri Jun 14 09:27:31 UTC 2024 - John Paul Adrian Glaubitz
+
+- Update to version 20240611.01
+ * Network subsystem remove os rules (#396)
+ * oslogin: don't remove sshca watcher when oslogin is disabled (#398)
+ * update dependencies to catch up on CVE fixes (#397)
+ * Network manager netplan implementation (#386)
+ * update dependencies to catch up on CVE fixes (#391)
+ * Log current available routes on error (#388)
+ * Fix command monitor bugs (#389)
+ * windows account: ignore "user already belogs to group" error (#387)
+ * Add more error logging in snapshot handling requests, use common retry util (#384)
+ * All non-200 status code from MDS should raise error (#383)
+ * change metadata key to enable-oslogin-certificates (#382)
+ * Update dhclient pid/lease file directory to abide apparmor rules (#381)
+ * Add COS homedir-gid patch to upstream. (#365)
+ * Add require-oslogin-certificates logic to disable keys (#368)
+ * systemd-networkd: support debian 12's version (#372)
+ * Minor update typo in comment (#380)
+ * NetworkManager: only set secondary interfaces as up (#378)
+ * address manager: make sure we check for oldMetadata (#375)
+ * network: early setup network (#374)
+ * NetworkManager: fix ipv6 and ipv4 mode attribute (#373)
+ * Network Manager: make sure we clean up ifcfg files (#371)
+ * metadata script runner: fix script download (#370)
+ * oslogin: avoid adding extra empty line at the end of /etc/security/group.conf (#369)
+ * Dynamic vlan (#361)
+ * Check for nil response (#366)
+ * Create NetworkManager implementation (#362)
+ * Skip interface manager on Windows (#363)
+ * network: remove ignore setup (#360)
+ * Create wicked network service implementation and its respective unit (#356)
+ * Update metadata script runner, add tests (#357)
+ * Refactor guest-agent to use common retry util (#355)
+ * Flush logs before exiting #358 (#359)
+ * Create systemd-networkd unit tests. (#354)
+ * Update network manager unit tests (#351)
+ * Implement retry util (#350)
+ * Refactor utils package to not dump everything unrelated into one file (#352)
+ * Set version on metadata script runner (#353)
+ * Implement cleanup of deprecated configuration directives (#348)
+ * ignore DHCP offered routes only for secondary nics (#347)
+ * Deprecate DHClient in favor of systemd-networkd (#342)
+ * Generate windows and linux licenses (#346)
+ * Remove quintonamore from OWNERS (#345)
+ * Delete integration tests (#343)
+- from version 20240528.00
+ * update dep: golang.org/x/crypto to v0.17.0
+ * update dep: google.golang.org/protobuf to 1.33.0
+ * update dep: golang.org/x/net to 0.17.0
+ * update dep: google.golang.org/grpc to v1.57.1
+
+-------------------------------------------------------------------
+Fri Mar 22 12:00:11 UTC 2024 - John Paul Adrian Glaubitz
+
+- Update to version 20240314.00 (bsc#1221900, bsc#1221901)
+ * NetworkManager: only set secondary interfaces as up (#378)
+ * address manager: make sure we check for oldMetadata (#375)
+ * network: early setup network (#374)
+ * NetworkManager: fix ipv6 and ipv4 mode attribute (#373)
+ * Network Manager: make sure we clean up ifcfg files (#371)
+ * metadata script runner: fix script download (#370)
+ * oslogin: avoid adding extra empty line at the end of /etc/security/group.conf (#369)
+ * Dynamic vlan (#361)
+ * Check for nil response (#366)
+ * Create NetworkManager implementation (#362)
+ * Skip interface manager on Windows (#363)
+ * network: remove ignore setup (#360)
+ * Create wicked network service implementation and its respective unit (#356)
+ * Update metadata script runner, add tests (#357)
+ * Refactor guest-agent to use common retry util (#355)
+ * Flush logs before exiting #358 (#359)
+- Refresh patches for new version
+ * dont_overwrite_ifcfg.patch
+
+-------------------------------------------------------------------
+Tue Feb 27 13:23:01 UTC 2024 - Jan Engelhardt
+
+- No need for double %setup.
+
+-------------------------------------------------------------------
+Tue Feb 27 11:13:20 UTC 2024 - Dominique Leuenberger
+
+- Use %patch -P N instead of deprecated %patchN.
+
+-------------------------------------------------------------------
+Mon Feb 26 13:06:16 UTC 2024 - John Paul Adrian Glaubitz
+
+- Update to version 20240213.00
+ * Create systemd-networkd unit tests (#354)
+- from version 20240209.00
+ * Update network manager unit tests (#351)
+- from version 20240207.02
+ * Implement retry util (#350)
+- from version 20240207.01
+ * Refactor utils package to not dump everything unrelated into one file (#352)
+- from version 20240207.00
+ * Set version on metadata script runner (#353)
+ * Implement cleanup of deprecated configuration directives (#348)
+ * Ignore DHCP offered routes only for secondary nics (#347)
+ * Deprecate DHClient in favor of systemd-networkd (#342)
+ * Generate windows and linux licenses (#346)
+- from version 20240122.00
+ * Remove quintonamore from OWNERS (#345)
+- from version 20240111.00
+ * Delete integration tests (#343)
+- from version 20240109.00
+ * Update licenses with dependencies of go-winio (#339)
+ * Add github.com/Microsoft/go-winio to third party licensing (#337)
+- Add explicit versioned dependency on google-guest-oslogin (bsc#1219642)
+- Refresh patches for new version
+ * dont_overwrite_ifcfg.patch
+
-------------------------------------------------------------------
Thu Jan 4 11:32:21 UTC 2024 - John Paul Adrian Glaubitz
diff --git a/google-guest-agent.spec b/google-guest-agent.spec
index 9b256bc..1c4a635 100644
--- a/google-guest-agent.spec
+++ b/google-guest-agent.spec
@@ -1,7 +1,7 @@
#
# spec file for package google-guest-agent
#
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +24,7 @@
%global import_path %{provider_prefix}
Name: google-guest-agent
-Version: 20231214.00
+Version: 20250116.00
Release: 0
Summary: Google Cloud Guest Agent
License: Apache-2.0
@@ -34,10 +34,10 @@ Source0: %{repo}-%{version}.tar.gz
Source1: vendor.tar.gz
Source2: rpmlintrc
Patch0: disable_google_dhclient_script.patch
-Patch1: dont_overwrite_ifcfg.patch
BuildRequires: golang-packaging
-BuildRequires: golang(API) = 1.21
+BuildRequires: golang(API) = 1.23
Requires: google-guest-configs
+Requires: google-guest-oslogin >= 20231003
Provides: google-compute-engine-init = %{version}
Obsoletes: google-compute-engine-init < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -49,10 +49,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
Google Cloud Guest Agent
%prep
-%setup -q -n %{repo}-%{version}
-%setup -q -D -T -a 1 -n %{repo}-%{version}
-%patch0 -p1
-%patch1 -p1
+%setup -n %{repo}-%{version} -a1
+%patch -P 0 -p1
%build
%goprep %{import_path}
diff --git a/guest-agent-20231214.00.tar.gz b/guest-agent-20231214.00.tar.gz
deleted file mode 100644
index df81932..0000000
--- a/guest-agent-20231214.00.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1c0ab75e769b2feee8f08bbd38682435d1241746a9d46f4e37a7c095575d1d06
-size 168304
diff --git a/guest-agent-20250116.00.tar.gz b/guest-agent-20250116.00.tar.gz
new file mode 100644
index 0000000..f77ff70
--- /dev/null
+++ b/guest-agent-20250116.00.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:14cfc042d2ea14bc0ff6347a2b597a189306103c7a34f2ff8e82ff50e44cdc84
+size 231570
diff --git a/vendor.tar.gz b/vendor.tar.gz
index 42339d3..cbcde93 100644
--- a/vendor.tar.gz
+++ b/vendor.tar.gz
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0b33600403f41b90711e224fd1dd7cdf98b9fc4fbf7b50ccbd359cbf5994b2a8
-size 4986987
+oid sha256:568412857b4b642ae6c5100e1dfdb54e475d906865ff2a63d4c07e948654e619
+size 4926187