diff --git a/modules/end-user-guide/images/installation/che-red-hat-application-menu-che-odp.png b/modules/end-user-guide/images/installation/che-red-hat-application-menu-che-odp.png index 9bdd708e60..8f364c255d 100644 Binary files a/modules/end-user-guide/images/installation/che-red-hat-application-menu-che-odp.png and b/modules/end-user-guide/images/installation/che-red-hat-application-menu-che-odp.png differ diff --git a/modules/end-user-guide/images/integration/token-injection.png b/modules/end-user-guide/images/integration/token-injection.png new file mode 100644 index 0000000000..0c8306a047 Binary files /dev/null and b/modules/end-user-guide/images/integration/token-injection.png differ diff --git a/modules/end-user-guide/images/navigation/navigating-openshift-web-console-from-che-dashboard.png b/modules/end-user-guide/images/navigation/navigating-openshift-web-console-from-che-dashboard.png new file mode 100644 index 0000000000..6f3e22e167 Binary files /dev/null and b/modules/end-user-guide/images/navigation/navigating-openshift-web-console-from-che-dashboard.png differ diff --git a/modules/end-user-guide/nav.adoc b/modules/end-user-guide/nav.adoc index c13056fce3..969ead43e8 100644 --- a/modules/end-user-guide/nav.adoc +++ b/modules/end-user-guide/nav.adoc @@ -11,7 +11,9 @@ ** xref:secret-as-a-variable.adoc[] ** xref:git-credential-store.adoc[] * xref:integrating-with-kubernetes.adoc[] +** xref:automatic-token-injection.adoc[] ** xref:navigating-che-from-openshift-developer-perspective.adoc[] +** xref:navigating-openshift-web-console-from-che.adoc[] * xref:troubleshooting-che.adoc[] ** xref:viewing-che-workspaces-logs.adoc[] ** xref:investigating-failures-at-a-workspace-start-using-the-verbose-mode.adoc[] diff --git a/modules/end-user-guide/pages/automatic-token-injection.adoc b/modules/end-user-guide/pages/automatic-token-injection.adoc new file mode 100644 index 0000000000..5acc615000 --- /dev/null +++ b/modules/end-user-guide/pages/automatic-token-injection.adoc @@ -0,0 +1,21 @@ +:navtitle: Automatic {orch-name} token injection +:keywords: user-guide, token, injection +:page-aliases: .:automatic-token-injection, overview:automatic-token-injection + +[id="automatic-token-injection_{context}"] += Automatic {orch-name} token injection + +This section describes how to use the {orch-name} user token that is automatically injected into workspace containers which allows running {prod-short} CLI commands against {orch-name} cluster. + +.Procedure + +. Open the {prod-short} dashboard and start a workspace. + +. Once the workspace is started, open a terminal in the container that contains the {prod-short} CLI. + +. Execute {prod-short} CLI commands which allow you to run commands against {orch-name} cluster. CLI can be used for deploying applications, inspecting and managing cluster resources, and viewing logs. {orch-name} user token will be used during the execution of the commands. + ++ +image::integration/token-injection.png[Token Injection in IDE,link="../_images/integration/token-injection.png"] + +WARNING: The automatic token injection currently works only on the OpenShift infrastructure. diff --git a/modules/end-user-guide/pages/integrating-with-kubernetes.adoc b/modules/end-user-guide/pages/integrating-with-kubernetes.adoc index fad4bf4512..435c925e32 100644 --- a/modules/end-user-guide/pages/integrating-with-kubernetes.adoc +++ b/modules/end-user-guide/pages/integrating-with-kubernetes.adoc @@ -5,4 +5,6 @@ [id="integrating-with-kubernetes_{context}"] = Integrating with {orch-name} +* xref:automatic-token-injection.adoc[] * xref:navigating-che-from-openshift-developer-perspective.adoc[] +* xref:navigating-openshift-web-console-from-che.adoc[] diff --git a/modules/end-user-guide/pages/navigating-che-from-openshift-developer-perspective.adoc b/modules/end-user-guide/pages/navigating-che-from-openshift-developer-perspective.adoc index 35c0051273..c39e39d9db 100644 --- a/modules/end-user-guide/pages/navigating-che-from-openshift-developer-perspective.adoc +++ b/modules/end-user-guide/pages/navigating-che-from-openshift-developer-perspective.adoc @@ -9,12 +9,11 @@ :context: accessing-{prod-id-short}-from-openshift-developer-perspective - The OpenShift Container Platform web console provides two perspectives; the *Administrator* perspective and the *Developer* perspective. The Developer perspective provides workflows specific to developer use cases, such as the ability to: -* Create and deploy applications on OpenShift Container Platform by importing existing codebases, images, and Dockerfiles. +* Create and deploy applications on the OpenShift Container Platform by importing existing codebases, images, and Dockerfiles. * Visually interact with applications, components, and services associated with them within a project and monitor their deployment and build status. diff --git a/modules/end-user-guide/pages/navigating-openshift-web-console-from-che.adoc b/modules/end-user-guide/pages/navigating-openshift-web-console-from-che.adoc new file mode 100644 index 0000000000..bad10bb791 --- /dev/null +++ b/modules/end-user-guide/pages/navigating-openshift-web-console-from-che.adoc @@ -0,0 +1,24 @@ +:navtitle: Navigating OpenShift web console from {prod-short} +:keywords: overview, OpenShift, web console +:page-aliases: .:accessing-openshift-web-console-from-che, overview:accessing-openshift-web-console-from-che, accessing-openshift-web-console-from-che + +:parent-context-of-accessing-che-from-openshift-developer-perspective: {context} + +[id="navigating-openshift-web-console-from-{prod-id-short_{context}"] += Navigating OpenShift web console from {prod-short} + +This section describes how to access OpenShift web console from {prod-short}. + +.Prerequisites + +* The {prod-short} Operator is available in OpenShift 4. + +.Procedure + +. Open the {prod-short} dashboard and click the three-by-three matrix icon in the upper right corner of the main screen. ++ +The drop-down menu displays the available applications. ++ +image::navigation/navigating-openshift-web-console-from-che-dashboard.png[OpenShift web console in the drop-down menu,link="../_images/navigation/navigating-openshift-web-console-from-che-dashboard.png"] + +. Click the *OpenShift console* link to open the OpenShift web console. diff --git a/modules/end-user-guide/partials/proc_accessing-che-from-red-hat-applications-menu.adoc b/modules/end-user-guide/partials/proc_accessing-che-from-red-hat-applications-menu.adoc index 1745d9a7da..04d58c9f60 100644 --- a/modules/end-user-guide/partials/proc_accessing-che-from-red-hat-applications-menu.adoc +++ b/modules/end-user-guide/partials/proc_accessing-che-from-red-hat-applications-menu.adoc @@ -5,7 +5,7 @@ [id="accessing-{prod-id-short}-from-red-hat-applications-menu_{context}"] = Accessing {prod-short} from Red Hat Applications menu -This section describes how to access {prod-short} workspaces from the *Red Hat Applications* menu on OpenShift Container Platform. +This section describes how to access {prod-short} workspaces from the *Red Hat Applications* menu on the OpenShift Container Platform. .Prerequisites