Skip to content

Commit 6aafc31

Browse files
authored
Merge pull request #87043 from bmcelvee/OSDOCS-11542-new
OSDOCS-11542: CLI tools - Classic-HCP migration
2 parents 72490dc + 5d6748d commit 6aafc31

File tree

9 files changed

+157
-81
lines changed

9 files changed

+157
-81
lines changed

_topic_maps/_topic_map_rosa_hcp.yml

Lines changed: 87 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -237,38 +237,108 @@ Topics:
237237
File: creating-quick-start-tutorials
238238
Distros: openshift-rosa-hcp
239239
---
240-
Name: Red Hat OpenShift Cluster Manager
241-
Dir: ocm
242-
Distros: openshift-rosa-hcp
243-
Topics:
244-
- Name: Red Hat OpenShift Cluster Manager
245-
File: ocm-overview
246-
# - Name: Red Hat OpenShift Cluster Manager
247-
# File: ocm-overview
248-
# - Name: Using the OpenShift web console
249-
# File: rosa-using-openshift-console
250-
# OSDOCS-11789: Adding the minimum chapters of support and troubleshooting
251-
# docs needed to ensure that xrefs in "Planning your environment" work;
252-
# omit as required by further HCP migration work.
253-
---
254-
# OSDOCS-11789: Adding the minimum chapters of CLI doc needed
255-
# to ensure that xrefs in "Planning your environment" work;
256-
# @BM feel free to alter as needed
257240
Name: CLI tools
258241
Dir: cli_reference
259242
Distros: openshift-rosa-hcp
260243
Topics:
244+
- Name: CLI tools overview
245+
File: index
261246
- Name: OpenShift CLI (oc)
262247
Dir: openshift_cli
263248
Topics:
264249
- Name: Getting started with the OpenShift CLI
265250
File: getting-started-cli
251+
- Name: Configuring the OpenShift CLI
252+
File: configuring-cli
253+
- Name: Usage of oc and kubectl commands
254+
File: usage-oc-kubectl
255+
- Name: Managing CLI profiles
256+
File: managing-cli-profiles
257+
- Name: Extending the OpenShift CLI with plugins
258+
File: extending-cli-plugins
259+
# - Name: Managing CLI plugins with Krew
260+
# File: managing-cli-plugins-krew
261+
# Distros: openshift-rosa-hcp
262+
- Name: OpenShift CLI developer command reference
263+
File: developer-cli-commands
264+
- Name: OpenShift CLI administrator command reference
265+
File: administrator-cli-commands
266+
Distros: openshift-rosa-hcp
267+
- Name: Developer CLI (odo)
268+
File: odo-important-update
269+
# Dir: developer_cli_odo
270+
Distros: openshift-rosa-hcp
271+
# Topics:
272+
# - Name: odo release notes
273+
# File: odo-release-notes
274+
# - Name: Understanding odo
275+
# File: understanding-odo
276+
# - Name: Installing odo
277+
# File: installing-odo
278+
# - Name: Configuring the odo CLI
279+
# File: configuring-the-odo-cli
280+
# - Name: odo CLI reference
281+
# File: odo-cli-reference
282+
- Name: Knative CLI (kn) for use with OpenShift Serverless
283+
File: kn-cli-tools
284+
Distros: openshift-rosa-hcp
285+
- Name: Pipelines CLI (tkn)
286+
Dir: tkn_cli
287+
Distros: openshift-rosa-hcp
288+
Topics:
289+
- Name: Installing tkn
290+
File: installing-tkn
291+
- Name: Configuring tkn
292+
File: op-configuring-tkn
293+
- Name: Basic tkn commands
294+
File: op-tkn-reference
295+
- Name: opm CLI
296+
Dir: opm
297+
Distros: openshift-rosa-hcp
298+
Topics:
299+
- Name: Installing the opm CLI
300+
File: cli-opm-install
301+
- Name: opm CLI reference
302+
File: cli-opm-ref
303+
- Name: Operator SDK
304+
Dir: osdk
305+
Distros: openshift-rosa-hcp
306+
Topics:
307+
- Name: Installing the Operator SDK CLI
308+
File: cli-osdk-install
309+
- Name: Operator SDK CLI reference
310+
File: cli-osdk-ref
266311
- Name: ROSA CLI
267312
Dir: rosa_cli
313+
Distros: openshift-rosa-hcp
268314
Topics:
315+
# - Name: CLI and web console
316+
# File: rosa-cli-openshift-console
317+
- Name: Getting started with the ROSA CLI
318+
File: rosa-get-started-cli
319+
- Name: Managing objects with the ROSA CLI
320+
File: rosa-manage-objects-cli
321+
- Name: Checking account and version information with the ROSA CLI
322+
File: rosa-checking-acct-version-cli
323+
- Name: Checking logs with the ROSA CLI
324+
File: rosa-checking-logs-cli
269325
- Name: Least privilege permissions for ROSA CLI commands
270326
File: rosa-cli-permission-examples
271327
---
328+
Name: Red Hat OpenShift Cluster Manager
329+
Dir: ocm
330+
Distros: openshift-rosa-hcp
331+
Topics:
332+
- Name: Red Hat OpenShift Cluster Manager
333+
File: ocm-overview
334+
# - Name: Red Hat OpenShift Cluster Manager
335+
# File: ocm-overview
336+
# - Name: Using the OpenShift web console
337+
# File: rosa-using-openshift-console
338+
# OSDOCS-11789: Adding the minimum chapters of support and troubleshooting
339+
# docs needed to ensure that xrefs in "Planning your environment" work;
340+
# omit as required by further HCP migration work.
341+
---
272342
Name: Support
273343
Dir: support
274344
Distros: openshift-rosa-hcp

