Skip to content

Commit 8b1a8c0

Browse files
authored
Merge pull request #59678 from abrennan89/RHDEVDOCS-5264
Clean up web terminal docs
2 parents 6d020be + 1ff7f38 commit 8b1a8c0

File tree

8 files changed

+34
-45
lines changed

8 files changed

+34
-45
lines changed

_attributes/common-attributes.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,3 +175,4 @@ endif::[]
175175
:ztp: GitOps ZTP
176176
:3no: three-node OpenShift
177177
:3no-caps: Three-node OpenShift
178+
:web-terminal-op: Web Terminal Operator

_topic_maps/_topic_map.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -744,8 +744,8 @@ Topics:
744744
File: dynamic-plug-in-example
745745
- Name: Dynamic plugin reference
746746
File: dynamic-plug-ins-reference
747-
- Name: Web terminal
748-
File: odc-about-web-terminal
747+
- Name: Using the web terminal
748+
File: odc-using-web-terminal
749749
Distros: openshift-enterprise,openshift-online
750750
- Name: Disabling the web console
751751
File: disabling-web-console

applications/working_with_helm_charts/configuring-custom-helm-chart-repositories.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ include::modules/odc-creating-helm-releases-using-developer-perspective.adoc[lev
3232

3333
== Using Helm in the web terminal
3434

35-
You can use Helm by initializing the web terminal in the *Developer* perspective of the web console. For more information, see xref:../../web_console/odc-about-web-terminal.html#odc-using-web-terminal_odc-about-web-terminal[Using the web terminal].
35+
You can use Helm by xref:../../web_console/odc-using-web-terminal.adoc#odc-access-web-terminal_odc-using-web-terminal[Accessing the web terminal] in the *Developer* perspective of the web console.
3636

3737
include::modules/helm-creating-a-custom-helm-chart-on-openshift.adoc[leveloffset=+1]
3838

modules/odc-using-web-terminal.adoc renamed to modules/odc-access-web-terminal.adoc

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
// Module included in the following assemblies:
22
//
3-
// web_console/odc-about-web-terminal.adoc
3+
// web_console/odc-using-web-terminal.adoc
4+
45
:_content-type: PROCEDURE
5-
[id="odc-using-web-terminal_{context}"]
6-
= Using the web terminal
6+
[id="odc-access-web-terminal_{context}"]
7+
= Accessing the web terminal
8+
9+
After the {web-terminal-op} is installed, you can access the web terminal.
710

8-
After the Web Terminal Operator is installed, you can use the web terminal as follows:
11+
.Procedure
912

1013
. To launch the web terminal, click the command line terminal icon (image:odc-wto-icon.png[title="wto icon"]) on the upper right of the console. A web terminal instance is displayed in the *Command line terminal* pane. This instance is automatically logged in with your credentials.
14+
1115
. Select the project where the `DevWorkspace` CR must be created from the *Project* drop-down list. By default, the current project is selected.
1216
+
1317
[NOTE]
@@ -32,6 +36,6 @@ After the web terminal is initialized, you can use the preinstalled CLI tools li
3236
[id="web-terminal-and-network-policies_{context}"]
3337
== Web terminal and network policies
3438

35-
Web terminals might fail to launch if the cluster has network policies configured. To initialize a web terminal instance, the Web Terminal Operator must communicate with the web terminal's pod to verify it is running, and the {product-title} web console needs to send information to automatically log in to the cluster within the terminal. If either step fails, the web terminal fails to initialize and the terminal panel appears to be in a loading state.
39+
The web terminal might fail to launch if the cluster has network policies configured. To initialize a web terminal instance, the {web-terminal-op} must communicate with the web terminal's pod to verify it is running, and the {product-title} web console needs to send information to automatically log in to the cluster within the terminal. If either step fails, the web terminal fails to initialize and the terminal panel appears to be in a loading state.
3640

3741
To avoid this issue, ensure that the network policies for namespaces that are used for terminals allow ingress from the `openshift-console` and `openshift-operators` namespaces.
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
// Module included in the following assemblies:
22
//
3-
// web_console/odc-about-web-terminal.adoc
3+
// web_console/odc-using-web-terminal.adoc
44

55
:_content-type: PROCEDURE
66
[id="odc-installing-web-terminal_{context}"]
77
= Installing the web terminal
88

9-
You can install the web terminal using the Web Terminal Operator listed in the {product-title} OperatorHub. When you install the Web Terminal Operator, the custom resource definitions (CRDs) that are required for the command line configuration, such as the `DevWorkspace` CRD, are automatically installed. The web console creates the required resources when you open the web terminal.
9+
You can install the web terminal by using the {web-terminal-op} listed in the {product-title} OperatorHub. When you install the {web-terminal-op}, the custom resource definitions (CRDs) that are required for the command line configuration, such as the `DevWorkspace` CRD, are automatically installed. The web console creates the required resources when you open the web terminal.
1010

1111
.Prerequisites
1212
* Access to an {product-title} cluster using an account with `cluster-admin` permissions.
1313
1414
.Procedure
1515
. In the *Administrator* perspective of the web console, navigate to *Operators -> OperatorHub*.
16-
. Use the *Filter by keyword* box to search for the `Web Terminal` Operator in the catalog, and then click the *Web Terminal* tile.
16+
. Use the *Filter by keyword* box to search for the {web-terminal-op} in the catalog, and then click the *Web Terminal* tile.
1717
. Read the brief description about the Operator on the *Web Terminal* page, and then click *Install*.
1818
. On the *Install Operator* page, retain the default values for all fields.
1919

20-
** The *fast* option in the *Update Channel* menu enables installation of the latest release of the Web Terminal Operator.
20+
** The *fast* option in the *Update Channel* menu enables installation of the latest release of the {web-terminal-op}.
2121
** The *All namespaces on the cluster* option in the *Installation Mode* menu enables the Operator to watch and be available to all namespaces in the cluster.
2222
** The *openshift-operators* option in the *Installed Namespace* menu installs the Operator in the default `openshift-operators` namespace.
2323
** The *Automatic* option in the *Approval Strategy* menu ensures that the future upgrades to the Operator are handled automatically by the Operator Lifecycle Manager.
@@ -27,7 +27,7 @@ You can install the web terminal using the Web Terminal Operator listed in the {
2727
+
2828
[NOTE]
2929
====
30-
Prior to {product-title} 4.8, the Web Terminal Operator bundled all its functionality in a single Operator. As of {product-title} 4.8, the Web Terminal Operator installs the DevWorkspace Operator as a dependency to provide the same features.
30+
The {web-terminal-op} installs the DevWorkspace Operator as a dependency.
3131
====
3232

3333
. After the Operator is installed, refresh your page to see the command line terminal icon on the upper right of the console.

modules/odc-uninstalling-web-terminal.adoc

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,31 @@
11
// Module included in the following assemblies:
22
//
3-
// web_console/odc-about-web-terminal.adoc
3+
// web_console/odc-using-web-terminal.adoc
44

55
:_content-type: PROCEDURE
66
[id="odc-uninstalling-web-terminal_{context}"]
77
= Uninstalling the web terminal
88

99
Uninstalling the web terminal is a two-step process:
1010

11-
. Uninstall the Web Terminal Operator and related custom resources (CRs) that were added when you installed the Operator.
12-
. Uninstall the DevWorkspace Operator and its related custom resources that were added as a dependency of the Web Terminal Operator.
11+
. Uninstall the {web-terminal-op} and related custom resources (CRs) that were added when you installed the Operator.
12+
. Uninstall the DevWorkspace Operator and its related custom resources that were added as a dependency of the {web-terminal-op}.
1313

14-
Uninstalling the Web Terminal Operator does not remove any of its custom resource definitions (CRDs) or managed resources that are created when the Operator is installed. These components must be manually uninstalled for security purposes. Removing these components also allows you to save cluster resources by ensuring that terminals do not idle when the Operator is uninstalled.
14+
Uninstalling the {web-terminal-op} does not remove any of its custom resource definitions (CRDs) or managed resources that are created when the Operator is installed. These components must be manually uninstalled for security purposes. Removing these components also allows you to save cluster resources by ensuring that terminals do not idle when the Operator is uninstalled.
1515

1616
.Prerequisites
1717
* Access to an {product-title} cluster using an account with `cluster-admin` permissions.
1818
1919
== Removing the Web Terminal Operator and the custom resources that support it
2020

21-
Use the console and the CLI to delete any existing web terminals and CRs that were created during the installation of the Web Terminal Operator.
22-
23-
[NOTE]
24-
====
25-
Prior to {product-title} 4.8, the Web Terminal Operator used different CRDs to provide Web Terminal capabilities. To uninstall versions 1.2.1 and below of the Web Terminal Operator, refer to the documentation for {product-title} 4.7.
26-
====
21+
Use the console and the CLI to delete any existing web terminals and CRs that were created during the installation of the {web-terminal-op}.
2722

2823
.Procedure
29-
. Uninstall the Web Terminal Operator using the web console:
24+
25+
. Uninstall the {web-terminal-op} using the web console:
3026
.. In the *Administrator* perspective of the web console, navigate to *Operators -> Installed Operators*.
31-
.. Scroll the filter list or type a keyword into the *Filter by name* box to find the *Web Terminal* Operator.
32-
.. Click the Options menu {kebab} for the Web Terminal Operator, and then select *Uninstall Operator*.
27+
.. Scroll the filter list or type a keyword into the *Filter by name* box to find the {web-terminal-op}.
28+
.. Click the Options menu {kebab} for the {web-terminal-op}, and then select *Uninstall Operator*.
3329
.. In the *Uninstall Operator* confirmation dialog box, click *Uninstall* to remove the Operator, Operator deployments, and pods from the cluster. The Operator stops running and no longer receives updates.
3430
+
3531
. Remove the CRs used by the Operator.
@@ -48,7 +44,7 @@ $ oc delete devworkspacetemplates.workspace.devfile.io --all-namespaces \
4844

4945
== Deleting the DevWorkspace Operator dependency
5046

51-
Use the CLI to delete the custom resource definitions (CRDs) and additional resources that are created during installation of the Web Terminal Operator.
47+
Use the CLI to delete the custom resource definitions (CRDs) and additional resources that are created during installation of the {web-terminal-op}.
5248

5349
[IMPORTANT]
5450
====
Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,18 @@
11
:_content-type: ASSEMBLY
2-
[id="odc-about-web-terminal"]
3-
= About the web terminal in the web console
2+
[id="odc-using-web-terminal"]
3+
= Using the web terminal
44
include::_attributes/common-attributes.adoc[]
5-
:context: odc-about-web-terminal
5+
:context: odc-using-web-terminal
66

77
toc::[]
88

9-
You can launch an embedded command line terminal instance in the web console. You must first install the Web Terminal Operator to use the web terminal.
10-
11-
[NOTE]
12-
====
13-
Cluster administrators can access the web terminal in {product-title} 4.7 and later.
14-
====
9+
You can launch an embedded command line terminal instance in the web console. You must first install the {web-terminal-op} to use the web terminal.
1510

1611
This terminal instance is preinstalled with common CLI tools for interacting with the cluster, such as `oc`, `kubectl`,`odo`, `kn`, `tkn`, `helm`, `kubens`, `subctl`, and `kubectx`. It also has the context of the project you are working on and automatically logs you in using your credentials.
1712

1813
:FeatureName: Web terminal
1914
include::modules/odc-installing-web-terminal.adoc[leveloffset=+1]
2015

21-
include::modules/odc-using-web-terminal.adoc[leveloffset=+1]
16+
include::modules/odc-access-web-terminal.adoc[leveloffset=+1]
2217

2318
include::modules/odc-uninstalling-web-terminal.adoc[leveloffset=+1]

web_console/web-console-overview.adoc

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,6 @@ The Red Hat {product-title} web console provides a graphical user interface to v
1111
Both *Administrator* and *Developer* perspectives enable you to create quick start tutorials for {product-title}. A quick start is a guided tutorial with user tasks and is useful for getting oriented with an application, Operator, or other product offering.
1212

1313
include::modules/about-administrator-perspective.adoc[leveloffset=+1]
14-
15-
[role="_additional-resources"]
16-
.Additional resources
17-
18-
See xref:../web_console/odc-about-web-terminal.adoc#odc-about-web-terminal[About the web terminal in the web console] for more information on the web terminal Operator.
19-
20-
2114
include::modules/about-developer-perspective.adoc[leveloffset=+1]
2215
include::modules/odc-accessing-perspectives.adoc[leveloffset=+1]
2316

@@ -31,6 +24,6 @@ include::modules/odc-accessing-perspectives.adoc[leveloffset=+1]
3124
* xref:../web_console/using-dashboard-to-get-cluster-information.adoc#using-dashboard-to-get-cluster-info[Viewing cluster information]
3225
* xref:../web_console/configuring-web-console.adoc#configuring-web-console[Configuring the web console]
3326
* xref:../web_console/customizing-the-web-console.adoc#customizing-web-console[Customizing the web console]
34-
* xref:../web_console/odc-about-web-terminal.adoc#odc-about-web-terminal[Launching an embedded command line terminal instance in the web console]
27+
* xref:../web_console/odc-using-web-terminal.adoc#odc-using-web-terminal[Using the web terminal]
3528
* xref:../web_console/creating-quick-start-tutorials.adoc#creating-quick-start-tutorials[Creating quick start tutorials]
3629
* xref:../web_console/disabling-web-console.adoc#disabling-web-console[Disabling the web console]

0 commit comments

Comments
 (0)