Skip to content

Commit dc38992

Browse files
committed
update attributes and comp table
1 parent aa68961 commit dc38992

9 files changed

+24
-20
lines changed

_attributes/attributes-microshift.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
:experimental:
55
:imagesdir: images
66
:OCP: OpenShift Container Platform
7-
:ocp-version: 4.19
7+
:ocp-version: 4.20
88
:oc-first: pass:quotes[OpenShift CLI (`oc`)]
99
:ai-first: artificial intelligence (AI)
1010
//OpenShift Kubernetes Engine
@@ -14,7 +14,7 @@
1414
//gitops version for 4.17-4.19
1515
:gitops-ver: 1.16
1616
:product-registry: OpenShift image registry
17-
:product-version: 4.19
17+
:product-version: 4.20
1818
:rhel-major: rhel-9
1919
:rhoai-full: Red{nbsp}Hat OpenShift AI
2020
:rhoai: RHOAI
@@ -30,6 +30,6 @@
3030
:op-system-bundle: Red{nbsp}Hat Device Edge
3131
:ovms: OpenVINO Model Server
3232
:ov: OVMS
33-
:rpm-repo-version: rhocp-4.19
33+
:rpm-repo-version: rhocp-4.20
3434
:rhde-version: 4
3535
:VirtProductName: OpenShift Virtualization

microshift_cli_ref/microshift-usage-oc-kubectl.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The additional command `oc new-app`, for example, makes it easier to get new app
3535
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.
3636
====
3737

38-
Using new capabilities often requires the latest `oc` binary. A 4.19 server might have additional capabilities that a 4.16 `oc` binary cannot use and a 4.19 `oc` binary might have additional capabilities that are unsupported by a 4.15 server.
38+
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.
3939

4040
.Compatibility Matrix
4141

microshift_networking/microshift_multiple_networks/microshift-cni-multus-using.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ include::modules/microshift-cni-multus-troubleshoot.adoc[leveloffset=+1]
2626
== Additional resources
2727
* xref:../../microshift_networking/microshift_multiple_networks/microshift-cni-multus.adoc#microshift-cni-multus[About using multiple networks]
2828

29-
* link:https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/networking/multiple-networks#nw-multus-ipam-object_configuring-additional-network[Configuration of IP address assignment for an additional network]
29+
* link:https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/hardware_networks/configuring-sriov-net-attach#nw-multus-ipam-object_configuring-sriov-net-attach[Configuration of IP address assignment for a network attachment]

microshift_updating/microshift-update-rpms-manually.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ include::_attributes/attributes-microshift.adoc[]
66

77
toc::[]
88

9-
Updating {product-title} for non-image-based {op-system-base-full} systems requires updating the RPMs. For patch releases, such as 4.19.1 to 4.19.2, simply update the RPMs. For minor-version release updates, add the step of enabling the update repository using your subscription manager.
9+
Updating {product-title} for non-image-based {op-system-base-full} systems requires updating the RPMs. For patch releases, such as 4.20.1 to 4.20.2, simply update the RPMs. For minor-version release updates, add the step of enabling the update repository using your subscription manager.
1010

1111
[NOTE]
1212
====

modules/microshift-adding-service-to-blueprint.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ groups = []
3737

3838
[[packages]]
3939
name = "microshift"
40-
version = "4.19.1" <3>
40+
version = "4.20.1" <3>
4141

4242
[customizations.services]
4343
enabled = ["microshift"]
4444
EOF
4545
----
4646
<1> The name of the TOML file.
4747
<2> The name of the blueprint.
48-
<3> Substitute the value for the version you want. For example, insert `4.19.1` to download the {microshift-short} 4.19.1 RPMs.
48+
<3> Substitute the value for the version you want. For example, insert `4.20.1` to download the {microshift-short} 4.20.1 RPMs.
4949

5050
. Optional. Use the blueprint installed in the `/usr/share/microshift/blueprint` directory that is specific to your platform architecture. See the following example snippet for an explanation of the blueprint sections:
5151
+

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ You can use image builder to create {op-system-ostree} images with embedded {mic
2929
----
3030
$ sudo dnf install -y microshift-release-info-_<release_version>_
3131
----
32-
Replace `_<release_version>_` with the numerical value of the release you are deploying, using the entire version number, such as `4.19.1`.
32+
Replace `_<release_version>_` with the numerical value of the release you are deploying, using the entire version number, such as `4.20.1`.
3333

3434
.. List the contents of the `/usr/share/microshift/release` directory to verify the presence of the release information files by running the following command:
3535
+
@@ -55,12 +55,12 @@ If you installed the `microshift-release-info` RPM, proceed to step 4.
5555
----
5656
$ sudo dnf download microshift-release-info-_<release_version>_ # <1>
5757
----
58-
<1> Replace `_<release_version>_` with the numerical value of the release you are deploying, using the entire version number, such as `4.19.1`.
58+
<1> Replace `_<release_version>_` with the numerical value of the release you are deploying, using the entire version number, such as `4.20.1`.
5959
+
6060
.Example RPM output
6161
[source,terminal,subs="+quotes"]
6262
----
63-
microshift-release-info-4.18.1.-202511101230.p0.g7dc6a00.assembly.4.18.1.el9.noarch.rpm
63+
microshift-release-info-4.20.1.-202512101230.p0.g7dc6a00.assembly.4.20.1.el9.noarch.rpm
6464
----
6565

6666
.. Unpack the RPM package without installing it by running the following command:

modules/microshift-oc-mirror-creating-imageset-config.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ storageConfig:
4343
mirror:
4444
platform: # <1>
4545
channels:
46-
- name: stable-4.19
46+
- name: stable-4.20
4747
type: ocp
4848
operators:
49-
- catalog: registry.redhat.io/redhat/redhat-operator-index:v4.19
49+
- catalog: registry.redhat.io/redhat/redhat-operator-index:v4.20
5050
packages:
5151
- name: serverless-operator
5252
channels:
@@ -72,7 +72,7 @@ storageConfig: <1>
7272
skipTLS: false
7373
mirror:
7474
operators:
75-
- catalog: registry.redhat.io/redhat/redhat-operator-index:v4.19 <3>
75+
- catalog: registry.redhat.io/redhat/redhat-operator-index:v4.20 <3>
7676
packages:
7777
- name: amq-broker-rhel8 <4>
7878
channels:

modules/microshift-updating-rpms-z.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[id="microshift-applying-patch-updates-rpms_{context}"]
77
= Applying patch updates using RPMs
88

9-
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.19.1 to 4.19.2.
9+
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.
1010

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

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,25 @@
77

88
.{op-system-bundle} release compatibility matrix
99

10-
{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. For example, an update of {microshift-short} from 4.14 to 4.16 or an update from 4.18 to 4.19 requires a {op-system-base-full} update. Supported configurations of {op-system-bundle} use verified releases for each together as listed in the following table:
10+
{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. For example, an update of {microshift-short} from 4.14 to 4.16 or an update from 4.19 to 4.20 requires a {op-system-base-full} update. Supported configurations of {op-system-bundle} use verified releases for each together as listed in the following table:
1111

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

18+
^|9.6
19+
^|4.20
20+
^|4.20.0{nbsp}&#8594;{nbsp}4.20.z
21+
1822
^|9.6
1923
^|4.19
20-
^|4.19.0{nbsp}&#8594;{nbsp}4.19.z
24+
^|4.19.0{nbsp}&#8594;{nbsp}4.19.z, 4.19{nbsp}&#8594;{nbsp}4.20
2125

2226
^|9.4
2327
^|4.18
24-
^|4.18.0{nbsp}&#8594;{nbsp}4.18.z, 4.18{nbsp}&#8594;{nbsp}4.19 on {op-system-base} 9.6
28+
^|4.18.0{nbsp}&#8594;{nbsp}4.18.z, 4.18{nbsp}&#8594;{nbsp}4.20 on {op-system-base} 9.6
2529

2630
^|9.4
2731
^|4.17
@@ -31,11 +35,11 @@
3135
^|4.16
3236
^|4.16.0{nbsp}&#8594;{nbsp}4.16.z, 4.16{nbsp}&#8594;{nbsp}4.17, 4.16{nbsp}&#8594;{nbsp}4.18
3337

34-
^|9.2, 9.3
38+
^|9.2
3539
^|4.15
3640
^|4.15.0{nbsp}&#8594;{nbsp}4.15.z, 4.15{nbsp}&#8594;{nbsp}4.16 on {op-system-base} 9.4
3741

38-
^|9.2, 9.3
42+
^|9.2
3943
^|4.14
4044
^|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
4145
|===

0 commit comments

Comments
 (0)