cli_reference/openshift_cli/extending-cli-plugins.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ toc::[]
88

99
You can write and install plugins to build on the default `oc` commands,
1010
allowing you to perform new and more complex tasks with the
11-
ifndef::openshift-dedicated,openshift-rosa[]
11+
ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
1212
{product-title}
13-
endif::openshift-dedicated,openshift-rosa[]
14-
ifdef::openshift-rosa,openshift-dedicated[]
13+
endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
14+
ifdef::openshift-rosa,openshift-dedicated,openshift-rosa-hcp[]
1515
OpenShift
16-
endif::openshift-rosa,openshift-dedicated[]
16+
endif::openshift-rosa,openshift-dedicated,openshift-rosa-hcp[]
1717
CLI.
1818

1919
// Writing CLI plugins

cli_reference/openshift_cli/managing-cli-profiles.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ include::_attributes/common-attributes.adoc[]
77
toc::[]
88

99
A CLI configuration file allows you to configure different profiles, or contexts, for use with the xref:../../cli_reference/index.adoc#cli-tools-overview[CLI tools overview]. A context consists of
10-
ifndef::microshift,openshift-dedicated,openshift-rosa[]
10+
ifndef::microshift,openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
1111
xref:../../authentication/understanding-authentication.adoc#understanding-authentication[user authentication]
12-
endif::microshift,openshift-dedicated,openshift-rosa[]
12+
endif::microshift,openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
1313
ifdef::microshift[]
1414
user authentication
1515
endif::[]
16-
ifndef::openshift-rosa[]
16+
ifndef::openshift-rosa,openshift-rosa-hcp[]
1717
an {product-title}
18-
endif::openshift-rosa[]
19-
ifdef::openshift-rosa[]
18+
endif::openshift-rosa,openshift-rosa-hcp[]
19+
ifdef::openshift-rosa,openshift-rosa-hcp[]
2020
the {product-title} (ROSA)
21-
endif::openshift-rosa[]
21+
endif::openshift-rosa,openshift-rosa-hcp[]
2222
server information associated with a _nickname_.
2323

2424
include::modules/about-cli-profiles-switch.adoc[leveloffset=+1]

cli_reference/openshift_cli/usage-oc-kubectl.adoc

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5,53 +5,53 @@ include::_attributes/common-attributes.adoc[]
55
:context: usage-oc-kubectl
66

77
The Kubernetes command-line interface (CLI), `kubectl`, can be used to run commands against a Kubernetes cluster. Because {product-title}
8-
ifdef::openshift-rosa[]
8+
ifdef::openshift-rosa,openshift-rosa-hcp[]
99
(ROSA)
10-
endif::openshift-rosa[]
10+
endif::openshift-rosa,openshift-rosa-hcp[]
1111
is a certified Kubernetes distribution, you can use the supported `kubectl` binaries that ship with
12-
ifndef::openshift-rosa[]
12+
ifndef::openshift-rosa,openshift-rosa-hcp[]
1313
{product-title}
14-
endif::openshift-rosa[]
15-
ifdef::openshift-rosa[]
14+
endif::openshift-rosa,openshift-rosa-hcp[]
15+
ifdef::openshift-rosa,openshift-rosa-hcp[]
1616
ROSA
17-
endif::openshift-rosa[]
17+
endif::openshift-rosa,openshift-rosa-hcp[]
1818
, or you can gain extended functionality by using the `oc` binary.
1919

2020
== The oc binary
2121

