Skip to content

Commit 30bcecf

Browse files
authored
Merge pull request #66934 from mburke5678/rosa-web-console
[OSDOCS-8077] OCP content port to ROSA and OSD:Web Console
2 parents af00d0a + 9dbd01e commit 30bcecf

13 files changed

+189
-7
lines changed

_topic_maps/_topic_map_osd.yml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,62 @@ Topics:
189189
File: osd-managed-resources
190190
Distros: openshift-dedicated
191191
---
192+
Name: Web console
193+
Dir: web_console
194+
Distros: openshift-dedicated
195+
Topics:
196+
- Name: Web console overview
197+
File: web-console-overview
198+
- Name: Accessing the web console
199+
File: web-console
200+
- Name: Viewing cluster information
201+
File: using-dashboard-to-get-cluster-information
202+
- Name: Adding user preferences
203+
File: adding-user-preferences
204+
Distros: openshift-enterprise,openshift-origin
205+
# cannot patch resource "consoles", insufficient permissions to read any Cluster configuration
206+
#- Name: Configuring the web console
207+
# File: configuring-web-console
208+
# Distros: openshift-rosa
209+
- Name: Customizing the web console
210+
File: customizing-the-web-console
211+
Distros: openshift-dedicated
212+
- Name: Dynamic plugins
213+
Dir: dynamic-plugin
214+
Distros: openshift-dedicated
215+
Topics:
216+
- Name: Overview of dynamic plugins
217+
File: overview-dynamic-plugin
218+
- Name: Getting started with dynamic plugins
219+
File: dynamic-plugins-get-started
220+
- Name: Deploy your plugin on a cluster
221+
File: deploy-plugin-cluster
222+
- Name: Dynamic plugin example
223+
File: dynamic-plugin-example
224+
- Name: Dynamic plugin reference
225+
File: dynamic-plugins-reference
226+
- Name: Web terminal
227+
Dir: web_terminal
228+
Distros: openshift-dedicated
229+
Topics:
230+
- Name: Installing the web terminal
231+
File: installing-web-terminal
232+
# Do not have sufficient permissions to read any cluster configuration.
233+
# - Name: Configuring the web terminal
234+
# File: configuring-web-terminal
235+
- Name: Using the web terminal
236+
File: odc-using-web-terminal
237+
- Name: Troubleshooting the web terminal
238+
File: troubleshooting-web-terminal
239+
- Name: Uninstalling the web terminal
240+
File: uninstalling-web-terminal
241+
- Name: Disabling the web console
242+
File: disabling-web-console
243+
Distros: openshift-dedicated
244+
- Name: About quick start tutorials
245+
File: creating-quick-start-tutorials
246+
Distros: openshift-dedicated
247+
---
192248
Name: CLI tools
193249
Dir: cli_reference
194250
Distros: openshift-dedicated

_topic_maps/_topic_map_rosa.yml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,62 @@ Topics:
300300
File: rosa-managed-resources
301301
Distros: openshift-rosa
302302
---
303+
Name: Web console
304+
Dir: web_console
305+
Distros: openshift-rosa
306+
Topics:
307+
- Name: Web console overview
308+
File: web-console-overview
309+
- Name: Accessing the web console
310+
File: web-console
311+
- Name: Viewing cluster information
312+
File: using-dashboard-to-get-cluster-information
313+
- Name: Adding user preferences
314+
File: adding-user-preferences
315+
Distros: openshift-enterprise,openshift-origin
316+
# cannot patch resource "consoles", insufficient permissions to read any Cluster configuration
317+
#- Name: Configuring the web console
318+
# File: configuring-web-console
319+
# Distros: openshift-rosa
320+
- Name: Customizing the web console
321+
File: customizing-the-web-console
322+
Distros: openshift-rosa
323+
- Name: Dynamic plugins
324+
Dir: dynamic-plugin
325+
Distros: openshift-rosa
326+
Topics:
327+
- Name: Overview of dynamic plugins
328+
File: overview-dynamic-plugin
329+
- Name: Getting started with dynamic plugins
330+
File: dynamic-plugins-get-started
331+
- Name: Deploy your plugin on a cluster
332+
File: deploy-plugin-cluster
333+
- Name: Dynamic plugin example
334+
File: dynamic-plugin-example
335+
- Name: Dynamic plugin reference
336+
File: dynamic-plugins-reference
337+
- Name: Web terminal
338+
Dir: web_terminal
339+
Distros: openshift-rosa
340+
Topics:
341+
- Name: Installing the web terminal
342+
File: installing-web-terminal
343+
# Do not have sufficient permissions to read any cluster configuration.
344+
# - Name: Configuring the web terminal
345+
# File: configuring-web-terminal
346+
- Name: Using the web terminal
347+
File: odc-using-web-terminal
348+
- Name: Troubleshooting the web terminal
349+
File: troubleshooting-web-terminal
350+
- Name: Uninstalling the web terminal
351+
File: uninstalling-web-terminal
352+
- Name: Disabling the web console
353+
File: disabling-web-console
354+
Distros: openshift-rosa
355+
- Name: About quick start tutorials
356+
File: creating-quick-start-tutorials
357+
Distros: openshift-rosa
358+
---
303359
Name: CLI tools
304360
Dir: cli_reference
305361
Distros: openshift-rosa

