Skip to content

Commit 6f18cf1

Browse files
authored
Merge pull request #60213 from abrennan89/5264
RHDEVDOCS-5264 + RHDEVDOCS-5304 + RHDEVDOCS-5349: Clean up web terminal docs and add new config section
2 parents 3b6123f + 85ee0ca commit 6f18cf1

24 files changed

+377
-223
lines changed

_attributes/common-attributes.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,5 +178,7 @@ endif::[]
178178
:ztp: GitOps ZTP
179179
:3no: three-node OpenShift
180180
:3no-caps: Three-node OpenShift
181-
:web-terminal-op: Web Terminal Operator
182181
:run-once-operator: Run Once Duration Override Operator
182+
// Web terminal
183+
:web-terminal-op: Web Terminal Operator
184+
:devworkspace-op: DevWorkspace Operator

_topic_maps/_topic_map.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -761,9 +761,20 @@ Topics:
761761
File: dynamic-plug-in-example
762762
- Name: Dynamic plugin reference
763763
File: dynamic-plug-ins-reference
764-
- Name: Using the web terminal
765-
File: odc-using-web-terminal
764+
- Name: Web terminal
765+
Dir: web_terminal
766766
Distros: openshift-enterprise,openshift-online
767+
Topics:
768+
- Name: Installing the web terminal
769+
File: installing-web-terminal
770+
- Name: Configuring the web terminal
771+
File: configuring-web-terminal
772+
- Name: Using the web terminal
773+
File: odc-using-web-terminal
774+
- Name: Troubleshooting the web terminal
775+
File: troubleshooting-web-terminal
776+
- Name: Uninstalling the web terminal
777+
File: uninstalling-web-terminal
767778
- Name: Disabling the web console
768779
File: disabling-web-console
769780
Distros: openshift-enterprise,openshift-origin

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 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.
35+
You can use Helm by xref:../../web_console/web_terminal/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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// Module is included in the following assemblies:
2+
//
3+
// * web_console/web_terminal/configuring-web-terminal.adoc
4+
5+
:_content-type: PROCEDURE
6+
7+
[id="configure-web-terminal-image-admin_{context}"]
8+
= Configuring the web terminal image for all users
9+
10+
You can use the *Administrator* perspective of the web console to set the default web terminal image for all users.
11+
12+
.Prerequisites
13+
14+
* You have cluster administrator permissions and are logged in to the web console.
15+
* You have installed the {web-terminal-op}.
16+
17+
include::snippets/access-cluster-configuration-console.adoc[]
18+
19+
. Click the *Web Terminal* tab, which opens the *Web Terminal Configuration* page.
20+
. Enter the URL of the image that you want to use.
21+
. Click *Save*.
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// Module is included in the following assemblies:
2+
//
3+
// * web_console/web_terminal/configuring-web-terminal.adoc
4+
5+
:_content-type: PROCEDURE
6+
7+
[id="configure-web-terminal-timeout-admin_{context}"]
8+
= Configuring the web terminal timeout for all users
9+
10+
You can use the *Administrator* perspective of the web console to set the default web terminal timeout period for all users.
11+
12+
.Prerequisites
13+
14+
* You have cluster administrator permissions and are logged in to the web console.
15+
* You have installed the {web-terminal-op}.
16+
17+
include::snippets/access-cluster-configuration-console.adoc[]
18+
19+
. Click the *Web Terminal* tab, which opens the *Web Terminal Configuration* page.
20+
. Set a value for the timeout. From the drop-down list, select a time interval of *Seconds*, *Minutes*, *Hours*, or *Milliseconds*.
21+
. Click *Save*.

modules/disable-quickstarts-admin-console.adoc

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,7 @@ You can use the *Administrator* perspective of the web console to disable one or
1111

1212
* You have cluster administrator permissions and are logged in to the web console.
1313

14-
.Procedure
15-
16-
. In the *Administrator* perspective, navigate to *Administation* -> *Cluster Settings*.
17-
. On the *Cluster Settings* page, click the *Configuration* tab.
18-
. On the *Configuration* page, click the *Console* configuration resource with the description *operator.openshift.io*.
19-
+
20-
image::cluster-settings-console.png[Image of the Configuration page showing the correct Console configuration resource to select]
21-
22-
. From the *Action* drop-down list, select *Customize*, which opens the *Cluster configuration* page.
23-
+
24-
image::cluster-configuration-general-tab.png[Cluster configuration page open on the General tab]
14+
include::snippets/access-cluster-configuration-console.adoc[]
2515

2616
. On the *General* tab, in the *Quick starts* section, you can select items in either the *Enabled* or *Disabled* list, and move them from one list to the other by using the arrow buttons.
2717