2222
The `oc` binary offers the same capabilities as the `kubectl` binary, but it extends to natively support additional
23-
ifndef::openshift-rosa[]
23+
ifndef::openshift-rosa,openshift-rosa-hcp[]
2424
{product-title}
25-
endif::openshift-rosa[]
26-
ifdef::openshift-rosa[]
25+
endif::openshift-rosa,openshift-rosa-hcp[]
26+
ifdef::openshift-rosa,openshift-rosa-hcp[]
2727
ROSA
28-
endif::openshift-rosa[]
28+
endif::openshift-rosa,openshift-rosa-hcp[]
2929
features, including:
3030

3131
* **Full support for
32-
ifndef::openshift-rosa[]
32+
ifndef::openshift-rosa,openshift-rosa-hcp[]
3333
{product-title}
34-
endif::openshift-rosa[]
35-
ifdef::openshift-rosa[]
34+
endif::openshift-rosa,openshift-rosa-hcp[]
35+
ifdef::openshift-rosa,openshift-rosa-hcp[]
3636
ROSA
37-
endif::openshift-rosa[]
37+
endif::openshift-rosa,openshift-rosa-hcp[]
3838
resources**
3939
+
4040
Resources such as `DeploymentConfig`, `BuildConfig`, `Route`, `ImageStream`, and `ImageStreamTag` objects are specific to
41-
ifndef::openshift-rosa[]
41+
ifndef::openshift-rosa,openshift-rosa-hcp[]
4242
{product-title}
43-
endif::openshift-rosa[]
44-
ifdef::openshift-rosa[]
43+
endif::openshift-rosa,openshift-rosa-hcp[]
44+
ifdef::openshift-rosa,openshift-rosa-hcp[]
4545
ROSA
46-
endif::openshift-rosa[]
46+
endif::openshift-rosa,openshift-rosa-hcp[]
4747
distributions, and build upon standard Kubernetes primitives.
4848
+
4949
* **Authentication**
5050
+
51-
ifndef::microshift,openshift-rosa,openshift-dedicated[]
51+
ifndef::microshift,openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
5252
The `oc` binary offers a built-in `login` command for authentication and lets you work with projects, which map Kubernetes namespaces to authenticated users.
5353
Read xref:../../authentication/understanding-authentication.adoc#understanding-authentication[Understanding authentication] for more information.
54-
endif::microshift,openshift-rosa,openshift-dedicated[]
54+
endif::microshift,openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
5555
+
5656
ifdef::microshift[]
5757
The `oc` binary offers a built-in `login` command for authentication to {product-title}.
@@ -64,19 +64,19 @@ The additional command `oc new-app`, for example, makes it easier to get new app
6464
[IMPORTANT]
6565
====
6666
If you installed an earlier version of the `oc` binary, you cannot use it to complete all of the commands in
67-
ifndef::openshift-rosa[]
67+
ifndef::openshift-rosa,openshift-rosa-hcp[]
6868
{product-title} {product-version}
69-
endif::openshift-rosa[]
70-
ifdef::openshift-rosa[]
69+
endif::openshift-rosa,openshift-rosa-hcp[]
70+
ifdef::openshift-rosa,openshift-rosa-hcp[]
7171
ROSA
72-
endif::openshift-rosa[]
72+
endif::openshift-rosa,openshift-rosa-hcp[]
7373
. If you want the latest features, you must download and install the latest version of the `oc` binary corresponding to your
74-
ifndef::openshift-rosa[]
74+
ifndef::openshift-rosa,openshift-rosa-hcp[]
7575
{product-title}
76-
endif::openshift-rosa[]
77-
ifdef::openshift-rosa[]
76+
endif::openshift-rosa,openshift-rosa-hcp[]
77+
ifdef::openshift-rosa,openshift-rosa-hcp[]
7878
ROSA
79-
endif::openshift-rosa[]
79+
endif::openshift-rosa,openshift-rosa-hcp[]
8080
server version.
8181
====
8282

@@ -109,19 +109,19 @@ image:redcircle-3.png[] `oc` client might provide options and features that migh
109109
== The kubectl binary
110110

111111
The `kubectl` binary is provided as a means to support existing workflows and scripts for new
112-
ifndef::openshift-rosa[]
112+
ifndef::openshift-rosa,openshift-rosa-hcp[]
113113
{product-title}
114-
endif::openshift-rosa[]
115-
ifdef::openshift-rosa[]
114+
endif::openshift-rosa,openshift-rosa-hcp[]
115+
ifdef::openshift-rosa,openshift-rosa-hcp[]
116116
ROSA
117-
endif::openshift-rosa[]
117+
endif::openshift-rosa,openshift-rosa-hcp[]
118118
users coming from a standard Kubernetes environment, or for those who prefer to use the `kubectl` CLI. Existing users of `kubectl` can continue to use the binary to interact with Kubernetes primitives, with no changes required to the
119-
ifndef::openshift-rosa[]
119+
ifndef::openshift-rosa,openshift-rosa-hcp[]
120120
{product-title}
121-
endif::openshift-rosa[]
122-
ifdef::openshift-rosa[]
121+
endif::openshift-rosa,openshift-rosa-hcp[]
122+
ifdef::openshift-rosa,openshift-rosa-hcp[]
123123
ROSA
124-
endif::openshift-rosa[]
124+
endif::openshift-rosa,openshift-rosa-hcp[]
125125
cluster.
126126

