Skip to content

Commit 174e023

Browse files
authored
Merge pull request #69980 from ShaunaDiaz/OSDOCS-9287
OSDOCS-9287: revise install books RHEL versions MicroShift
2 parents 9937e12 + e8cfb25 commit 174e023

5 files changed

+33
-11
lines changed

microshift_install/microshift-embed-in-rpm-ostree-offline-use.adoc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@ toc::[]
88

99
Embedding {microshift-short} containers in an `rpm-ostree` commit means that you can run a cluster in air-gapped, disconnected, or offline environments. You can embed {product-title} containers in a {op-system-ostree-first} image so that container engines do not need to pull images over a network from a container registry. Workloads can start up immediately without network connectivity.
1010

11+
include::modules/microshift-install-system-requirements.adoc[leveloffset=+1]
12+
13+
[id="embed-offline-rhde-compatibility-table"]
14+
== Compatibility table
15+
16+
Plan to pair a supported version of {op-system-ostree} with the {microshift-short} version you are using as described in the following compatibility table:
17+
18+
include::snippets/microshift-rhde-compatibility-table-snip.adoc[leveloffset=+1]
19+
1120
include::modules/microshift-embed-microshift-image-offline-deploy.adoc[leveloffset=+1]
1221

1322
include::modules/microshift-embed-microshift-update-osbuilder-worker.adoc[leveloffset=+1]

microshift_install/microshift-embed-in-rpm-ostree.adoc

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

77
toc::[]
88

9-
You can embed {microshift-short} into a {op-system-ostree-first} {op-system-version} image. Use this guide to build a {op-system} image containing {microshift-short}.
9+
You can embed {microshift-short} into a {op-system-ostree-first} image. Use this guide to build a {op-system} image containing {microshift-short}.
10+
11+
include::modules/microshift-install-system-requirements.adoc[leveloffset=+1]
12+
13+
Plan to use a supported version of {op-system} paired with your version of {microshift-short} as described in the following table.
14+
15+
[id="embed-ostree-rhde-compatibility-table"]
16+
== Compatibility table
17+
18+
Plan to pair a supported version of {op-system-ostree} with the {microshift-short} version you are using as described in the following compatibility table:
19+
20+
include::snippets/microshift-rhde-compatibility-table-snip.adoc[leveloffset=+1]
1021

1122
include::modules/microshift-preparing-for-image-building.adoc[leveloffset=+1]
1223

microshift_install/microshift-install-rpm.adoc

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

77
toc::[]
88

9-
You can install {microshift-short} from an RPM package on a machine with {op-system-base-full} {op-system-version}.
9+
You can install {microshift-short} from an RPM package on a machine with a supported version of {op-system-base-full}.
1010

1111
include::modules/microshift-install-system-requirements.adoc[leveloffset=+1]
1212

13+
[id="install-rpm-rhde-compatibility-table"]
14+
== Compatibility table
15+
16+
Plan to pair a supported version of {op-system-ostree} with the {microshift-short} version you are using as described in the following compatibility table:
17+
18+
include::snippets/microshift-rhde-compatibility-table-snip.adoc[leveloffset=+1]
19+
1320
include::modules/microshift-install-rpm-before.adoc[leveloffset=+1]
1421

1522
//additional resources for install rpm before module

modules/microshift-install-system-requirements.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
The following conditions must be met prior to installing {microshift-short}:
1010

11-
* {op-system} {op-system-version}
12-
* 2 CPU cores
13-
* 2 GB RAM for {microshift-short} or 3 GB RAM, required by {op-system} for networked-based HTTPs or FTP installations
14-
* 10 GB of storage
11+
* A supported version of {op-system} or {op-system-ostree}.
12+
* 2 CPU cores.
13+
* 2 GB RAM for {microshift-short} or 3 GB RAM, required by {op-system} for networked-based HTTPs or FTP installations.
14+
* 10 GB of storage.
1515
* You have an active {microshift-short} subscription on your Red Hat account. If you do not have a subscription, contact your sales representative for more information.
1616
* You have a Logical Volume Manager (LVM) Volume Group (VG) with sufficient capacity for the Persistent Volumes (PVs) of your workload.

modules/microshift-preparing-for-image-building.adoc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@
88

99
Read link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/composing_installing_and_managing_rhel_for_edge_images[Composing, installing, and managing RHEL for Edge images].
1010

11-
[IMPORTANT]
12-
====
13-
{microshift-short} {ocp-version} deployments have only been tested with {op-system-ostree-first} {op-system-version}. Other versions of {op-system} are not supported.
14-
====
15-
1611
To build an {op-system-ostree-first} {op-system-version} image for a given CPU architecture, you need a {op-system} {op-system-version} build host of the same CPU architecture that meets the link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/composing_installing_and_managing_rhel_for_edge_images/setting-up-image-builder_composing-installing-managing-rhel-for-edge-images#edge-image-builder-system-requirements_setting-up-image-builder[Image Builder system requirements].
1712

1813
Follow the instructions in link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/composing_installing_and_managing_rhel_for_edge_images/setting-up-image-builder_composing-installing-managing-rhel-for-edge-images#edge-installing-image-builder_setting-up-image-builder[Installing Image Builder] to install Image Builder and the `composer-cli` tool.

0 commit comments

Comments
 (0)