Skip to content

Commit 39adf27

Browse files
committed
OSDOCS-11278: updates oc table and other fixes MicroShift
1 parent 18c5c1a commit 39adf27

10 files changed

+44
-43
lines changed

microshift_cli_ref/microshift-cli-tools-introduction.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
:_mod-docs-content-type: ASSEMBLY
22
[id="microshift-cli-tools"]
3-
= {product-title} CLI tools introduction
3+
= {microshift-short} CLI tools introduction
44
include::_attributes/attributes-microshift.adoc[]
55
:context: microshift-cli-tools-introduction
66

77
toc::[]
88

9-
You can use different command-line interface (CLI) tools to build, deploy, and manage {product-title} clusters and workloads. With CLI tools, you can complete various administration and development operations from the terminal to manage deployments and interact with each component of the system.
9+
You can use different command-line interface (CLI) tools to build, deploy, and manage a {microshift-short} cluster and workloads. With CLI tools, you can complete various administration and development operations from the terminal to manage deployments and interact with each component of the system.
1010

11-
CLI tools available for use with {product-title} are the following:
11+
CLI tools available for use with {microshift-short} are the following:
1212

1313
* Kubernetes CLI (`kubectl`)
1414
* The {oc-first} tool with an enabled subset of commands
@@ -23,7 +23,7 @@ Commands for multi-node deployments, projects, and developer tooling are not sup
2323
[id="additional-resources_microshift-cli-tools"]
2424
== Additional resources
2525

26-
* xref:..//microshift_cli_ref/microshift-oc-cli-install.adoc#microshift-oc-cli-install[Installing the OpenShift CLI tool for MicroShift].
27-
* link:https://access.redhat.com/documentation/en-us/openshift_container_platform/4.16/html/cli_tools/openshift-cli-oc[Detailed description of the OpenShift CLI (oc)].
28-
* link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9[Red Hat Enterprise Linux (RHEL) documentation for specific use cases].
26+
* xref:..//microshift_cli_ref/microshift-oc-cli-install.adoc#microshift-oc-cli-install[Getting started with the OpenShift CLI]
27+
* link:https://docs.redhat.com/en/documentation/openshift_container_platform/4.16/html/cli_tools/openshift-cli-oc#cli-about-cli_cli-developer-commands[About the OpenShift CLI] (OpenShift Container Platform documentation)
28+
* link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9[Red Hat Enterprise Linux (RHEL) documentation for specific use cases]
2929
* xref:../microshift_configuring/microshift-cluster-access-kubeconfig.adoc#microshift-kubeconfig[Cluster access with kubeconfig]

microshift_cli_ref/microshift-cli-using-oc.adoc

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

77
toc::[]
88

9-
The optional OpenShift CLI (`oc`) tool provides a subset of `oc` commands for {product-title} deployments. Using `oc` is convenient if you are familiar with {OCP} and Kubernetes.
9+
The optional {oc-first} tool provides a subset of `oc` commands for {microshift-short} deployments. Using `oc` is convenient if you are familiar with {OCP} and Kubernetes.
1010

1111
include::modules/microshift-cli-oc-about.adoc[leveloffset=+1]
1212

1313
[id="cli-using-cli_{context}"]
14-
== Using the OpenShift CLI in {product-title}
14+
== Using oc with a {microshift-short} cluster
1515

16-
Review the following sections to learn how to complete common tasks in {product-title} using the `oc` CLI.
16+
Review the following sections to learn how to complete common tasks in {microshift-short} using the `oc` CLI.
1717

1818
[id="viewing-pods_{context}"]
1919
=== Viewing pods

microshift_cli_ref/microshift-oc-cli-commands-list.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-
Descriptions and example commands for OpenShift CLI (`oc`) commands are included in this reference document. You must have `cluster-admin` or equivalent permissions to use these commands. To list administrator commands and information about them, use the following commands:
9+
Descriptions and example commands for {oc-first} commands are included in this reference document. You must have `cluster-admin` or equivalent permissions to use these commands. To list administrator commands and information about them, use the following commands:
1010

1111
* Enter the `oc adm -h` command to list all administrator commands:
1212
+

microshift_cli_ref/microshift-oc-cli-install.adoc

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

77
toc::[]
88

