import cloud-init-23.4-7.el9_4

SOURCES/ci-Retain-exit-code-in-cloud-init-status-for-recoverabl.patch

@@ -0,0 +1,65 @@
+From cc31dc321ae35995ceff93e67aaf0b0c660aa890 Mon Sep 17 00:00:00 2001
+From: Ani Sinha <anisinha@redhat.com>
+Date: Tue, 12 Mar 2024 12:52:10 +0530
+Subject: [PATCH] Retain exit code in cloud-init status for recoverable errors
+
+RH-Author: Ani Sinha <None>
+RH-MergeRequest: 71: Retain exit code in cloud-init status for recoverable errors
+RH-Jira: RHEL-28549
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+RH-Commit: [1/1] 00934ade88c481c012bc1947fa44e5ed59f82858 (anisinha/cloud-init)
+
+Version 23.4 of cloud-init changed the status code reported by cloud-init for
+recoverable errors from 0 to 2. Please see the commit
+70acb7f2a30d58 ("Add support for cloud-init "degraded" state (#4500)")
+
+This change has the potential to break customers who are expecting a 0 status
+and where warnings can be expected. Hence, revert the status code from 2 to 0
+even in case of recoverable errors. This retains the old behavior and hence
+avoids breaking scripts and software stack that expects 0 on the end user side.
+
+Cannonical has made a similar change downstream for similar reasons. Please see
+https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/2048522
+and the corresponding downstream patch:
+https://github.com/canonical/cloud-init/pull/4747/commits/adce34bfd214e4eecdf87329486f30f0898dd303
+
+This patch has limited risk as it narrowly only restores the old status
+code for recoverable errors and does not modify anything else.
+
+X-downstream-only: true
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+---
+ cloudinit/cmd/status.py            | 2 +-
+ tests/unittests/cmd/test_status.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cloudinit/cmd/status.py b/cloudinit/cmd/status.py
+index f5ee9c11..849c80bc 100644
+--- a/cloudinit/cmd/status.py
++++ b/cloudinit/cmd/status.py
+@@ -225,7 +225,7 @@ def handle_status_args(name, args) -> int:
+         return 1
+     # Recoverable error
+     elif details.status in UXAppStatusDegradedMap.values():
+-        return 2
++        return 0
+     return 0
+ 
+ 
+diff --git a/tests/unittests/cmd/test_status.py b/tests/unittests/cmd/test_status.py
+index 6c85a59a..567b517a 100644
+--- a/tests/unittests/cmd/test_status.py
++++ b/tests/unittests/cmd/test_status.py
+@@ -636,7 +636,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin
+                 },
+                 None,
+                 MyArgs(long=False, wait=False, format="json"),
+-                2,
++                0,
+                 {
+                     "boot_status_code": "enabled-by-kernel-cmdline",
+                     "datasource": "nocloud",
+-- 
+2.39.3
+

SPECS/cloud-init.spec

@@ -1,6 +1,6 @@
 Name:           cloud-init
 Version:        23.4
-Release:        6%{?dist}.inferit
+Release:        7%{?dist}.inferit
 Summary:        Cloud instance init scripts
 License:        ASL 2.0 or GPLv3
 URL:            http://launchpad.net/cloud-init
@@ -21,7 +21,8 @@ Patch9: ci-Revert-Use-grep-for-faster-parsing-of-cloud-config-i.patch
 Patch10: ci-Pin-pythes-8.0.0.patch
 # For RHEL-21324 - [rhel-9] The schema WARNING info for network-config.json is not suitable in cloud-init-23.4
 Patch11: ci-fix-Add-types-to-network-v1-schema-4841.patch
-
+# For RHEL-28549 - [RHEL 9.4] cloud-init 23.4 returns 2 on recoverable errors instead of 0
+Patch12: ci-Retain-exit-code-in-cloud-init-status-for-recoverabl.patch
 # MSVSphere patches
 Patch100: 0001-Add-MSVSphere-support.patch
 
@@ -240,9 +241,14 @@ fi
 %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
 
 %changelog
-* Wed Apr 03 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 23.4-6.inferit
+* Wed May 01 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 23.4-7.inferit
 - MSVSphere debranding
 
+* Thu Mar 14 2024 Miroslav Rezanina <mrezanin@redhat.com> - 23.4-7
+- ci-Retain-exit-code-in-cloud-init-status-for-recoverabl.patch [RHEL-28549]
+- Resolves: RHEL-28549
+  ([RHEL 9.4] cloud-init 23.4 returns 2 on recoverable errors instead of 0)
+
 * Mon Feb 26 2024 Miroslav Rezanina <mrezanin@redhat.com> - 23.4-6
 - ci-fix-Add-types-to-network-v1-schema-4841.patch [RHEL-21324]
 - Resolves: RHEL-21324