Port ECE 3.8 relevant changes to 4.0

deploy-manage/deploy/cloud-enterprise/configure-host-rhel.md

@@ -71,27 +71,58 @@ Verify that required traffic is allowed. Check the [Networking prerequisites](ec
         SELINUX=enforcing
         ```
 
-4. Install podman:
+4. Install Podman:
+
+    * For Podman 4
 
-    * Install the latest available version `4.*` using dnf.
+        * Install the latest available version `4.*` using dnf.
 
-        ```sh
-        sudo dnf install podman-4.* podman-remote-4.*
-        ```
+            ```sh
+            sudo dnf install podman-4.* podman-remote-4.*
+            ```
 
-    * To prevent automatic Podman major version updates, configure the Podman version to be locked while still allowing minor and patch updates.
+        * To prevent automatic Podman major version updates, configure the Podman version to be locked at version `4.*` while still allowing minor and patch updates.
 
-        ```sh
-        ## Install versionlock
-        sudo dnf install 'dnf-command(versionlock)'
+            ```sh
+            ## Install versionlock
+            sudo dnf install 'dnf-command(versionlock)'
 
-        ## Lock major version
-        sudo dnf versionlock add --raw 'podman-4.*'
-        sudo dnf versionlock add --raw 'podman-remote-4.*'
+            ## Lock major version
+            sudo dnf versionlock add --raw 'podman-4.*'
+            sudo dnf versionlock add --raw 'podman-remote-4.*'
 
-        ## Verify that podman-4.* and podman-remote-4.* appear in the output
-        sudo dnf versionlock list
-        ```
+            ## Verify that podman-4.* and podman-remote-4.* appear in the output
+            sudo dnf versionlock list
+            ```
+
+    * For Podman 5
+
+        * Install version `5.2.2-13.*` using dnf.
+
+            :::{note}
+            As mentioned in [Migrating to Podman 5](migrate-to-podman-5.md) it is recommended to install Podman `5.2.2-13` since this is the latest supported version.
+
+            If you decide to install a previous Podman 5 version, make sure to replace `5.2.2-13` with the desired version in the commands below.
+
+            The version lock is still required for previous versions, to prevent automatic in-place updates that may be affected by a known [memory leak issue](https://github.com/containers/podman/issues/25473).
+            :::
+
+            ```sh
+            sudo dnf install podman-5.2.2-13.* podman-remote-5.2.2-13.*
+            ```
+        * To prevent automatic Podman updates to unsupported versions, configure the Podman version to be locked at version `5.2.2-13.*`.
+
+            ```sh
+            ## Install versionlock
+            sudo dnf install 'dnf-command(versionlock)'
+
+            ## Lock major version
+            sudo dnf versionlock add --raw 'podman-5.2.2-13.*'
+            sudo dnf versionlock add --raw 'podman-remote-5.2.2-13.*'
+
+            ## Verify that podman-5.2.2-13.* and podman-remote-5.2.2-13.* appear in the output
+            sudo dnf versionlock list
+            ```
 
 5. [This step is for RHEL 9 and Rocky Linux 9 only] Switch the network stack from Netavark to CNI:
 

deploy-manage/deploy/cloud-enterprise/migrate-ece-to-podman-hosts.md

@@ -101,27 +101,58 @@ Using Docker or Podman as container runtime is a configuration local to the host
         SELINUX=enforcing
         ```
 
-4. Install podman:
+4. Install Podman:
+
+    * For Podman 4
 
-    * Install the latest available version `4.*` using dnf.
+        * Install the latest available version `4.*` using dnf.
 
-        ```sh
-        sudo dnf install podman-4.* podman-remote-4.*
-        ```
+            ```sh
+            sudo dnf install podman-4.* podman-remote-4.*
+            ```
 
-    * To prevent automatic Podman major version updates, configure the Podman version to be locked while still allowing minor and patch updates.
+        * To prevent automatic Podman major version updates, configure the Podman version to be locked at version `4.*` while still allowing minor and patch updates.
 
-        ```sh
-        ## Install versionlock
-        sudo dnf install 'dnf-command(versionlock)'
+            ```sh
+            ## Install versionlock
+            sudo dnf install 'dnf-command(versionlock)'
 
-        ## Lock major version
-        sudo dnf versionlock add --raw 'podman-4.*'
-        sudo dnf versionlock add --raw 'podman-remote-4.*'
+            ## Lock major version
+            sudo dnf versionlock add --raw 'podman-4.*'
+            sudo dnf versionlock add --raw 'podman-remote-4.*'
 
-        ## Verify that podman-4.* and podman-remote-4.* appear in the output
-        sudo dnf versionlock list
-        ```
+            ## Verify that podman-4.* and podman-remote-4.* appear in the output
+            sudo dnf versionlock list
+            ```
+
+    * For Podman 5
+
+        * Install version `5.2.2-13.*` using dnf.
+
+            :::{note}
+            As mentioned in [Migrating to Podman 5](migrate-to-podman-5.md) it is recommended to install Podman `5.2.2-13` since this is the latest supported version.
+
+            If you decide to install a previous Podman 5 version, make sure to replace `5.2.2-13` with the desired version in the commands below.
+
+            The version lock is still required for previous versions, to prevent automatic in-place updates that may be affected by a known [memory leak issue](https://github.com/containers/podman/issues/25473).
+            :::
+
+            ```sh
+            sudo dnf install podman-5.2.2-13.* podman-remote-5.2.2-13.*
+            ```
+        * To prevent automatic Podman updates to unsupported versions, configure the Podman version to be locked at version `5.2.2-13.*`.
+
+            ```sh
+            ## Install versionlock
+            sudo dnf install 'dnf-command(versionlock)'
+
+            ## Lock major version
+            sudo dnf versionlock add --raw 'podman-5.2.2-13.*'
+            sudo dnf versionlock add --raw 'podman-remote-5.2.2-13.*'
+
+            ## Verify that podman-5.2.2-13.* and podman-remote-5.2.2-13.* appear in the output
+            sudo dnf versionlock list
+            ```
 
 5. [This step is for RHEL 9 and Rocky Linux 9 only] Switch the network stack from Netavark to CNI:
 

deploy-manage/deploy/cloud-enterprise/migrate-to-podman-5.md

@@ -0,0 +1,40 @@
+---
+applies_to:
+  deployment:
+    ece: all
+---
+# Migrating to Podman 5
+
+Following are the supported upgrade paths for Podman 5 in {{ece}}.
+
+| **From ↓** ...       **To →**           | Podman 5.2.2-9 | Podman 5.2.2-11 | Podman 5.2.2-13 | Podman 5.2.3 |
+|-----------------------------------------|----------------|-----------------|-----------------|--------------|
+| **<vanilla Linux installation> (grow)** | ✓ ^*^          | ✓ ^*^           | ✓               | X            |
+| **Docker (grow-and-shrink)**            | ✓ ^*^          | ✓ ^*^           | ✓               | X            |
+| **Podman 4.9.4 (grow-and-shrink)**      | ✓ ^*^          | ✓ ^*^           | ✓               | X            |
+| **Podman 4.9.4 (in-place)**             | ✓              | X               | X               | X            |
+| **Podman 5.2.2-9 (in-place)**           | -              | X               | X               | X            |
+
+
+
+
+^*^ *Supported but not recommended given that a newer version (Podman `5.2.2-13`) is available.*
+
+Podman `5.2.2-13` is only supported when conducting a **fresh {{ece}} installation** or performing a **grow-and-shrink update** from Docker or Podman 4.
+
+For **in-place updates**, it is recommended to use Podman `5.2.2-9`, since upgrades to versions `5.2.2-11` and `5.2.2-13` are affected by a known [memory leak issue](https://github.com/containers/podman/issues/25473).
+When performing an in-place update, please make sure to configure the Podman version to be locked at version `5.2.2-9.*`, by following the instructions below.
+
+```sh
+## Install versionlock
+sudo dnf install 'dnf-command(versionlock)'
+
+## Lock major version
+sudo dnf versionlock add --raw 'podman-5.2.2-9.*'
+sudo dnf versionlock add --raw 'podman-remote-5.2.2-9.*'
+
+## Verify that podman-5.2.2-9.* and podman-remote-5.2.2-9.* appear in the output
+sudo dnf versionlock list
+```
+
+Podman versions `5.2.3` and higher are not supported.

deploy-manage/toc.yml

@@ -93,6 +93,8 @@ toc:
                       - file: deploy/cloud-enterprise/deploy-large-installation.md
                       - file: deploy/cloud-enterprise/fresh-installation-of-ece-using-podman-hosts.md
                       - file: deploy/cloud-enterprise/migrate-ece-to-podman-hosts.md
+                        children:
+                          - file: deploy/cloud-enterprise/migrate-to-podman-5.md
                   - file: deploy/cloud-enterprise/log-into-cloud-ui.md
                   - file: deploy/cloud-enterprise/post-installation-steps.md
                   - file: deploy/cloud-enterprise/install-ece-on-additional-hosts.md

deploy-manage/upgrade/orchestrator/upgrade-cloud-enterprise.md

@@ -20,7 +20,7 @@ Periodically, you might need to upgrade an Elastic Cloud Enterprise installation
 Before initiating the ECE upgrade process, review the [Support matrix](https://www.elastic.co/support/matrix#elastic-cloud-enterprise) to ensure the operating system (OS), Docker, or Podman versions you're running are compatible with the ECE version you’re upgrading to. We recommend that Docker, Podman, and the operating system are at the target version before starting the ECE upgrade.
 
 :::{note}
-During the upgrade window, there might be a short period of time during which you run a combination of versions which is not explicitly supported. For example, if you are on ECE 3.5 with Docker version 20.10 on Ubuntu 20.04, and plan to upgrade to ECE 3.7 on the same OS, you will need to upgrade Docker to version 24.0 first. In this case, and only during your upgrade window, we support the mixed OS/Docker versions. In general, this won’t be a problem. However, should anything become a blocker for the upgrade, [reach out to support for help](/troubleshoot/index.md#contact-us).
+During the upgrade window, there might be a short period of time during which you run a combination of versions which is not explicitly supported. For example, if you are on ECE 3.5 with Docker version 20.10 on Ubuntu 20.04, and plan to upgrade to ECE 3.7 on the same OS, you will need to upgrade Docker to version 24.0 first. In this case, and only during your upgrade window, we support the mixed OS and container engine versions. In general, this won’t be a problem. However, should anything become a blocker for the upgrade, [reach out to support for help](/troubleshoot/index.md#contact-us).
 :::
 
 ## The upgrade version matrix [ece-upgrade-version-matrix]
@@ -37,7 +37,12 @@ The following table shows the recommended upgrade paths from older Elastic Cloud
 If you have to upgrade to any of the intermediate versions, follow the upgrade instructions of the relevant release before upgrading to 4.0.0:
 - [ECE 2.5 Upgrade](https://www.elastic.co/guide/en/cloud-enterprise/2.5/ece-upgrade.html)
 - [ECE 2.13 Upgrade](https://www.elastic.co/guide/en/cloud-enterprise/2.13/ece-upgrade.html)
-- [ECE 3.8 Upgrade](https://www.elastic.co/guide/en/cloud-enterprise/3.7/ece-upgrade.html)
+
+  :::{note}
+  Upgrading to 2.13.0 is not recommended as it can cause issues and you may lose access to the admin console. We strongly recommend to upgrade to 2.13.4.
+  :::
+
+- [ECE 3.8 Upgrade](https://www.elastic.co/guide/en/cloud-enterprise/3.8/ece-upgrade.html)
 
 ## The upgrade process [ece-upgrade-overview]