Skip to content

Commit 6627be2

Browse files
authored
RHOAI-30438 custom workbench namespace (#897)
* RHOAI-30438 custom workbench namespace * coderabbit comments * peer review edits * missed a configuration spot
1 parent 46e0e7e commit 6627be2

12 files changed

+131
-70
lines changed

_artifacts/document-attributes-global.adoc

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ ifdef::cloud-service[]
1111
:install-package: Add-on
1212
:openshift-platform: OpenShift
1313
:dbd-config-default-namespace: redhat-ods-applications
14+
:operator-default-namespace: redhat-ods-operator
15+
:workbench-default-namespace: rhods-notebooks
16+
:authorino-default-namespace: redhat-ods-applications-auth-provider
17+
:mr-default-namespace: rhoai-model-registries
18+
:monitoring-default-namespace: redhat-ods-monitoring
1419
endif::[]
1520

1621
// conditional entities for RHOAI-SM
@@ -25,13 +30,20 @@ ifdef::self-managed[]
2530
:openshift-platform: OpenShift Container Platform
2631
:openshift-platform-url: openshift-container-platform
2732
:dbd-config-default-namespace: redhat-ods-applications
33+
:operator-default-namespace: redhat-ods-operator
34+
:workbench-default-namespace: rhods-notebooks
35+
:authorino-default-namespace: redhat-ods-applications-auth-provider
36+
:mr-default-namespace: rhoai-model-registries
37+
:monitoring-default-namespace: redhat-ods-monitoring
2838
endif::[]
2939

3040
ifdef::upstream[]
3141
:productname-long: Open Data Hub
3242
:productname-short: Open Data Hub
3343
:odh-user-group: pass:q,a[`odh-users`]
3444
:odh-admin-group: pass:q,a[`odh-admins`]
45+
:user-group: pass:q,a[`odh-users`]
46+
:admin-group: pass:q,a[`odh-admins`]
3547
:url-productname-long: open_data_hub
3648
:url-productname-short: open_data_hub
3749
// change this to match the stage-<ver> branch, e.g. 1-latest, 1.n, to get the correct title for release notes
@@ -41,11 +53,18 @@ ifdef::upstream[]
4153
:openshift-platform-url: openshift-container-platform
4254
:odhdocshome: https://opendatahub.io/docs
4355
:dbd-config-default-namespace: opendatahub
56+
:operator-default-namespace: openshift-operators
57+
:workbench-default-namespace: opendatahub
58+
:authorino-default-namespace: opendatahub-auth-provider
59+
:mr-default-namespace: odh-model-registries
60+
:monitoring-default-namespace: opendatahub
4461
endif::[]
4562

4663
ifndef::upstream[]
4764
:oai-user-group: pass:q,a[`rhoai-users`]
4865
:oai-admin-group: pass:q,a[`rhoai-admins`]
66+
:user-group: pass:q,a[`rhoai-users`]
67+
:admin-group: pass:q,a[`rhoai-admins`]
4968
endif::[]
5069

5170
// conditional entities for release note titles using numbers or not

installing-open-data-hub.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ include::_artifacts/document-attributes-global.adoc[]
1818

1919
include::assemblies/installing-odh-v2.adoc[leveloffset=+1]
2020

21-
include::assemblies/installing-odh-v1.adoc[leveloffset=+1]
21+
//include::assemblies/installing-odh-v1.adoc[leveloffset=+1]
2222

2323
include::modules/installing-the-distributed-workloads-components.adoc[leveloffset=+1]
2424

modules/about-deleting-users-and-resources.adoc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33
[id='about-deleting-users-and-resources_{context}']
44
= About deleting users and their resources
55

6-
If you have administrator access to {openshift-platform}, you can revoke a user's access to Jupyter and delete the user's resources from {productname-long}.
6+
If you have administrator access to {openshift-platform}, you can revoke a user's access to workbenches and delete the user's resources from {productname-long}. Before you delete a user from {productname-short}, it is good practice to back up the data on your persistent volume claims (PVCs).
77

88
Deleting a user and the user's resources involves the following tasks:
99

10-
* Before you delete a user from {productname-short}, it is good practice to back up the data on your persistent volume claims (PVCs).
11-
1210
* Stop workbenches owned by the user.
1311

14-
* Revoke user access to Jupyter.
12+
* Revoke user access to workbenches.
1513

1614
* Remove the user from the allowed group in your OpenShift identity provider.
1715

modules/accessing-the-administration-interface-for-basic-workbenches.adoc

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,22 @@ You can use the administration interface to control basic workbenches in your {p
1111
* You have logged in to {productname-short} as a user with {productname-short} administrator privileges.
1212

1313
.Procedure
14-
** To access the administration interface for basic workbenches from {productname-short}, perform the following actions:
15-
... In {productname-short}, in the *Applications* section of the left menu, click *Enabled*.
16-
... Locate the *Start basic workbench* tile and click *Launch application*.
17-
... On the page that opens when you launch a basic workbench, click the *Administration* tab.
14+
To access the administration interface for basic workbenches from {productname-short}, perform the following actions:
15+
16+
. In {productname-short}, in the *Applications* section of the left menu, click *Enabled*.
17+
. Locate the *Start basic workbench* tile and click *Open application*.
18+
. On the page that opens, click the *Administration* tab.
1819
+
1920
The *Administration* page opens.
2021

22+
////
23+
Removing until RHOAIENG-31369 is resolved
2124
** To access the administration interface for basic workbenches from JupyterLab, perform the following actions:
2225
... Click *File* -> *Hub Control Panel*.
2326
... On the page that opens in {productname-short}, click the *Administration* tab.
2427
+
2528
The *Administration* page opens.
29+
////
2630

2731
.Verification
2832

modules/accessing-the-odh-dashboard.adoc

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,18 @@
44
= Accessing the Open Data Hub dashboard
55

66
[role='_abstract']
7-
You can access and share the URL for your Open Data Hub dashboard with other users to let them log in and work on their models.
7+
After you have installed {productname-short}, you can access and share the URL for your {productname-short} dashboard with other users to let them log in and work on their models.
88

99
.Prerequisites
10-
* You have installed the Open Data Hub Operator.
10+
* You have installed the {productname-short} Operator.
1111

1212
.Procedure
13-
. In the OpenShift web console, select *Networking* -> *Routes*.
14-
. On the *Routes* page, click the *Project* list and select the `odh` project. The page filters to only display routes in the `odh` project.
15-
. In the *Location* column, copy the URL for the *odh-dashboard* route.
16-
. Give this URL to your users to let them log in to Open Data Hub dashboard.
13+
. Log in to {openshift-platform} web console.
14+
. Click the application launcher (image:images/osd-app-launcher.png[The application launcher]).
15+
. Right-click *{productname-long}* and copy the URL for your {productname-short} instance.
16+
. Give this URL to your users to let them log in to {productname-short} dashboard.
1717

1818
.Verification
19-
* Confirm that you and your users can log in to the Open Data Hub dashboard by using the URL.
20-
21-
*Note:* In the {productname-long} dashboard, users can view the list of the installed {productname-short} components, their corresponding source (upstream) components, and the versions of the installed components, as described in link:{odhdocshome}/installing-open-data-hub/#viewing-installed-components_get-started[Viewing installed {productname-short} components].
19+
* Confirm that you and your users can log in to the {productname-short} dashboard by using the URL.
2220

21+
*Note:* In the {productname-long} dashboard, users can view the list of the installed {productname-short} components, their corresponding source (upstream) components, and the versions of the installed components, as described in link:{odhdocshome}/installing-open-data-hub/#viewing-installed-components_get-started[Viewing installed {productname-short} components].

modules/cleaning-up-after-deleting-users.adoc

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,30 @@
44
= Cleaning up after deleting users
55

66
[role='_abstract']
7-
ifdef::upstream,self-managed[]
8-
After you remove a user's access to {productname-long} or Jupyter, you must also delete the configuration files for the user from {openshift-platform}.
9-
endif::[]
10-
ifdef::cloud-service[]
11-
After you remove a user's access to {productname-long} or Jupyter, you must also delete the configuration files for the user from OpenShift.
12-
endif::[]
7+
After you remove a user's access to {productname-long}, you must also delete the configuration files for the user from {openshift-platform}.
138
{org-name} recommends that you back up the user's data before removing their configuration files.
149

1510
.Prerequisites
1611

1712
* (Optional) If you want to completely remove the user's access to {productname-short}, you have removed their credentials from your identity provider.
18-
* You have revoked the user's access to Jupyter.
19-
2013
ifdef::cloud-service[]
2114
* You have backed up the user's storage data from Amazon EBS or Google Persistent Disk.
2215
endif::[]
23-
2416
ifdef::self-managed[]
2517
* You have backed up the user's storage data.
2618
endif::[]
27-
2819
* You have logged in to the {openshift-platform} web console as a user with the `cluster-admin` role.
2920

30-
//* You have logged in to {productname-short} as a user with {productname-short} administrator privileges.
31-
3221
.Procedure
22+
3323
. Delete the user's persistent volume claim (PVC).
3424
.. Click *Storage* -> *PersistentVolumeClaims*.
35-
.. If it is not already selected, select the `rhods-notebooks` project from the project list.
25+
ifdef::cloud-service[]
26+
.. If it is not already selected, select the `pass:attributes[{workbench-default-namespace}]` project from the project list.
27+
endif::[]
28+
ifdef::self-managed,upstream[]
29+
.. If it is not already selected, select the default workbench project (`pass:attributes[{workbench-default-namespace}]` or your custom workbench namespace) from the project list.
30+
endif::[]
3631
.. Locate the `jupyter-nb-<username>` PVC.
3732
+
3833
Replace `<username>` with the relevant user name.
@@ -43,7 +38,12 @@ The *Delete PersistentVolumeClaim* dialog appears.
4338
.. Click *Delete*.
4439
. Delete the user's ConfigMap.
4540
.. Click *Workloads* -> *ConfigMaps*.
46-
.. If it is not already selected, select the `rhods-notebooks` project from the project list.
41+
ifdef::cloud-service[]
42+
.. If it is not already selected, select the `pass:attributes[{workbench-default-namespace}]` project from the project list.
43+
endif::[]
44+
ifdef::self-managed,upstream[]
45+
.. If it is not already selected, select the default workbench project (`pass:attributes[{workbench-default-namespace}]` or your custom workbench namespace) from the project list.
46+
endif::[]
4747
.. Locate the `jupyterhub-singleuser-profile-<username>` ConfigMap.
4848
+
4949
Replace `<username>` with the relevant user name.
@@ -54,8 +54,6 @@ The *Delete ConfigMap* dialog appears.
5454
.. Click *Delete*.
5555

5656
.Verification
57-
// TODO: When RHOAIENG-1137 is corrected, change to:
58-
//* The user is not visible in the administration interface for basic workbenches.
59-
* The user cannot access Jupyter any more, and sees an "Access permission needed" message if they try.
57+
* The user cannot access {productname-short} and sees an "Access permission needed" message if they try.
6058
* The user's single-user profile, persistent volume claim (PVC), and ConfigMap are not visible in {openshift-platform}.
6159

modules/configuring-custom-namespaces.adoc

Lines changed: 50 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,75 @@
44
= Configuring custom namespaces
55

66
[role='_abstract']
7-
By default, {productname-short} uses predefined namespaces, but you can define a custom namespace for the operator and `DSCI.applicationNamespace` as needed. Namespaces created by {productname-short} typically include `openshift` or `redhat` in their name. Do not rename these system namespaces because they are required for {productname-short} to function properly.
7+
8+
By default, {productname-short} uses the following predefined namespaces:
9+
10+
* `pass:attributes[{operator-default-namespace}]` contains the {productname-long} Operator
11+
* `pass:attributes[{dbd-config-default-namespace}]` includes the dashboard and other required components of {productname-short}
12+
* `pass:attributes[{workbench-default-namespace}]` is where basic workbenches are deployed by default
13+
//* `pass:attributes[{monitoring-default-namespace}]` contains services for monitoring
14+
15+
If needed, you can define custom namespaces to use instead of the predefined ones before installing {productname-short}. This flexibility supports environments with naming policies or conventions and allows cluster administrators to control where components such as workbenches are deployed.
16+
17+
ifndef::upstream[]
18+
Namespaces created by {productname-short} typically include `openshift` or `redhat` in their name. Do not rename these system namespaces because they are required for {productname-short} to function properly.
19+
endif::[]
20+
ifdef::upstream[]
21+
Namespaces created by {productname-short} typically include `openshift` or `opendatahub` in their name. Do not rename these system namespaces because they are required for {productname-short} to function properly.
22+
endif::[]
823

924
.Prerequisites
25+
1026
* You have access to an {productname-short} cluster with cluster administrator privileges.
1127
* You have downloaded and installed the OpenShift command-line interface (CLI). See link:https://docs.redhat.com/en/documentation/openshift_container_platform/{ocp-latest-version}/html/cli_tools/openshift-cli-oc#installing-openshift-cli[Installing the OpenShift CLI^].
28+
* You have not yet installed the {productname-long} Operator.
1229

1330
.Procedure
31+
1432
. In a terminal window, if you are not already logged in to your OpenShift cluster as a cluster administrator, log in to the OpenShift CLI as shown in the following example:
1533
+
1634
[source,subs="+quotes"]
1735
----
1836
oc login __<openshift_cluster_url>__ -u __<admin_username>__ -p __<password>__
1937
----
20-
. Enter the following command to create the custom namespace:
38+
39+
. Optional: To configure a custom operator namespace:
40+
41+
.. Create a new namespace:
2142
+
2243
[source]
2344
----
24-
oc create namespace <custom_namespace>
45+
oc create namespace <operator_namespace>
2546
----
26-
. If you are creating a namespace for a `DSCI.applicationNamespace`, enter the following command to add the correct label:
47+
48+
.. When you install the {productname-long} Operator, use this namespace instead of `pass:attributes[{operator-default-namespace}]`.
49+
50+
. Optional: To configure a custom applications namespace:
51+
52+
.. Create the namespace:
53+
+
54+
[source]
55+
----
56+
oc create namespace <application_namespace>
57+
----
58+
59+
.. Add the required label:
2760
+
2861
[source]
2962
----
3063
oc label namespace <application_namespace> opendatahub.io/application-namespace=true
3164
----
3265

33-
//.Additional information
66+
. Optional: To configure a custom workbench namespace:
67+
68+
.. Create the namespace:
69+
+
70+
[source]
71+
----
72+
oc create namespace <workbench_namespace>
73+
----
74+
75+
.. When you install the {productname-long} components, specify this namespace for the `spec.workbenches.workbenchNamespace` field. You cannot change the default workbench namespace after you have installed the {productname-long} Operator.
76+
77+
.Next step
78+
* Install the {productname-long} Operator.

modules/installing-odh-components.adoc

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
= Installing Open Data Hub components
55

66
[role='_abstract']
7-
You can use the OpenShift web console to install specific components of Open Data Hub on your cluster when version 2 of the Open Data Hub Operator is already installed on the cluster.
7+
You can use the OpenShift web console to install specific components of Open Data Hub on your cluster when the Open Data Hub Operator is already installed on the cluster.
88

99
.Prerequisites
10-
* You have installed version 2 of the Open Data Hub Operator.
10+
* You have installed the Open Data Hub Operator.
1111
* You can log in as a user with `cluster-admin` privileges.
1212
ifdef::upstream[]
1313
* If you want to use the `trustyai` component, you must enable user workload monitoring as described in link:{odhdocshome}/monitoring-data-science-models/#configuring-monitoring-for-the-multi-model-serving-platform_monitor[Configuring monitoring for the multi-model serving platform].
@@ -47,8 +47,10 @@ endif::[]
4747
. On the *Create DSCInitialization* page, configure by using *Form* view or *YAML* view. For general information about the supported components, see link:https://opendatahub.io/docs/tiered-components[Tiered Components].
4848
* Configure by using *Form* view:
4949
.. In the *Name* field, enter a value.
50+
.. If you are using a custom applications namespace, enter the namespace in the *Applications Namespace* field.
5051
.. In the *Components* section, expand each component and set the *managementState* to *Managed* or *Removed*.
5152
* Configure by using *YAML* view:
53+
.. If you are using a custom applications namespace, specify the namespace in the `spec.applicationsNamespace` field.
5254
.. In the `spec.components` section, for each component shown, set the value of the `managementState` field to either `Managed` or `Removed`.
5355
. Click *Create*.
5456
. Wait until the status of the DSCInitialization is *Ready*.
@@ -57,8 +59,10 @@ endif::[]
5759
* Configure by using *Form* view:
5860
.. In the *Name* field, enter a value.
5961
.. In the *Components* section, expand each component and set the *managementState* to *Managed* or *Removed*.
62+
.. If you are using a custom workbench namespace, enter the namespace in the *workbenchNamespace* field.
6063
* Configure by using *YAML* view:
6164
.. In the `spec.components` section, for each component shown, set the value of the `managementState` field to either `Managed` or `Removed`.
65+
.. If you are using a custom workbench namespace, specify the namespace in the `spec.workbenches.workbenchNamespace` field.
6266
. Click *Create*.
6367

6468

@@ -68,7 +72,7 @@ endif::[]
6872

6973
*Note:* In the {productname-long} dashboard, users can view the list of the installed {productname-short} components, their corresponding source (upstream) components, and the versions of the installed components, as described in link:{odhdocshome}/installing-open-data-hub/#viewing-installed-components_get-started[Viewing installed {productname-short} components].
7074

71-
.Next Step
75+
.Next step
7276
* link:{odhdocshome}/installing-open-data-hub/#accessing-the-odh-dashboard_installv2[Accessing the Open Data Hub dashboard].
7377

7478
[role="_additional-resources"]

modules/installing-the-odh-operator-v2.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Version 2 of the Open Data Hub Operator represents an alpha release, accessible
4242
--
4343
.. For *Version*, select the version of the Operator that you want to install.
4444
.. For *Installation mode*, leave *All namespaces on the cluster (default)* selected.
45-
.. For *Installed Namespace*, select the *openshift-operators* namespace.
45+
.. For *Installed Namespace*, select the *{operator-default-namespace}* namespace or select your custom operator namespace.
4646
.. For *Update approval*, select automatic or manual updates.
4747
* *Automatic*: When a new version of the Operator is available, Operator Lifecycle Manager (OLM) automatically upgrades the running instance of your Operator.
4848
* *Manual*: When a new version of the Operator is available, OLM notifies you with an update request that you must manually approve to upgrade the running instance of your Operator.
@@ -51,7 +51,7 @@ Version 2 of the Open Data Hub Operator represents an alpha release, accessible
5151
.Verification
5252
* Select *Operators* -> *Installed Operators* to verify that the *Open Data Hub Operator* is listed with *Succeeded* status.
5353

54-
.Next Step
54+
.Next step
5555
* Install Open Data Hub components.
5656

5757
[role="_additional-resources"]

0 commit comments

Comments
 (0)