modules/odc-access-web-terminal.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ The web terminal remains open until you close it or until you close the browser
2424
[NOTE]
2525
====
2626
* The `DevWorkspace` CR is created only if it does not already exist.
27+
ifndef::openshift-rosa,openshift-dedicated[]
2728
* The `openshift-terminal` project is the default project used for cluster administrators. They do not have the option to choose another project.
29+
endif::openshift-rosa,openshift-dedicated[]
2830
====
2931
3032
. 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.

modules/removing-devworkspace-operator.adoc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ The {devworkspace-op} is a standalone Operator and may be required as a dependen
1818
* You have access to an {product-title} cluster with cluster administrator permissions.
1919
* You have installed the `oc` CLI.
2020
21+
// Hide step 2, cannot delete resource "customresourcedefinitions" in ROSA/OSD
22+
// Hide step 4, cannot delete resource "mutatingwebhookconfigurations" in ROSA/OSD, do not delete deployment/devworkspace-webhook-server, see NOTE
23+
24+
2125
.Procedure
2226

2327
. Remove the `DevWorkspace` custom resources used by the Operator, along with any related Kubernetes objects:
@@ -37,6 +41,7 @@ $ oc delete devworkspaceroutings.controller.devfile.io --all-namespaces --all --
3741
If this step is not complete, finalizers make it difficult to fully uninstall the Operator.
3842
====
3943

44+
ifndef::openshift-rosa,openshift-dedicated[]
4045
. Remove the CRDs used by the Operator:
4146
+
4247
[WARNING]
@@ -92,6 +97,7 @@ $ oc delete validatingwebhookconfigurations controller.devfile.io
9297
====
9398
If you remove the `devworkspace-webhook-server` deployment without removing the mutating and validating webhooks, you can not use `oc exec` commands to run commands in a container in the cluster. After you remove the webhooks you can use the `oc exec` commands again.
9499
====
100+
endif::openshift-rosa,openshift-dedicated[]
95101

96102
. Remove any remaining services, secrets, and config maps. Depending on the installation, some resources included in the following commands may not exist in the cluster.
97103
+

modules/web-console-overview.adoc

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
[id="web-console-overview_{context}"]
66
= Understanding and accessing the web console
77

8-
The web console runs as a pod on the master. The static assets required to run the web console are served by the pod. After {product-title} is successfully installed using `openshift-install create cluster`, find the URL for the web console and login credentials for your installed cluster in the CLI output of the installation program. For example:
8+
The web console runs as a pod on the control plane node. The static assets required to run the web console are served by the pod.
9+
10+
ifndef::openshift-rosa,openshift-dedicated[]
11+
After you install {product-title} using the `openshift-install create cluster` command, you can find the web console URL and login credentials for the installed cluster in the CLI output of the installation program. For example:
912

