From 6f51dcd072fdb81763ff851c4d3bd8687590e10c Mon Sep 17 00:00:00 2001 From: aravipra Date: Fri, 5 Jul 2024 15:12:51 +0530 Subject: [PATCH] OSDOCS-11201: updates attributes file in MicroShift --- _attributes/attributes-microshift.adoc | 6 +++--- microshift_updating/microshift-about-updates.adoc | 6 +++--- microshift_updating/microshift-update-rpms-manually.adoc | 2 +- microshift_updating/microshift-update-rpms-ostree.adoc | 2 +- modules/microshift-updating-rpms-y.adoc | 7 +------ modules/microshift-updating-rpms-z.adoc | 2 +- snippets/microshift-rhde-compatibility-table-snip.adoc | 7 ++++++- snippets/microshift-update-paths-snip.adoc | 4 ++++ 8 files changed, 20 insertions(+), 16 deletions(-) diff --git a/_attributes/attributes-microshift.adoc b/_attributes/attributes-microshift.adoc index 730441cfa0..6630b60139 100644 --- a/_attributes/attributes-microshift.adoc +++ b/_attributes/attributes-microshift.adoc @@ -4,12 +4,12 @@ :experimental: :imagesdir: images :OCP: OpenShift Container Platform -:ocp-version: 4.16 +:ocp-version: 4.17 :oc-first: pass:quotes[OpenShift CLI (`oc`)] :product-title-first: Red Hat build of MicroShift (MicroShift) :microshift-short: MicroShift :product-registry: OpenShift image registry -:product-version: 4.16 +:product-version: 4.17 :rhel-major: rhel-9 :op-system-base-full: Red Hat Enterprise Linux (RHEL) :op-system: RHEL @@ -19,6 +19,6 @@ :op-system-version: 9.4 :op-system-version-major: 9 :op-system-bundle: Red Hat Device Edge -:rpm-repo-version: rhocp-4.16 +:rpm-repo-version: rhocp-4.17 :rhde-version: 4 :VirtProductName: OpenShift Virtualization diff --git a/microshift_updating/microshift-about-updates.adoc b/microshift_updating/microshift-about-updates.adoc index 77fe935407..abe65c1f4f 100644 --- a/microshift_updating/microshift-about-updates.adoc +++ b/microshift_updating/microshift-about-updates.adoc @@ -6,11 +6,11 @@ include::_attributes/attributes-microshift.adoc[] toc::[] -Updates are supported on {product-title} beginning with the General Availability version 4.14. With the 4.16 release, the following updates are supported: +Updates are supported on {product-title} beginning with the General Availability version 4.14. With the 4.17 release, the following updates are supported: * A maximum of two minor versions to the next in sequence, for example, from 4.14 to 4.16. -* One minor version to the next in sequence, for example, from 4.15 to 4.16. -* Patch updates are also supported from z-stream to z-stream, for example 4.16.1 to 4.16.2. +* One minor version to the next in sequence, for example, from 4.16 to 4.17. +* Patch updates are also supported from z-stream to z-stream, for example 4.17.1 to 4.17.2. [id="microshift-about-updates-understanding-microshift-updates_{context}"] == Understanding {microshift-short} updates diff --git a/microshift_updating/microshift-update-rpms-manually.adoc b/microshift_updating/microshift-update-rpms-manually.adoc index 285a72c61a..3bce6b0e78 100644 --- a/microshift_updating/microshift-update-rpms-manually.adoc +++ b/microshift_updating/microshift-update-rpms-manually.adoc @@ -6,7 +6,7 @@ include::_attributes/attributes-microshift.adoc[] toc::[] -Updating {product-title} for non-OSTree systems such as {op-system-base-full} requires downloading then updating the RPMs. For patch releases, such as 4.16.1 to 4.16.2, download and update the RPMs. For minor-version release updates, add the step of enabling the update repository using your subscription manager. +Updating {product-title} for non-OSTree systems such as {op-system-base-full} requires downloading then updating the RPMs. For patch releases, such as 4.17.1 to 4.17.2, download and update the RPMs. For minor-version release updates, add the step of enabling the update repository using your subscription manager. [IMPORTANT] ==== diff --git a/microshift_updating/microshift-update-rpms-ostree.adoc b/microshift_updating/microshift-update-rpms-ostree.adoc index b7740525c8..9a254c340c 100644 --- a/microshift_updating/microshift-update-rpms-ostree.adoc +++ b/microshift_updating/microshift-update-rpms-ostree.adoc @@ -8,7 +8,7 @@ toc::[] Updating {microshift-short} on an `rpm-ostree` system such as {op-system-ostree-first} requires building a new {op-system-ostree} image containing the new version of {microshift-short} and any associated optional RPMs. After you have the `rpm-ostree` image with {microshift-short} embedded, direct your system to boot into that operating system image. -The procedures are the same for minor-version and patch updates. For example, use the same steps to upgrade from 4.14 to 4.16 or from 4.16.0 to 4.16.1. +The procedures are the same for minor-version and patch updates. For example, use the same steps to upgrade from 4.16 to 4.17 or from 4.17.0 to 4.17.1. include::snippets/microshift-rhde-compatibility-table-snip.adoc[leveloffset=+1] diff --git a/modules/microshift-updating-rpms-y.adoc b/modules/microshift-updating-rpms-y.adoc index 6f4093e8b3..bcdf2544e3 100644 --- a/modules/microshift-updating-rpms-y.adoc +++ b/modules/microshift-updating-rpms-y.adoc @@ -6,12 +6,7 @@ [id="microshift-updating-rpms_{context}"] = Applying minor-version updates with RPMs -Updating a {microshift-short} minor version on non `rpm-ostree` systems such as {op-system-base-full} requires downloading then updating the RPMs. For example, use the following procedure to update from 4.15 to 4.16. - -[IMPORTANT] -==== -You can only update {microshift-short} from one version to the next in sequence. Jumping minor versions is not supported. For example, must update 4.15 to 4.16. -==== +Updating a {microshift-short} minor version on non `rpm-ostree` systems such as {op-system-base-full} requires downloading then updating the RPMs. For example, use the following procedure to update from 4.16 to 4.17. .Prerequisites * The system requirements for installing {microshift-short} have been met. diff --git a/modules/microshift-updating-rpms-z.adoc b/modules/microshift-updating-rpms-z.adoc index a6e4eb26bc..f25e9bf6b0 100644 --- a/modules/microshift-updating-rpms-z.adoc +++ b/modules/microshift-updating-rpms-z.adoc @@ -6,7 +6,7 @@ [id="microshift-applying-patch-updates-rpms_{context}"] = Applying patch updates using RPMs -Updating {microshift-short} on non `rpm-ostree` systems such as {op-system-base-full} requires downloading then updating the RPMs. A system reboot is not required for patch updates. For example, use the following procedure to upgrade from 4.14.0 to 4.14.1. +Updating {microshift-short} on non `rpm-ostree` systems such as {op-system-base-full} requires downloading then updating the RPMs. A system reboot is not required for patch updates. For example, use the following procedure to upgrade from 4.17.0 to 4.17.1. .Prerequisites * The system requirements for installing {microshift-short} have been met. diff --git a/snippets/microshift-rhde-compatibility-table-snip.adoc b/snippets/microshift-rhde-compatibility-table-snip.adoc index 81da7b50ae..a7aead328d 100644 --- a/snippets/microshift-rhde-compatibility-table-snip.adoc +++ b/snippets/microshift-rhde-compatibility-table-snip.adoc @@ -16,10 +16,15 @@ ^|*{microshift-short} Release Status* ^|*Supported {microshift-short} Version→{microshift-short} Version Updates* +^|9.4 +^|4.17 +^|Generally Available +^|4.17.0→4.17.z and 4.16→4.17 + ^|9.4 ^|4.16 ^|Generally Available -^|4.16.0→4.16.z, 4.14→4.16 and 4.15→4.16 +^|4.16.0→4.16.z, 4.14→4.16, 4.15→4.16 and 4.16→4.17 ^|9.2, 9.3 ^|4.15 diff --git a/snippets/microshift-update-paths-snip.adoc b/snippets/microshift-update-paths-snip.adoc index df27347d7e..dc52e0d402 100644 --- a/snippets/microshift-update-paths-snip.adoc +++ b/snippets/microshift-update-paths-snip.adoc @@ -12,7 +12,11 @@ Before updating {microshift-short} or {op-system}, determine the compatibilities *{product-title} update paths* +{microshift-short} version 4.17:: +* Version 4.17 to 4.17.z on {op-system} or {op-system-ostree} 9.4 + {microshift-short} version 4.16:: +* Version 4.16 on {op-system} or {op-system-ostree} 9.4 to 4.17 on {op-system} or {op-system-ostree} 9.4 * Version 4.16 to 4.16.z on {op-system} or {op-system-ostree} 9.4 {microshift-short} version 4.15::