From f325fa080c853872866d05570dd55eafeeadabe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CShauna=20Diaz=E2=80=9D?= Date: Thu, 16 Mar 2023 12:50:18 -0400 Subject: [PATCH] [enterprise-4.13] Manual CP for OSDOCS-5507: Moving up attributes and versions for 4.13 --- .../microshift-embed-in-rpm-ostree.adoc | 30 +++++-------------- .../microshift-networking.adoc | 6 ---- .../microshift-troubleshooting.adoc | 2 +- ...roshift-adding-repos-to-image-builder.adoc | 10 +++---- modules/microshift-installing-from-rpm.adoc | 2 +- ...croshift-preparing-for-image-building.adoc | 12 ++++++-- 6 files changed, 23 insertions(+), 39 deletions(-) diff --git a/microshift_install/microshift-embed-in-rpm-ostree.adoc b/microshift_install/microshift-embed-in-rpm-ostree.adoc index fac47c3cde..6a48383a43 100644 --- a/microshift_install/microshift-embed-in-rpm-ostree.adoc +++ b/microshift_install/microshift-embed-in-rpm-ostree.adoc @@ -6,37 +6,21 @@ include::_attributes/attributes-microshift.adoc[] toc::[] -You can embed {product-title} into a {op-system-ostree-first} {op-system-version} image. Use the content within this section to build a {op-system} image containing {product-title}. +You can embed {product-title} into a {op-system-ostree-first} {op-system-version} image. Use this guide to build a {op-system} image containing {product-title}. include::snippets/microshift-tech-preview-snip.adoc[leveloffset=+1] - -[id="preparing-for-image-building_{context}"] -== Preparing for image building - -Familiarize yourself with the documentation about 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]. - -[IMPORTANT] -==== -{product-title} deployments have only been tested with {op-system-ostree-first} {op-system-version}. Other versions of {op-system} are not recommended. -==== - -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 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]. - -Follow the instructions in 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. - -//include::modules/microshift-preparing-for-image-building.adoc[leveloffset=+1] - +include::modules/microshift-preparing-for-image-building.adoc[leveloffset=+1] include::modules/microshift-adding-repos-to-image-builder.adoc[leveloffset=+1] -[role="_additional-resources_microshift-embed-in-rpm-ostree"] +[role="_additional-resources"] .Additional resources -* 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]. -* 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]. +* 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]. +* 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]. include::modules/microshift-adding-service-to-blueprint.adoc[leveloffset=+2] -[role="_additional-resources_microshift-embed-in-rpm-ostree"] +[role="_additional-resources"] .Additional resources * For further customizations such as adding users, firewall rules, or kernel arguments to a blueprint, refer to link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/composing_installing_and_managing_rhel_for_edge_images/composing-a-rhel-for-edge-image-using-image-builder-command-line_composing-installing-managing-rhel-for-edge-images#image-customizations_composing-a-rhel-for-edge-image-using-image-builder-command-line[supported image customizations]. @@ -44,7 +28,7 @@ include::modules/microshift-adding-service-to-blueprint.adoc[leveloffset=+2] //include::modules/microshift-adding-containers-to-blueprint.adoc[leveloffset=+2] include::modules/microshift-provisioning-ostree.adoc[leveloffset=+1] -[role="_additional-resources_microshift-embed-in-rpm-ostree"] +[role="_additional-resources"] .Additional resources * link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html-single/composing_installing_and_managing_rhel_for_edge_images/index[{op-system-ostree} documentation]. diff --git a/microshift_networking/microshift-networking.adoc b/microshift_networking/microshift-networking.adoc index 42fd662d83..def9d68cf7 100644 --- a/microshift_networking/microshift-networking.adoc +++ b/microshift_networking/microshift-networking.adoc @@ -29,9 +29,3 @@ include::modules/microshift-http-proxy.adoc[leveloffset=+1] include::modules/microshift-cri-o-container-runtime.adoc[leveloffset=+1] include::modules/microshift-ovs-snapshot.adoc[leveloffset=+1] include::modules/microshift-mDNS.adoc[leveloffset=+1] - -[role="_additional-resources"] -[id="additional-resources_microshift-understanding-networking-settings"] -.Additional resources - -* xref:../microshift_release_notes/microshift-4-13-release-notes.adoc#microshift-4-13-known-issues[{product-title} {product-version} release notes --> Known issues] diff --git a/microshift_troubleshooting/microshift-troubleshooting.adoc b/microshift_troubleshooting/microshift-troubleshooting.adoc index 3c482cd4ee..0cbfa58646 100644 --- a/microshift_troubleshooting/microshift-troubleshooting.adoc +++ b/microshift_troubleshooting/microshift-troubleshooting.adoc @@ -15,4 +15,4 @@ toc::[] //include::modules/microshift-troubleshooting-nodeport.adoc[leveloffset=+1] //include::modules/microshift-ki-cni-iptables-deleted.adoc[leveloffset=+1] //include::modules/microshift-nodeport-unreachable-workaround.adoc[leveloffset=+1] -//include::modules/microshift-nodeport-unreachable-workaround.adoc[leveloffset=+1] +//these two issues were resolved in 4.12 and 4.13; in 4.13, this last module was moved to KIs in the release notes and assembly in Troubleshooting removed diff --git a/modules/microshift-adding-repos-to-image-builder.adoc b/modules/microshift-adding-repos-to-image-builder.adoc index fe5a53ad49..34d4ea1836 100644 --- a/modules/microshift-adding-repos-to-image-builder.adoc +++ b/modules/microshift-adding-repos-to-image-builder.adoc @@ -20,8 +20,8 @@ Use the following procedure to add the {product-title} repositories to Image Bui [source,terminal,subs="attributes+"] ---- $ sudo subscription-manager repos - --enable rhocp-{product-version}-for-rhel-{op-system-version-major}-$(uname -i)-rpms - --enable fast-datapath-for-rhel-{op-system-version-major}-$(uname -i)-rpms + --enable rhocp-{ocp-version}-for-{rhel-major}-$(uname -i)-rpms + --enable fast-datapath-for-{rhel-major}-$(uname -i)-rpms ---- . Install the `reposync` and `createrepo` tools by running the following command: @@ -36,9 +36,9 @@ $ sudo yum install -y yum-utils [source,terminal,subs="attributes+"] ---- $ sudo reposync --arch=$(uname -i) --arch=noarch --gpgcheck \ - --download-path /var/repos/microshift-local \ - --repo=rhocp-{product-version}-for-rhel-{op-system-version-major}-$(uname -i)-rpms \ - --repo=fast-datapath-for-rhel-{op-system-version-major}-$(uname -i)-rpms + --download-path REPO_PATH=/var/repos/microshift-local \ + --repo=rhocp-{ocp-version}-for-{rhel-major}-$(uname -i)-rpms \ + --repo=fast-datapath-for-{rhel-major}-$(uname -i)-rpms ---- . Remove `coreos` packages to avoid conflicts by running the following command: diff --git a/modules/microshift-installing-from-rpm.adoc b/modules/microshift-installing-from-rpm.adoc index 43e5de449c..c4a78ad787 100644 --- a/modules/microshift-installing-from-rpm.adoc +++ b/modules/microshift-installing-from-rpm.adoc @@ -20,7 +20,7 @@ Use the following procedure to install {product-title} from an RPM package. [source,terminal,subs="attributes+"] ---- $ sudo subscription-manager repos \ - --enable rhocp-{product-version}-for-rhel-8-$(uname -i)-rpms \ + --enable rhocp-{ocp-version}-for-{rhel-major}-$(uname -i)-rpms \ --enable fast-datapath-for-{rhel-major}-$(uname -i)-rpms ---- diff --git a/modules/microshift-preparing-for-image-building.adoc b/modules/microshift-preparing-for-image-building.adoc index 6bd974ea1d..303ea962ed 100644 --- a/modules/microshift-preparing-for-image-building.adoc +++ b/modules/microshift-preparing-for-image-building.adoc @@ -6,8 +6,14 @@ [id="preparing-for-image-building_{context}"] = Preparing for image building -Familiarize yourself with the documentation on https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/composing_installing_and_managing_rhel_for_edge_images[Composing, installing, and managing RHEL for Edge images]. +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]. -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 https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/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]. +//[IMPORTANT] +//==== +//{product-title} deployments have only been tested with {op-system-ostree-first} {op-system-version}. Other versions of {op-system} are not recommended. +//==== +//Can update this note as needed, but this is no longer correct for 4.13 -Follow the instructions in https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/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. +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]. + +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.