9-
To use the OpenShift CLI (`oc`) tool, you must download and install it separately from your {microshift-short} installation.
10-
11-
[id="installing-the-openshift-cli"]
12-
== Installing the OpenShift CLI
13-
14-
You can install the OpenShift CLI (`oc`) either by downloading the binary or by using Homebrew.
9+
To use the {oc-first} tool, you must download and install it separately from your {microshift-short} installation. You can install `oc` by downloading the binary or by using Homebrew.
1510

1611
// Installing the CLI by downloading the binary
17-
include::modules/cli-installing-cli.adoc[leveloffset=+2]
12+
include::modules/cli-installing-cli.adoc[leveloffset=+1]
1813

1914
// Installing the CLI by using Homebrew
20-
include::modules/cli-installing-cli-brew.adoc[leveloffset=+2]
15+
include::modules/cli-installing-cli-brew.adoc[leveloffset=+1]
2116

2217
// Installing the CLI using RPM
23-
include::modules/cli-installing-cli-rpm.adoc[leveloffset=+2]
18+
include::modules/cli-installing-cli-rpm.adoc[leveloffset=+1]

microshift_cli_ref/microshift-oc-config.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-
Configure `oc` based on your preferences for working with it.
9+
Configure {oc-first} based on your preferences for working with it.
1010

1111
[id="cli-enabling-tab-completion"]
1212
== Enabling tab completion

microshift_cli_ref/microshift-usage-oc-kubectl.adoc

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

77
toc::[]
88

9-
The Kubernetes command-line interface (CLI), `kubectl`, can be used to run commands against a Kubernetes cluster. Because {product-title} is a certified Kubernetes distribution, you can use the supported `kubectl` CLI tool that ships with {product-title}, or you can gain extended functionality by using the `oc` CLI tool.
9+
The Kubernetes command-line interface (CLI), `kubectl`, can be used to run commands against a Kubernetes cluster. Because {microshift-short} is a certified Kubernetes distribution, you can use the supported `kubectl` CLI tool or you can gain extended functionality by using the {oc-first}.
1010

1111
[id="microshift-kubectl-binary_{context}"]
1212
== The kubectl CLI tool
1313

14-
You can use the `kubectl` CLI tool to interact with Kubernetes primitives on your {product-title} cluster. You can also use existing `kubectl` workflows and scripts for new {product-title} users coming from another Kubernetes environment, or for those who prefer to use the `kubectl` CLI.
14+
You can use the `kubectl` CLI tool to interact with Kubernetes primitives on your {microshift-short} cluster. You can also use existing `kubectl` workflows and scripts for users coming from another Kubernetes environment, or for those who prefer to use the `kubectl` CLI.
1515

16-
The `kubectl` CLI tool is included in the archive if you download the `oc` CLI tool.
16+
* The `kubectl` CLI tool is included in the archive when you download `oc`.
1717

18-
For more information, read the link:https://kubernetes.io/docs/reference/kubectl/overview/[Kubernetes CLI tool documentation].
18+
* For more information, see the link:https://kubernetes.io/docs/reference/kubectl/overview/[Kubernetes CLI tool documentation].
1919

2020
[id="microshift-oc-binary_{context}"]
2121
== The oc CLI tool
2222

23-
The `oc` CLI tool offers the same capabilities as the `kubectl` CLI tool, but it extends to natively support additional {product-title} features, including:
23+
The `oc` CLI tool offers the same capabilities as the `kubectl` CLI tool, but it extends to natively support additional {OCP} features, including:
2424

2525
* **Route resource**
2626
+
27-
The `Route` resource object is specific to {product-title} distributions, and builds upon standard Kubernetes primitives.
27+
The `Route` resource object is specific to {OCP} distributions, and builds upon standard Kubernetes primitives.
2828
+
2929
* **Additional commands**
3030
+
3131
The additional command `oc new-app`, for example, makes it easier to get new applications started using existing source code or pre-built images.
3232

