Merge pull request #3613 from microsoft/anphel/2.0-fixes-aug-release-2

Pull helm and cloud-init fixes for 2.0 August release 2

SPECS/cloud-init/add-mariner-distro-support.patch

@@ -359,9 +359,33 @@ index 6951a0e3..411065f9 100644
     # Other config here will be given to the distro class and/or path classes
     paths:
        cloud_dir: /var/lib/cloud/
+diff -ruN a/systemd/cloud-init-local.service.tmpl b/systemd/cloud-init-local.service.tmpl
+--- a/systemd/cloud-init-local.service.tmpl     2022-05-18 08:23:24.000000000 -0700
++++ b/systemd/cloud-init-local.service.tmpl     2022-08-23 16:23:57.854218334 -0700
+@@ -1,9 +1,7 @@
+ ## template:jinja
+ [Unit]
+ Description=Initial cloud-init job (pre-networking)
+-{% if variant in ["ubuntu", "unknown", "debian", "rhel" ] %}
+ DefaultDependencies=no
+-{% endif %}
+ Wants=network-pre.target
+ After=hv_kvp_daemon.service
+ After=systemd-remount-fs.service
+@@ -21,10 +19,8 @@
+ Before=firewalld.target
+ Conflicts=shutdown.target
+ {% endif %}
+-{% if variant in ["ubuntu", "unknown", "debian"] %}
+ Before=sysinit.target
+ Conflicts=shutdown.target
+-{% endif %}
+ RequiresMountsFor=/var/lib/cloud
+ {% if variant == "rhel" %}
+ ConditionPathExists=!/etc/cloud/cloud-init.disabled
 diff -ruN a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl
---- a/systemd/cloud-init.service.tmpl	2022-05-18 08:23:24.000000000 -0700
-+++ b/systemd/cloud-init.service.tmpl	2022-08-03 21:51:14.862040213 -0700
+--- a/systemd/cloud-init.service.tmpl   2022-05-18 08:23:24.000000000 -0700
++++ b/systemd/cloud-init.service.tmpl   2022-08-23 16:21:56.556071614 -0700
 @@ -1,7 +1,7 @@
  ## template:jinja
  [Unit]
@@ -371,16 +395,18 @@ diff -ruN a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl
  DefaultDependencies=no
  {% endif %}
  Wants=cloud-init-local.service
-@@ -26,8 +26,8 @@
+@@ -26,11 +26,9 @@
  Before=network-online.target
  Before=sshd-keygen.service
  Before=sshd.service
 -{% if variant in ["ubuntu", "unknown", "debian"] %}
  Before=sysinit.target
-+{% if variant in ["ubuntu", "unknown", "debian"] %}
  Before=shutdown.target
  Conflicts=shutdown.target
- {% endif %}
+-{% endif %}
+ {% if variant in ["suse"] %}
+ Before=shutdown.target
+ Conflicts=shutdown.target
 diff --git a/templates/hosts.mariner.tmpl b/templates/hosts.mariner.tmpl
 new file mode 100644
 index 00000000..2e956382
@@ -768,3 +794,4 @@ index 176df36b..10e47343 100755
 -- 
 2.25.1
 
+

SPECS/cloud-init/cloud-init.spec

@@ -1,7 +1,7 @@
 Summary:        Cloud instance init scripts
 Name:           cloud-init
 Version:        22.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        GPLv3
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -146,6 +146,9 @@ make check %{?_smp_mflags}
 %config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/10-azure-kvp.cfg
 
 %changelog
+* Wed Aug 22 2022 Nan Liu <[email protected]> - 22.2-7
+- Update add-mariner-distro-support patch to fix cloud-init dependency cycle
+
 * Wed Aug 03 2022 Minghe Ren <[email protected]> - 22.2-6
 - Update add-mariner-distro-support patch to add sysinit.target dependency