Merge branch 'main' into uninstall

elastic · Feb 27, 2025 · 0890681 · 0890681
2 parents ec3991e + feea1d1
commit 0890681
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 10 deletions.
diff --git a/deploy-manage/deploy/cloud-enterprise/configure-host-rhel-cloud.md b/deploy-manage/deploy/cloud-enterprise/configure-host-rhel-cloud.md
@@ -72,16 +72,24 @@ Verify that required traffic is allowed. Check the [Networking prerequisites](ec
 
 4. Install podman:
 
-    * For RHEL 8 and Rocky Linux, install version `4.*`.
+    * Install the latest available version `4.*` using dnf.
 
         ```sh
         sudo dnf install podman-4.* podman-remote-4.*
         ```
 
-    * For RHEL 9, install the latest available version `4.*` using dnf.
+    * To prevent automatic Podman major version updates, configure the Podman version to be locked while still allowing minor and patch updates.
 
         ```sh
-        sudo dnf install podman-4.* podman-remote-4.*
+        ## 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.*'
+
+        ## Verify that podman-4.* and podman-remote-4.* 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:

diff --git a/deploy-manage/deploy/cloud-enterprise/configure-host-rhel-onprem.md b/deploy-manage/deploy/cloud-enterprise/configure-host-rhel-onprem.md
@@ -70,16 +70,24 @@ Verify that required traffic is allowed.
 
 4. Install podman:
 
-    * For RHEL 8 and Rocky Linux, install version `4.*`.
+    * Install the latest available version `4.*` using dnf.
 
         ```sh
         sudo dnf install podman-4.* podman-remote-4.*
         ```
 
-    * For RHEL 9, install the latest available version `4.*` using dnf.
+    * To prevent automatic Podman major version updates, configure the Podman version to be locked while still allowing minor and patch updates.
 
         ```sh
-        sudo dnf install podman-4.* podman-remote-4.*
+        ## 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.*'
+
+        ## Verify that podman-4.* and podman-remote-4.* 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:

diff --git a/deploy-manage/deploy/cloud-enterprise/migrate-ece-to-podman-hosts.md b/deploy-manage/deploy/cloud-enterprise/migrate-ece-to-podman-hosts.md
@@ -111,16 +111,24 @@ Otherwise, when the file content changes, the corresponding user is mentioned as
 
 4. Install podman:
 
-    * For RHEL 8 and Rocky Linux, install version `4.*`.
+    * Install the latest available version `4.*` using dnf.
 
         ```sh
         sudo dnf install podman-4.* podman-remote-4.*
         ```
 
-    * For RHEL 9, install the latest available version `4.*` using dnf.
+    * To prevent automatic Podman major version updates, configure the Podman version to be locked while still allowing minor and patch updates.
 
         ```sh
-        sudo dnf install podman-4.* podman-remote-4.*
+        ## 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.*'
+
+        ## Verify that podman-4.* and podman-remote-4.* 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:

diff --git a/deploy-manage/deploy/cloud-on-k8s.md b/deploy-manage/deploy/cloud-on-k8s.md
@@ -68,12 +68,14 @@ This section outlines the supported Kubernetes and Elastic Stack versions for EC
 ECK is compatible with the following Kubernetes distributions and related technologies:
 
 * Kubernetes 1.28-1.32
-* OpenShift 4.12-4.17
+* OpenShift 4.13-4.18
 * Google Kubernetes Engine (GKE), Azure Kubernetes Service (AKS), and Amazon Elastic Kubernetes Service (EKS)
 * Helm: 3.2.0+
 
 ECK should work with all conformant **installers** listed in these [FAQs](https://github.com/cncf/k8s-conformance/blob/master/faq.md#what-is-a-distribution-hosted-platform-and-an-installer). Distributions include source patches and so may not work as-is with ECK.
 
+Alpha, beta, and stable API versions follow the same [conventions used by Kubernetes](https://kubernetes.io/docs/concepts/overview/kubernetes-api/#api-versioning).
+
 ### Elastic Stack compatibility
 
 ECK is compatible with the following Elastic Stack applications: