Skip to content

Commit 11664d6

Browse files
committed
OSDOCS-13297: updates attributes and compatibility table in MicroShift
1 parent a2e5bcb commit 11664d6

12 files changed

+36
-43
lines changed

_attributes/attributes-microshift.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
:experimental:
55
:imagesdir: images
66
:OCP: OpenShift Container Platform
7-
:ocp-version: 4.18
7+
:ocp-version: 4.19
88
:oc-first: pass:quotes[OpenShift CLI (`oc`)]
99
//OpenShift Kubernetes Engine
1010
:oke: OpenShift Kubernetes Engine
1111
:product-title-first: Red Hat build of MicroShift (MicroShift)
1212
:microshift-short: MicroShift
1313
:product-registry: OpenShift image registry
14-
:product-version: 4.18
14+
:product-version: 4.19
1515
:rhel-major: rhel-9
1616
:op-system-base-full: Red Hat Enterprise Linux (RHEL)
1717
:op-system-base: RHEL
@@ -20,9 +20,9 @@
2020
:op-system-rt-kernel: Red Hat Enterprise Linux for Real Time (real-time kernel)
2121
:op-system-rtk: real-time kernel
2222
:op-system-image: image mode for RHEL
23-
:op-system-version: 9.4
23+
:op-system-version: 9.6
2424
:op-system-version-major: 9
2525
:op-system-bundle: Red Hat Device Edge
26-
:rpm-repo-version: rhocp-4.18
26+
:rpm-repo-version: rhocp-4.19
2727
:rhde-version: 4
2828
: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.18 server might have additional capabilities that a 4.16 `oc` binary cannot use and a 4.18 `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.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.
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://access.redhat.com/documentation/en-us/openshift_container_platform/4.18/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/networking/multiple-networks#nw-multus-ipam-object_configuring-additional-network[Configuration of IP address assignment for an additional network]

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-OSTree systems such as {op-system-base-full} requires updating the RPMs. For patch releases, such as 4.18.1 to 4.18.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-OSTree systems such as {op-system-base-full} 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.
1010

1111
[NOTE]
1212
====

microshift_updating/microshift-update-rpms-ostree.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ toc::[]
88

99
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.
1010

11-
The procedures are the same for minor-version and patch updates. For example, use the same steps to upgrade from 4.17 to 4.18 or from 4.18.2 to 4.18.3.
11+
The procedures are the same for minor-version and patch updates. For example, use the same steps to upgrade from 4.18 to 4.19 or from 4.19.2 to 4.19.3.
1212

1313
[NOTE]
1414
====

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.18.1" <3>
40+
version = "4.19.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.18.1` to download the {microshift-short} 4.18.1 RPMs.
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.
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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ You can use image builder to create {op-system-ostree} images with embedded {mic
2525

2626
.. Install the `microshift-release-info` RPM package by running the following command:
2727
+
28-
[source,terminal]
28+
[source,terminal,subs="+quotes"]
2929
----
30-
$ sudo dnf install -y microshift-release-info-<release_version>
30+
$ 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.18.1`.
32+
Replace `_<release_version>_` with the numerical value of the release you are deploying, using the entire version number, such as `4.19.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,7 +55,7 @@ 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.18.1`.
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`.
5959
+
6060
.Example RPM output
6161
[source,terminal,subs="+quotes"]

modules/microshift-install-rpms.adoc

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,30 @@ Use the following procedure to install {microshift-short} from an RPM package.
2020
[source,terminal,subs="attributes+"]
2121
----
2222
$ sudo subscription-manager repos \
23-
--enable rhocp-<4.18>-for-<9>-$(uname -m)-rpms \ # <1>
24-
--enable fast-datapath-for-<9>-$(uname -m)-rpms # <2>
23+
--enable rhocp-_<4.19>_-for-_<9>_-$(uname -m)-rpms \ # <1>
24+
--enable fast-datapath-for-_<9>_-$(uname -m)-rpms # <2>
2525
----
26-
<1> Replace _<4.18>_ and _<9>_ with the compatible versions of your {microshift-short} and {op-system-base-full}.
27-
<2> Replace _<9>_ with the compatible version of {op-system-base}.
26+
<1> Replace `_<4.19>_` and `_<9>_` with the compatible versions of your {microshift-short} and {op-system-base-full}.
27+
<2> Replace `_<9>_` with the compatible version of {op-system-base}.
2828

2929
. For extended support (EUS) releases, also enable the EUS repositories by running the following command:
3030
+
31-
[source,terminal]
31+
[source,terminal,subs="+quotes"]
3232
----
3333
`$ sudo subscription-manager repos \
34-
--enable rhel-<9>-for-x86_64-appstream-eus-rpms \ # <1>
35-
--enable rhel-<9>-for-x86_64-baseos-eus-rpms` # <2>
34+
--enable rhel-_<9>_-for-x86_64-appstream-eus-rpms \ # <1>
35+
--enable rhel-_<9>_-for-x86_64-baseos-eus-rpms` # <2>
3636
----
37-
<1> Replace _<9>_ with the compatible major version number of {op-system-base}.
38-
<2> Replace _<9>_ with the compatible major version number of {op-system-base}.
37+
<1> Replace `_<9>_` with the compatible major version number of {op-system-base}.
38+
<2> Replace `_<9>_` with the compatible major version number of {op-system-base}.
3939

4040
. Avoid unintended future updates into an unsupported configuration by locking your operating system version with the following command:
4141
+
42-
[source,terminal]
42+
[source,terminal,subs="+quotes"]
4343
----
44-
$ sudo subscription-manager release --set=<9.4> command. # <1>
44+
$ sudo subscription-manager release --set=_<9.6>_ command. # <1>
4545
----
46-
<1> Replace _<9.4>_ with the major and minor version of your compatible {op-system-base} system.
46+
<1> Replace `_<9.6>_` with the major and minor version of your compatible {op-system-base} system.
4747

4848
. Install {microshift-short} by running the following command:
4949
+

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.18
46+
- name: stable-4.19
4747
type: ocp
4848
operators:
49-
- catalog: registry.redhat.io/redhat/redhat-operator-index:v4.18
49+
- catalog: registry.redhat.io/redhat/redhat-operator-index:v4.19
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.18 <3>
75+
- catalog: registry.redhat.io/redhat/redhat-operator-index:v4.19 <3>
7676
packages:
7777
- name: amq-broker-rhel8 <4>
7878
channels:

modules/microshift-updates-troubleshooting.adoc

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,6 @@ Check the following compatibility table:
2222

2323
include::snippets/microshift-rhde-compatibility-table-snip.adoc[leveloffset=+2]
2424

25-
[id="microshift-version-compatibility_{context}"]
26-
=== Version compatibility
27-
Check the following update paths:
28-
29-
*{product-title} update paths*
30-
31-
* Generally Available Version 4.18.0 to 4.18.z on {op-system-base} 9.4
32-
* Generally Available Version 4.17.1 to 4.17.z on {op-system-base} 9.4
33-
* Generally Available Version 4.15.0 from {op-system-base} 9.2 to 4.16.0 on {op-system-base} 9.4
34-
* Generally Available Version 4.14.0 from {op-system-base} 9.2 to 4.15.0 on {op-system-base} 9.4
35-
3625
[id="microshift-ostree-update-failed_{context}"]
3726
== OSTree update failed
3827
If you updated on an OSTree system, the Greenboot health check automatically logs and acts on system health. A failure can be indicated by a system rollback by Greenboot. In cases where the update failed, but Greenboot did not complete a system rollback, you can troubleshoot using the {op-system-ostree} documentation linked in the "Additional resources" section that follows this content.

0 commit comments

Comments
 (0)