From 758fb357b334d13dbe0985c4d67a94155f479cd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CShauna=20Diaz=E2=80=9D?= Date: Thu, 11 May 2023 15:56:45 -0400 Subject: [PATCH] OSDOCS-6002-2: various nits MicroShift 4-13 --- microshift_configuring/microshift-using-config-tools.adoc | 1 + microshift_install/microshift-install-rpm.adoc | 6 ++++++ modules/microshift-accessing-cluster-remotely.adoc | 4 +--- modules/microshift-kubeconfig-local-access.adoc | 2 +- modules/microshift-kubeconfig-remote-con.adoc | 1 + welcome/index.adoc | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/microshift_configuring/microshift-using-config-tools.adoc b/microshift_configuring/microshift-using-config-tools.adoc index f3e7647d42..c8f77a24a6 100644 --- a/microshift_configuring/microshift-using-config-tools.adoc +++ b/microshift_configuring/microshift-using-config-tools.adoc @@ -9,4 +9,5 @@ toc::[] A YAML file customizes {product-title} instances with your preferences, settings, and parameters. include::modules/microshift-config-yaml.adoc[leveloffset=+1] + include::modules/microshift-config-nodeport-limits.adoc[leveloffset=+1] \ No newline at end of file diff --git a/microshift_install/microshift-install-rpm.adoc b/microshift_install/microshift-install-rpm.adoc index 4e27fafee3..abd5e83764 100644 --- a/microshift_install/microshift-install-rpm.adoc +++ b/microshift_install/microshift-install-rpm.adoc @@ -11,7 +11,9 @@ You can install {product-title} from an RPM package on a machine with {op-system include::snippets/microshift-tech-preview-snip.adoc[leveloffset=+1] include::modules/microshift-install-system-requirements.adoc[leveloffset=+1] + include::modules/microshift-install-rpm-before.adoc[leveloffset=+1] + include::modules/microshift-install-rpm-preparing.adoc[leveloffset=+1] [role="_additional-resources"] @@ -30,7 +32,9 @@ include::modules/microshift-install-rpms.adoc[leveloffset=+1] * xref:../microshift_install/microshift-install-rpm.adoc#microshift-install-rpm-preparing_microshift-install-rpm[Preparing to install MicroShift from an RPM package]. include::modules/microshift-service-starting.adoc[leveloffset=+1] + include::modules/microshift-service-stopping.adoc[leveloffset=+1] + include::modules/microshift-accessing.adoc[leveloffset=+1] [role="_additional-resources"] @@ -38,7 +42,9 @@ include::modules/microshift-accessing.adoc[leveloffset=+1] * xref:../microshift_cli_ref/microshift-oc-cli-install.adoc#microshift-oc-cli-install[Installing the OpenShift CLI tool]. include::modules/microshift-accessing-cluster-locally.adoc[leveloffset=+2] + include::modules/microshift-accessing-cluster-open-firewall.adoc[leveloffset=+2] + include::modules/microshift-accessing-cluster-remotely.adoc[leveloffset=+2] //note: additional resources are deliberately set without ID and context so that they trail modules; these are not intended to appear as assembly-level additional resources \ No newline at end of file diff --git a/modules/microshift-accessing-cluster-remotely.adoc b/modules/microshift-accessing-cluster-remotely.adoc index 1947f42107..8eab627c5f 100644 --- a/modules/microshift-accessing-cluster-remotely.adoc +++ b/modules/microshift-accessing-cluster-remotely.adoc @@ -48,9 +48,7 @@ Use the following procedure to access the {product-title} cluster from a remote $ chmod go-r ~/.kube/config ---- -.Verify {product-title} is running - -. As `user@workstation`, verify that {product-title} is running by running the following command: +. As `user@workstation`, verify that {product-title} is running by entering the following command: + [source,terminal] ---- diff --git a/modules/microshift-kubeconfig-local-access.adoc b/modules/microshift-kubeconfig-local-access.adoc index 0a6443f788..234029111d 100644 --- a/modules/microshift-kubeconfig-local-access.adoc +++ b/modules/microshift-kubeconfig-local-access.adoc @@ -6,7 +6,7 @@ [id="microshift-kubeconfig-local-access_{context}"] = Local access kubeconfig file -The local access `kubeconfig` file is written to`/var/lib/microshift/resources/kubeadmin/kubeconfig`. This `kubeconfig` file provides access to the API server using `localhost`. Choose this file when you are connecting the cluster locally. +The local access `kubeconfig` file is written to `/var/lib/microshift/resources/kubeadmin/kubeconfig`. This `kubeconfig` file provides access to the API server using `localhost`. Choose this file when you are connecting the cluster locally. .Example contents of `kubeconfig` for local access [source,yaml] diff --git a/modules/microshift-kubeconfig-remote-con.adoc b/modules/microshift-kubeconfig-remote-con.adoc index 665c2d6119..44ca66fc5e 100644 --- a/modules/microshift-kubeconfig-remote-con.adoc +++ b/modules/microshift-kubeconfig-remote-con.adoc @@ -19,6 +19,7 @@ clusters: server: https://microshift-rhel9:6443 ---- +//line space was not showing on PV1 preview, so added extra blank line [id="remote-access-customization_{context}"] == Remote access customization Multiple remote access `kubeconfig` file values can be generated for accessing the cluster with different IP addresses or host names. An additional `kubeconfig` file generates for each entry in the `apiServer.subjectAltNames` parameter. You can copy remote access `kubeconfig` files from the host during times of IP connectivity and then use them to access the API server from other workstations. diff --git a/welcome/index.adoc b/welcome/index.adoc index 3f4a506a51..9ef33932b0 100644 --- a/welcome/index.adoc +++ b/welcome/index.adoc @@ -57,7 +57,7 @@ Next, view the xref:../microshift_release_notes/microshift-4-13-release-notes.ad * For information about Red Hat Device Edge, read the link:https://access.redhat.com/documentation/en-us/red_hat_device_edge/4/html/overview/device-edge-overview[Red Hat Device Edge overview]. * For information about Red Hat Enterprise Linux for Edge, read link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/composing_installing_and_managing_rhel_for_edge_images/index[RHEL for Edge documentation]. -* For documentation that is not specific to {product-title}, read link:https://docs.openshift.com/container-platform/latest/welcome/index.html[{product-title} documentation]. +* For container platform documentation that is not specific to {product-title}, read link:https://docs.openshift.com/container-platform/latest/welcome/index.html[OpenShift Container Platform documentation]. endif::[] ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]