modules/odc-access-web-terminal.adoc

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,23 @@
11
// Module included in the following assemblies:
22
//
3-
// web_console/odc-using-web-terminal.adoc
3+
// web_console/web_terminal/odc-using-web-terminal.adoc
44

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

99
After the {web-terminal-op} is installed, you can access the web terminal.
10+
You can re-run commands by selecting them from the list of commands you have run in the terminal. These commands persist across multiple terminal sessions.
11+
The web terminal remains open until you close it or until you close the browser window or tab.
12+
13+
.Prerequisites
14+
15+
* You have access to an {product-title} cluster and are logged into the web console.
16+
* The {web-terminal-op} is installed on your cluster.
1017
1118
.Procedure
1219

13-
. 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.
20+
. To launch the web terminal, click the command line terminal icon (image:odc-wto-icon.png[title="wto icon"]) in the masthead of the console. A web terminal instance is displayed in the *Command line terminal* pane. This instance is automatically logged in with your credentials.
1421

1522
. Select the project where the `DevWorkspace` CR must be created from the *Project* drop-down list. By default, the current project is selected.
1623
+
@@ -19,23 +26,7 @@ After the {web-terminal-op} is installed, you can access the web terminal.
1926
* The `DevWorkspace` CR is created only if it does not already exist.
2027
* The `openshift-terminal` project is the default project used for cluster administrators. They do not have the option to choose another project.
2128
====
22-
+
23-
. Click *Start* to initialize the web terminal using the selected project.
24-
+
25-
After the web terminal is initialized, you can use the preinstalled CLI tools like `oc`, `kubectl`, `odo`, `kn`, `tkn`, `helm`, `kubens`, `subctl`, and `kubectx` in the web terminal.
26-
+
27-
. Click *+* to open multiple tabs within web terminal in the console.
28-
+
29-
[NOTE]
30-
====
31-
* You can re-run commands by selecting them from the list of commands you have run in the terminal. These commands persist across multiple terminal sessions.
32-
33-
* The web terminal remains open until you close it or you close the browser window or tab.
34-
====
35-
36-
[id="web-terminal-and-network-policies_{context}"]
37-
== Web terminal and network policies
3829
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.
30+
. Click *Start* to initialize the web terminal using the selected project. After the web terminal is initialized, you can use the preinstalled CLI tools like `oc`, `kubectl`, `odo`, `kn`, `tkn`, `helm`, `kubens`, `subctl`, and `kubectx` in the web terminal.
4031

41-
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.
32+
. Click *+* to open multiple tabs within the web terminal in the console.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
// Module is included in the following assemblies:
3+
//
4+
// * web_console/web_terminal/configuring-web-terminal.adoc
5+
6+
:_content-type: PROCEDURE
7+
[id="odc-configure-web-terminal-image-session_{context}"]
8+
= Configuring the web terminal image for a session
9+
10+
You can change the default image for the web terminal for your current session.
11+
12+
.Prerequisites
13+
14+
* You have access to an {product-title} cluster that has the {web-terminal-op} installed.
15+
* You are logged into the web console.
16+
17+
.Procedure
18+
19+
. Click the web terminal icon (image:odc-wto-icon.png[title="web terminal icon"]).
20+
. Click *Image* to display advanced configuration options for the web terminal image.
21+
. Enter the URL of the image that you want to use.
22+
. Click *Start* to begin a terminal instance using the specified image setting.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
// Module is included in the following assemblies:
3+
//
4+
// * web_console/web_terminal/configuring-web-terminal.adoc
5+
6+
:_content-type: PROCEDURE
7+
[id="odc-configure-web-terminal-timeout-session_{context}"]
8+
= Configuring the web terminal timeout for a session
9+
10+
You can change the default timeout period for the web terminal for your current session.
11+
12+
.Prerequisites
13+
14+
* You have access to an {product-title} cluster that has the {web-terminal-op} installed.
15+
* You are logged into the web console.
16+
17+
.Procedure
18+
19+
. Click the web terminal icon (image:odc-wto-icon.png[title="web terminal icon"]).
20+
. Click *Timeout* to display advanced configuration options for the web terminal timeout.
21+
. Set a value for the timeout. From the drop-down list, select a time interval of *Seconds*, *Minutes*, *Hours*, or *Milliseconds*.
22+
. Click *Start* to begin a terminal instance using the specified timeout setting.

modules/odc-uninstalling-web-terminal.adoc

Lines changed: 0 additions & 159 deletions
This file was deleted.

0 commit comments

Comments
 (0)