Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions _attributes/attributes-microshift.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
:experimental:
:imagesdir: images
:OCP: OpenShift Container Platform
:ocp-version: 4.20
:ocp-version: 4.21
:oc-first: pass:quotes[OpenShift CLI (`oc`)]
:ai-first: artificial intelligence (AI)
//OpenShift Kubernetes Engine
Expand All @@ -16,7 +16,7 @@
:gitops-title: Red{nbsp}Hat OpenShift GitOps
:gitops: GitOps
:product-registry: OpenShift image registry
:product-version: 4.20
:product-version: 4.21
:rhel-major: rhel-9
:rhoai-full: Red{nbsp}Hat OpenShift AI
:rhoai: RHOAI
Expand All @@ -32,7 +32,7 @@
:op-system-bundle: Red{nbsp}Hat Device Edge
:ovms: OpenVINO Model Server
:ov: OVMS
:rpm-repo-version: rhocp-4.20
:rpm-repo-version: rhocp-4.21
:rhde-version: 4
:rhoai: Red{nbsp}Hat OpenShift AI Self-Managed
:VirtProductName: OpenShift Virtualization
2 changes: 1 addition & 1 deletion microshift_cli_ref/microshift-usage-oc-kubectl.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ The additional command `oc new-app`, for example, makes it easier to get new app
If you installed an earlier version of `oc`, you might not be able use it to complete all of the commands in {microshift-short} {product-version}. If you want the latest features, you must download and install the latest version of `oc` that corresponds with your {microshift-short} version.
====

Using new capabilities often requires the latest `oc` binary. A 4.20 server might have additional capabilities that a 4.16 `oc` binary cannot use and a 4.20 `oc` binary might have additional capabilities that are unsupported by a 4.15 server.
Using new capabilities often requires the latest `oc` binary. A 4.21 server might have additional capabilities that a 4.16 `oc` binary cannot use and a 4.21 `oc` binary might have additional capabilities that are unsupported by a 4.15 server.

.Compatibility Matrix

Expand Down
4 changes: 2 additions & 2 deletions modules/microshift-embed-microshift-image-offline-deploy.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ include::snippets/microshift-rhel10-bootc-not-osbuild.adoc[leveloffset=1]
----
$ sudo dnf install -y microshift-release-info-_<release_version>_
----
Replace `_<release_version>_` with the numerical value of the release you are deploying, using the entire version number, such as `4.20.1`.
Replace `_<release_version>_` with the numerical value of the release you are deploying, using the entire version number, such as `4.21.1`.

.. List the contents of the `/usr/share/microshift/release` directory to verify the presence of the release information files by running the following command:
+
Expand Down Expand Up @@ -65,7 +65,7 @@ $ sudo dnf download microshift-release-info-_<release_version>_ # <1>
.Example RPM output
[source,terminal,subs="+quotes"]
----
microshift-release-info-4.20.1.-202512101230.p0.g7dc6a00.assembly.4.20.1.el9.noarch.rpm
microshift-release-info-4.21.1.-202512101230.p0.g7dc6a00.assembly.4.21.1.el9.noarch.rpm
----

.. Unpack the RPM package without installing it by running the following command:
Expand Down
2 changes: 1 addition & 1 deletion modules/microshift-updating-rpms-z.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
= Applying patch updates using RPMs

[role="_abstract"]
Updating {microshift-short} on non `rpm-ostree` systems such as {op-system-base-full} requires downloading then updating the RPMs. For example, use the following procedure to upgrade from 4.20.1 to 4.20.2.
Updating {microshift-short} on non `rpm-ostree` systems such as {op-system-base-full} requires downloading then updating the RPMs. For example, use the following procedure to upgrade from 4.21.1 to 4.21.2.

include::snippets/microshift-unsupported-config-warn.adoc[leveloffset=+1]

Expand Down
21 changes: 15 additions & 6 deletions snippets/microshift-rhde-compatibility-table-snip.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,28 @@

{op-system-base-full} and {microshift-short} work together as a single solution for device-edge computing. You can update each component separately, but the product versions must be compatible. Supported configurations of {op-system-bundle} use verified releases for each together as listed in the following table:

[NOTE]
====
Be sure to check the support status of a release on the product lifecycle page.
====

[%header,cols="3",cols="1,1,2"]
|===
^|*{op-system-base} Version(s)*
^|*{microshift-short} Version*
^|*Supported {microshift-short} Version{nbsp}&#8594;{nbsp}Version Updates*

^|10.0
^|4.21
^|4.21.0{nbsp}&#8594;{nbsp}4.21.z (Technology Preview)

^|9.6
^|4.21
^|4.21.0{nbsp}&#8594;{nbsp}4.21.z

^|9.6
^|4.20
^|4.20.0{nbsp}&#8594;{nbsp}4.20.z
^|4.20.0{nbsp}&#8594;{nbsp}4.20.z, 4.20{nbsp}&#8594;{nbsp}4.21

^|9.6
^|4.19
Expand All @@ -35,11 +48,7 @@
^|4.16
^|4.16.0{nbsp}&#8594;{nbsp}4.16.z, 4.16{nbsp}&#8594;{nbsp}4.17, 4.16{nbsp}&#8594;{nbsp}4.18

^|9.2
^|4.15
^|4.15.0{nbsp}&#8594;{nbsp}4.15.z, 4.15{nbsp}&#8594;{nbsp}4.16 on {op-system-base} 9.4

^|9.2
^|4.14
^|4.14.0{nbsp}&#8594;{nbsp}4.14.z, 4.14{nbsp}&#8594;{nbsp}4.15, 4.14{nbsp}&#8594;{nbsp}4.16 on {op-system-base} 9.4
^|4.14.0{nbsp}&#8594;{nbsp}4.14.z, 4.14{nbsp}&#8594;{nbsp}4.16 on {op-system-base} 9.4
|===