Merge pull request #100843 from tedaveryredhat/OSDOCS-15557

OSDOCS-15557:Update attributes and comp table in MicroShift v4.21

Author: maxwelldb

_attributes/attributes-microshift.adoc

@@ -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
@@ -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
@@ -32,6 +32,6 @@
 :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
 :VirtProductName: OpenShift Virtualization

microshift_cli_ref/microshift-usage-oc-kubectl.adoc

@@ -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
 

modules/microshift-embed-microshift-image-offline-deploy.adoc

@@ -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:
 +
@@ -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:

modules/microshift-updating-rpms-z.adoc

@@ -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]
 

snippets/microshift-rhde-compatibility-table-snip.adoc

@@ -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}→{nbsp}Version Updates*
 
+^|10.0
+^|4.21
+^|4.21.0{nbsp}→{nbsp}4.21.z (Technology Preview)
+
+^|9.6
+^|4.21
+^|4.21.0{nbsp}→{nbsp}4.21.z
+
 ^|9.6
 ^|4.20
-^|4.20.0{nbsp}→{nbsp}4.20.z
+^|4.20.0{nbsp}→{nbsp}4.20.z, 4.20{nbsp}→{nbsp}4.21
 
 ^|9.6
 ^|4.19
@@ -35,11 +48,7 @@
 ^|4.16
 ^|4.16.0{nbsp}→{nbsp}4.16.z, 4.16{nbsp}→{nbsp}4.17, 4.16{nbsp}→{nbsp}4.18
 
-^|9.2
-^|4.15
-^|4.15.0{nbsp}→{nbsp}4.15.z, 4.15{nbsp}→{nbsp}4.16 on {op-system-base} 9.4
-
 ^|9.2
 ^|4.14
-^|4.14.0{nbsp}→{nbsp}4.14.z, 4.14{nbsp}→{nbsp}4.15, 4.14{nbsp}→{nbsp}4.16 on {op-system-base} 9.4
+^|4.14.0{nbsp}→{nbsp}4.14.z, 4.14{nbsp}→{nbsp}4.16 on {op-system-base} 9.4
 |===