3333
[IMPORTANT]
3434
====
35-
If you installed an earlier version of the `oc` CLI tool, you cannot use it to complete all of the commands in {product-title} {ocp-version}. If you want the latest features, you must download and install the latest version of the `oc` CLI tool corresponding to your {product-title} version.
35+
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-
Non-security API changes will involve, at minimum, two minor releases (4.1 to 4.2 to 4.3, for example) to allow older `oc` binaries to update. Using new capabilities might require newer `oc` binaries. A 4.3 server might have additional capabilities that a 4.2 `oc` binary cannot use and a 4.3 `oc` binary might have additional capabilities that are unsupported by a 4.2 server.
38+
Using new capabilities often requires the latest `oc` binary. A 4.17 server might have additional capabilities that a 4.12 `oc` binary cannot use and a 4.17 `oc` binary might have additional capabilities that are unsupported by a 4.13 server.
3939

4040
.Compatibility Matrix
4141

@@ -47,16 +47,11 @@ Non-security API changes will involve, at minimum, two minor releases (4.1 to 4.
4747
|*X.Y+N* footnote:versionpolicyn[Where *N* is a number greater than or equal to 1.] (`oc` Client)
4848

4949
|*X.Y* (Server)
50-
|image:redcircle-1.png[]
51-
|image:redcircle-3.png[]
50+
|Fully compatible.
51+
|The `oc` CLI tool might provide options and features that are not compatible with the accessed server.
5252

5353
|*X.Y+N* footnote:versionpolicyn[] (Server)
54-
|image:redcircle-2.png[]
55-
|image:redcircle-1.png[]
54+
|The `oc` CLI tool might not be able to access server features.
55+
|Fully compatible.
5656

5757
|===
58-
image:redcircle-1.png[] Fully compatible.
59-
60-
image:redcircle-2.png[] `oc` client might not be able to access server features.
61-
62-
image:redcircle-3.png[] `oc` client might provide options and features that might not be compatible with the accessed server.

modules/cli-installing-cli-brew.adoc

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,18 @@ For macOS, you can install the OpenShift CLI (`oc`) by using the link:https://br
1515
1616
.Procedure
1717

18-
* Run the following command to install the link:https://formulae.brew.sh/formula/openshift-cli[openshift-cli] package:
18+
* Install the link:https://formulae.brew.sh/formula/openshift-cli[openshift-cli] package by running the following command:
1919
+
2020
[source,terminal]
2121
----
2222
$ brew install openshift-cli
2323
----
24+
25+
.Verification
26+
27+
* Verify your installation by using an `oc` command:
28+
29+
[source,terminal]
30+
----
31+
$ oc <command>
32+
----

modules/cli-installing-cli-rpm.adoc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ ifdef::openshift-rosa[]
1313
endif::openshift-rosa[]
1414
subscription on your Red Hat account.
1515

16-
[NOTE]
16+
[IMPORTANT]
1717
====
18-
It is not supported to install the OpenShift CLI (`oc`) as an RPM for {op-system-base-full} 9. You must install the OpenShift CLI for {op-system-base} 9 by downloading the binary.
18+
You must install `oc` for {op-system-base} 9 by downloading the binary. Installing `oc` by using an RPM package is not supported on {op-system-base-full} 9.
1919
====
2020

2121
.Prerequisites
@@ -79,7 +79,9 @@ endif::openshift-rosa[]
7979
# yum install openshift-clients
8080
----
8181

82-
After you install the CLI, it is available using the `oc` command:
82+
.Verification
83+
84+
* Verify your installation by using an `oc` command:
8385
8486
[source,terminal]
8587
----

modules/cli-installing-cli.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ $ echo $PATH
230230

231231
.Verification
232232

233-
* After you install the OpenShift CLI, it is available using the `oc` command:
233+
* Verify your installation by using an `oc` command:
234234
+
235235
[source,terminal]
236236
----

modules/microshift-oc-apis-errors.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[id="microshift-oc-apis-errors_{context}"]
77
= oc command errors in {product-title}
88

9-
Not all OpenShift CLI (oc) tool commands are relevant for {product-title} deployments. When you use `oc` to make a request call against an unsupported API, the `oc` binary usually generates an error message about a resource that cannot be found.
9+
Not all {oc-first} commands are relevant for {microshift-short} deployments. When you use `oc` to make a request call against an unsupported API, the `oc` binary usually generates an error message about a resource that cannot be found.
1010

1111
.Example output
1212

0 commit comments

Comments
 (0)