Skip to content

Commit d752d58

Browse files
Merge pull request #78509 from aravipra/OSDOCS-11201
OSDOCS-11201: updates attributes file in MicroShift
2 parents 53f0e34 + bc47a21 commit d752d58

8 files changed

+20
-16
lines changed

_attributes/attributes-microshift.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
:experimental:
55
:imagesdir: images
66
:OCP: OpenShift Container Platform
7-
:ocp-version: 4.16
7+
:ocp-version: 4.17
88
:oc-first: pass:quotes[OpenShift CLI (`oc`)]
99
:product-title-first: Red Hat build of MicroShift (MicroShift)
1010
:microshift-short: MicroShift
1111
:product-registry: OpenShift image registry
12-
:product-version: 4.16
12+
:product-version: 4.17
1313
:rhel-major: rhel-9
1414
:op-system-base-full: Red Hat Enterprise Linux (RHEL)
1515
:op-system: RHEL
@@ -19,6 +19,6 @@
1919
:op-system-version: 9.4
2020
:op-system-version-major: 9
2121
:op-system-bundle: Red Hat Device Edge
22-
:rpm-repo-version: rhocp-4.16
22+
:rpm-repo-version: rhocp-4.17
2323
:rhde-version: 4
2424
:VirtProductName: OpenShift Virtualization

microshift_updating/microshift-about-updates.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ include::_attributes/attributes-microshift.adoc[]
66

77
toc::[]
88

9-
Updates are supported on {product-title} beginning with the General Availability version 4.14. With the 4.16 release, the following updates are supported:
9+
Updates are supported on {product-title} beginning with the General Availability version 4.14. With the 4.17 release, the following updates are supported:
1010

1111
* A maximum of two minor versions to the next in sequence, for example, from 4.14 to 4.16.
12-
* One minor version to the next in sequence, for example, from 4.15 to 4.16.
13-
* Patch updates are also supported from z-stream to z-stream, for example 4.16.1 to 4.16.2.
12+
* One minor version to the next in sequence, for example, from 4.16 to 4.17.
13+
* Patch updates are also supported from z-stream to z-stream, for example 4.17.1 to 4.17.2.
1414
1515
[id="microshift-about-updates-understanding-microshift-updates_{context}"]
1616
== Understanding {microshift-short} updates

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

1111
[IMPORTANT]
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.14 to 4.16 or from 4.16.0 to 4.16.1.
11+
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.
1212

1313
include::snippets/microshift-rhde-compatibility-table-snip.adoc[leveloffset=+1]
1414

modules/microshift-updating-rpms-y.adoc

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@
66
[id="microshift-updating-rpms_{context}"]
77
= Applying minor-version updates with RPMs
88

9-
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.
10-
11-
[IMPORTANT]
12-
====
13-
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.
14-
====
9+
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.
1510

1611
.Prerequisites
1712
* The system requirements for installing {microshift-short} have been met.

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

1111
.Prerequisites
1212
* The system requirements for installing {microshift-short} have been met.

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,15 @@
1616
^|*{microshift-short} Release Status*
1717
^|*Supported {microshift-short} Version→{microshift-short} Version Updates*
1818

19+
^|9.4
20+
^|4.17
21+
^|Generally Available
22+
^|4.17.0→4.17.z and 4.16→4.17
23+
1924
^|9.4
2025
^|4.16
2126
^|Generally Available
22-
^|4.16.0→4.16.z, 4.14→4.16 and 4.15→4.16
27+
^|4.16.0→4.16.z, 4.14→4.16, 4.15→4.16 and 4.16→4.17
2328

2429
^|9.2, 9.3
2530
^|4.15

snippets/microshift-update-paths-snip.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ Before updating {microshift-short} or {op-system}, determine the compatibilities
1212

1313
*{product-title} update paths*
1414

15+
{microshift-short} version 4.17::
16+
* Version 4.17 to 4.17.z on {op-system} or {op-system-ostree} 9.4
17+
1518
{microshift-short} version 4.16::
19+
* Version 4.16 on {op-system} or {op-system-ostree} 9.4 to 4.17 on {op-system} or {op-system-ostree} 9.4
1620
* Version 4.16 to 4.16.z on {op-system} or {op-system-ostree} 9.4
1721

1822
{microshift-short} version 4.15::

0 commit comments

Comments
 (0)