1013
[source,terminal]
1114
.Example output
@@ -24,4 +27,16 @@ For existing clusters that you did not install, you can use `oc whoami --show-co
2427
[IMPORTANT]
2528
====
2629
The `dir` parameter specifies the `assets` directory, which stores the manifest files, the ISO image, and the `auth` directory. The `auth` directory stores the `kubeadmin-password` and `kubeconfig` files. As a `kubeadmin` user, you can use the `kubeconfig` file to access the cluster with the following setting: `export KUBECONFIG=<install_directory>/auth/kubeconfig`. The `kubeconfig` is specific to the generated ISO image, so if the `kubeconfig` is set and the `oc` command fails, it is possible that the system did not boot with the generated ISO image. To perform debugging, during the bootstrap process, you can log in to the console as the `core` user by using the contents of the `kubeadmin-password` file.
27-
====
30+
====
31+
endif::openshift-rosa,openshift-dedicated[]
32+
33+
ifdef::openshift-rosa,openshift-dedicated[]
34+
35+
.Procedure
36+
37+
. Log in to {cluster-manager-url} and click the name of your cluster.
38+
39+
. On the cluster *Overview* tab, click *Open console*, and log in with your credentials.
40+
41+
Alternatively, use the `oc whoami --show-console` command to get the web console URL.
42+
endif::openshift-rosa,openshift-dedicated[]

web_console/configuring-web-console.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,9 @@ or disable the console.
1313

1414
* Deploy an {product-title} cluster.
1515

16+
// Hiding in ROSA/OSD, as dedicated-admins cannot create "consoles" resource
17+
ifndef::openshift-rosa,openshift-dedicated[]
1618
include::modules/web-console-configuration.adoc[leveloffset=+1]
19+
// Hiding in ROSA/OSD, as dedicated-admins do not have sufficient permissions to read any cluster configuration
1720
include::modules/disable-quickstarts-admin-console.adoc[leveloffset=+1]
21+
endif::openshift-rosa,openshift-dedicated[]

web_console/creating-quick-start-tutorials.adoc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
1+
ifndef::openshift-rosa,openshift-dedicated[]
12
:_mod-docs-content-type: ASSEMBLY
23
[id="creating-quick-start-tutorials"]
34
= Creating quick start tutorials in the web console
45
include::_attributes/common-attributes.adoc[]
56
:context: creating-quick-start-tutorials
7+
endif::openshift-rosa,openshift-dedicated[]
8+
ifdef::openshift-rosa,openshift-dedicated[]
9+
:_mod-docs-content-type: ASSEMBLY
10+
[id="creating-quick-start-tutorials"]
11+
= About quick start tutorials
12+
include::_attributes/common-attributes.adoc[]
13+
:context: creating-quick-start-tutorials
14+
endif::openshift-rosa,openshift-dedicated[]
615

716
toc::[]
817

@@ -14,6 +23,8 @@ include::modules/quick-start-user-workflow.adoc[leveloffset=+1]
1423

1524
include::modules/quick-start-components.adoc[leveloffset=+1]
1625

26+
// Hiding in ROSA/OSD, as dedicated-admins cannot create "consolequickstarts" resource
27+
ifndef::openshift-rosa,openshift-dedicated[]
1728
include::modules/contributing-quick-starts.adoc[leveloffset=+1]
1829

1930
include::modules/understanding-quick-start-elements.adoc[leveloffset=+2]
@@ -38,3 +49,4 @@ include::modules/quick-start-content-guidelines.adoc[leveloffset=+1]
3849

3950
* For voice and tone requirements, refer to link:https://www.patternfly.org/v4/ux-writing/brand-voice-and-tone[PatternFly's brand voice and tone guidelines].
4051
* For other UX content guidance, refer to all areas of link:https://www.patternfly.org/v4/ux-writing/about[PatternFly's UX writing style guide].
52+
endif::openshift-rosa,openshift-dedicated[]

web_console/customizing-the-web-console.adoc

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,13 @@ corporate or government requirements.
1313

1414
include::modules/adding-a-custom-logo.adoc[leveloffset=+1]
1515

16+
// Hiding in ROSA/OSD, as dedicated-admins cannot create resource "consolelinks"
17+
ifndef::openshift-rosa,openshift-dedicated[]
1618
include::modules/creating-custom-links.adoc[leveloffset=+1]
1719

20+
// Hiding in ROSA/OSD, as dedicated-admins cannot patch resource "ingresses"
1821
include::modules/customizing-the-web-console-URL.adoc[leveloffset=+1]
22+
endif::openshift-rosa,openshift-dedicated[]
1923

2024
[id="customizing-web-console-recognize"]
2125
== Recognizing resource and project limits and quotas
@@ -26,26 +30,40 @@ If a resource has a message about resource limitations or quotas being reached,
2630

2731
If using *List View* from the *View Shortcuts* menu, resources appear as a list. The *Alerts* column indicates if a message is available.
2832

33+
// Hiding in ROSA/OSD, as dedicated-admins cannot create resource "secrets" in openshift-config
34+
ifndef::openshift-rosa,openshift-dedicated[]
2935
include::modules/customizing-the-login-page.adoc[leveloffset=+1]
3036

37+
// Hiding in ROSA/OSD, as dedicated-admins cannot create resource "consoleexternalloglinks"
3138
include::modules/defining-template-for-external-log-link.adoc[leveloffset=+1]
3239

40+
// Hiding in ROSA/OSD, as dedicated-admins cannot create resource "consolenotifications"
3341
include::modules/adding-custom-notification-banners.adoc[leveloffset=+1]
3442

43+
// Hiding in ROSA/OSD, as dedicated-admins cannot patch resource "customresourcedefinitions"
3544
include::modules/customizing-cli-downloads.adoc[leveloffset=+1]
3645

46+
// Hiding in ROSA/OSD, as dedicated-admins cannot patch resource "customresourcedefinitions"
3747
include::modules/adding-yaml-examples-to-kube-resources.adoc[leveloffset=+1]
3848

49+
// Hiding in ROSA/OSD, as dedicated-admins cannot create resource "consoles"
3950
include::modules/odc-customizing-user-perspectives.adoc[leveloffset=+1]
4051

52+
// Hiding in ROSA/OSD, as dedicated-admins cannot create resource "consoles"
4153
include::modules/odc-customizing-a-perspective-using-YAML-view.adoc[leveloffset=+2]
4254

55+
// Hiding in ROSA/OSD, as dedicated-admins do not have sufficient permissions to read any cluster configuration
4356
include::modules/odc-customizing-a-perspective-using-form-view.adoc[leveloffset=+2]
57+
endif::openshift-rosa,openshift-dedicated[]
4458

4559
include::modules/odc_con_customizing-a-developer-catalog-or-its-sub-catalogs.adoc[leveloffset=+1]
4660

4761
include::modules/odc_customizing-a-developer-catalog-or-its-sub-catalogs-using-the-yaml-view.adoc[leveloffset=+2]
4862

63+
// Hiding in ROSA/OSD, as dedicated-admins do not have sufficient permissions to read any cluster configuration
64+
ifndef::openshift-rosa,openshift-dedicated[]
4965
include::modules/odc_customizing-a-developer-catalog-or-its-sub-catalogs-using-the-form-view.adoc[leveloffset=+2]
5066

51-
include::modules/odc_con_example-yaml-file-changes.adoc[leveloffset=+3]
67+
// Hiding in ROSA/OSD, as dedicated-admins cannot patch resource "consoles"
68+
include::modules/odc_con_example-yaml-file-changes.adoc[leveloffset=+3]
69+
endif::openshift-rosa,openshift-dedicated[]

web_console/dynamic-plugin/deploy-plugin-cluster.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ include::modules/deployment-plug-in-cluster.adoc[leveloffset=+1]
1414

1515
include::modules/disabling-plug-in-browser.adoc[leveloffset=+1]
1616

17+
ifndef::openshift-rosa,openshift-dedicated[]
1718
[role="_additional-resources"]
1819
[id="dynamic-plugins_additional-resources"]
1920
== Additional resources
2021
* xref:../../applications/working_with_helm_charts/understanding-helm.adoc#understaning-helm[Understanding Helm]
22+
endif::openshift-rosa,openshift-dedicated[]

web_console/dynamic-plugin/dynamic-plugins-reference.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ include::modules/dynamic-plugin-api.adoc[leveloffset=+1]
1414

1515
include::modules/troubleshooting-dynamic-plugin.adoc[leveloffset=+1]
1616

17+
ifndef::openshift-rosa,openshift-dedicated[]
1718
[role="_additional-resources"]
1819
.Additional resources
1920
* xref:../../security/certificates/service-serving-certificate.adoc#understanding-service-serving_service-serving-certificate[Understanding service serving certificates]
21+
endif::openshift-rosa,openshift-dedicated[]

0 commit comments

Comments
 (0)