127127
You can install the supported `kubectl` binary by following the steps to xref:../../cli_reference/openshift_cli/getting-started-cli.adoc#cli-installing-cli_cli-developer-commands[Install the OpenShift CLI]. The `kubectl` binary is included in the archive if you download the binary, or is installed when you install the CLI by using an RPM.

cli_reference/opm/cli-opm-install.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ toc::[]
88

99
include::modules/olm-about-opm.adoc[leveloffset=+1]
1010

11-
ifndef::openshift-rosa,openshift-dedicated[]
11+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
1212
[role="_additional-resources"]
1313
.Additional resources
1414
1515
* See xref:../../operators/understanding/olm-packaging-format.adoc#olm-bundle-format_olm-packaging-format[Operator Framework packaging format] for more information about the bundle format.
1616
* To create a bundle image using the Operator SDK, see
1717
xref:../../operators/operator_sdk/osdk-working-bundle-images.adoc#osdk-working-bundle-images[Working with bundle images].
18-
endif::openshift-rosa,openshift-dedicated[]
18+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
1919
2020
include::modules/olm-installing-opm.adoc[leveloffset=+1]
21-
ifndef::openshift-rosa,openshift-dedicated[]
21+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
2222
[role="_additional-resources"]
2323
[id="opm-addtl-resources"]
2424
== Additional resources
2525
2626
* See xref:../../operators/admin/olm-managing-custom-catalogs.adoc#olm-managing-custom-catalogs[Managing custom catalogs] for `opm` procedures including creating, updating, and pruning catalogs.
27-
endif::openshift-rosa,openshift-dedicated[]
27+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]

cli_reference/opm/cli-opm-ref.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ include::snippets/deprecated-feature.adoc[]
3838
include::modules/opm-cli-ref-generate.adoc[leveloffset=+1]
3939
include::modules/opm-cli-ref-index.adoc[leveloffset=+1]
4040

41-
ifndef::openshift-rosa,openshift-dedicated[]
41+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
4242
[role="_additional-resources"]
4343
.Additional resources
4444
4545
* xref:../../operators/understanding/olm-packaging-format.adoc#olm-file-based-catalogs_olm-packaging-format[Operator Framework packaging format]
4646
* xref:../../operators/admin/olm-managing-custom-catalogs.adoc#olm-managing-custom-catalogs-fb[Managing custom catalogs]
47-
* xref:../../disconnected/mirroring/about-installing-oc-mirror-v2.adoc#about-installing-oc-mirror-v2[Mirroring images for a disconnected installation by using the oc-mirror plugin v2]
48-
endif::openshift-rosa,openshift-dedicated[]
47+
* xref:../../disconnected/mirroring/installing-mirroring-disconnected.adoc#installing-mirroring-disconnected[Mirroring images for a disconnected installation using the oc-mirror plugin]
48+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
4949
5050
include::modules/opm-cli-ref-init.adoc[leveloffset=+1]
5151
include::modules/opm-cli-ref-migrate.adoc[leveloffset=+1]

cli_reference/osdk/cli-osdk-install.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ The Operator SDK provides a command-line interface (CLI) tool that Operator deve
1111
include::snippets/osdk-deprecation.adoc[]
1212

1313
Operator authors with cluster administrator access to a Kubernetes-based cluster, such as {product-title}, can use the Operator SDK CLI to develop their own Operators based on Go, Ansible, Java, or Helm. link:https://kubebuilder.io/[Kubebuilder] is embedded into the Operator SDK as the scaffolding solution for Go-based Operators, which means existing Kubebuilder projects can be used as is with the Operator SDK and continue to work.
14-
ifndef::openshift-rosa,openshift-dedicated[]
14+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
1515
See xref:../../operators/operator_sdk/osdk-about.adoc#osdk-about[Developing Operators] for full documentation on the Operator SDK.
1616

1717
[NOTE]
1818
====
1919
{product-title} {product-version} supports Operator SDK {osdk_ver}.
2020
====
21-
endif::openshift-rosa,openshift-dedicated[]
21+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
2222

2323
include::modules/osdk-installing-cli-linux-macos.adoc[leveloffset=+1]
2424

0 commit comments

Comments
 (0)