diff --git a/modules/ROOT/pages/che-cluster.adoc b/modules/ROOT/pages/che-cluster.adoc index 86ae37d..be3c178 100644 --- a/modules/ROOT/pages/che-cluster.adoc +++ b/modules/ROOT/pages/che-cluster.adoc @@ -56,7 +56,7 @@ In this short lab, you will restrict the number of Workspaces that an authentica $ oc edit checluster/devspaces -n openshift-devspaces ``` + -Although you can directly edit the YAML configuration using this approach, it is not recommended. A better approach is to maintain the YAML configuration in a version controlled Git repository and then use GitOps techniques, or use the `oc replace -f ` command. +Although you can directly edit the YAML configuration using this approach, it is not recommended. A better approach is to maintain the YAML configuration in a version-controlled Git repository and then use GitOps techniques, or use the `oc replace -f ` command. + WARNING: If you have used the GitOps approach outlined previously, then ArgoCD is responsible for ensuring that the cluster state matches the configuration defined in the Git repository `main` branch. If you overwrite the `CheCluster` CR YAML using `oc` CLI or some other tool, then ArgoCD will reconcile the configuration and overwrite your changes! @@ -127,5 +127,5 @@ image::one-workspace-error.png[Only one Workspace allowed to launch by default] You can increase this value by editing an attribute in the `CheCluster` CR. See https://docs.redhat.com/en/documentation/red_hat_openshift_dev_spaces/3.15/html-single/administration_guide/index#enabling-users-to-run-multiple-workspaces-simultaneously. . Make the necessary changes to the `CheCluster` CR YAML file. -. Log in as `user1` to the Dev Spaces dashboard and launch any of the example workspaces listed in the home page -. Use a different browser, and log in as `user1` and launch one more example workspace to verify that you can launch more than one workspace. \ No newline at end of file +. Log in as `user1` to the Dev Spaces dashboard and launch any of the example workspaces listed on the home page. +. Use a different browser, log in as `user1`, and launch one more example workspace to verify that you can launch more than one workspace. \ No newline at end of file diff --git a/modules/ROOT/pages/cli.adoc b/modules/ROOT/pages/cli.adoc index 865b578..e6ef80a 100644 --- a/modules/ROOT/pages/cli.adoc +++ b/modules/ROOT/pages/cli.adoc @@ -1,4 +1,4 @@ -= Installation of Dev Spaces using CLI Tools += Installation of Dev Spaces Using CLI Tools :navtitle: CLI There are two ways you can install Dev Spaces using CLI tools. The first approach, using the `oc` CLI and YAML configuration files is for scenarios where you need fine-grained control over specific versions, and fine-tuning other related YAML configuration for your Dev Spaces deployment. @@ -11,13 +11,13 @@ In scenarios where you need to install Dev Spaces using automated scripts, you c === Pre-requisites -* You should have provisioned an OpenShift 4.16+ cluster as outlined the `Classroom Environment` section of the course home page. -* Download the OpenShift client `oc` for your platform from from the OpenShift web console by clicking the "?" icon on the top right navigation bar. Uncompress the archive file, and then copy the `oc` binary for your platform to the system path (usually `/usr/local/bin` on UNIX systems). +* You should have provisioned an OpenShift 4.16+ cluster as outlined in the `Classroom Environment` section of the course home page. +* Download the OpenShift client `oc` for your platform from the OpenShift web console by clicking the "?" icon on the top right navigation bar. Uncompress the archive file, and then copy the `oc` binary for your platform to the system path (usually `/usr/local/bin` on UNIX systems). * Cluster administrator access to OpenShift (both CLI and web console). Verify that you can log in to the OpenShift web console and CLI as a cluster administrator. === Lab: Using oc CLI to install Dev Spaces -Using the `oc` CLI with YAML configuration files gives you more control and flexibility over how to install Dev Spaces. Whereas the web console and the `dsc` CLI is used to usually install the latest stable version of Dev Spaces, with this approach, you can install older versions, or specific product versions, and customize the OpenShift environment to fit your needs using the `oc` CLI approach. +Using the `oc` CLI with YAML configuration files gives you more control and flexibility over how to install Dev Spaces. Whereas the web console and the `dsc` CLI are used to usually install the latest stable version of Dev Spaces, with this approach, you can install older versions, or specific product versions, and customize the OpenShift environment to fit your needs using the `oc` CLI approach. WARNING: If you have previously installed Dev Spaces using a different method, then run *dsc server:delete --delete-all --delete-namespace -n openshift-devspaces* as the `admin` user to completely remove the existing instance before you proceed with the installation. @@ -30,7 +30,7 @@ $ oc login -u admin __ . Operators can be installed in two modes - `Automatic` and `Manual`. `Automatic` is the simplest mode, where you do not need any manual intervention required and the operator is automatically installed. Inspect the configuration file at https://github.com/RedHatQuickCourses/devspaces-apps/blob/main/operator-cli/automatic-approval-operator.yaml. This file can be used to install Dev Spaces in `Automatic` mode. If you choose this option, skip the next steps for manual mode and jump directly to the step where you instantiate a new `CheCluster` instance. The https://github.com/RedHatQuickCourses/devspaces-apps/blob/main/operator-cli/checluster-cr.yaml file is used to create a new `CheCluster` resource. -. For manual installation mode, inspect and download the two YAML configuration files below. The first file defines a new namespace for installing Dev Spaces, along with the operator subscription, operator group and related configuration to install a specific version (v3.14) of Dev Spaces. The second file defines a basic configuration for the `CheCluster` resource and creates an instance named `devspaces`. +. For manual installation mode, inspect and download the two YAML configuration files below. The first file defines a new namespace for installing Dev Spaces, along with the operator subscription, operator group, and related configuration to install a specific version (v3.14) of Dev Spaces. The second file defines a basic configuration for the `CheCluster` resource and creates an instance named `devspaces`. + * https://github.com/RedHatQuickCourses/devspaces-apps/blob/main/operator-cli/manual-approval-operator.yaml * https://github.com/RedHatQuickCourses/devspaces-apps/blob/main/operator-cli/checluster-cr.yaml @@ -46,11 +46,11 @@ subscription.operators.coreos.com/devworkspace-operator created subscription.operators.coreos.com/openshift-devspaces created ---- -. You chose `Manual` approval for the operator installation, which means you need to log in to the OpenShift web console and `approve` the installation. You do not need to do this if you chose `Automatic` approval. Since we chose the manual approach, log in to the OpenShift web console as the `admin` user and click `Operators > Installed Operators`. Select `openshift-devspaces` in the `Project` drop-down. Click `Upgrade Available` link for the `devspaces` operator. +. You chose `Manual` approval for the operator installation, which means you need to log in to the OpenShift web console and `approve` the installation. You do not need to do this if you choose `Automatic` approval. Since we chose the manual approach, log in to the OpenShift web console as the `admin` user and click `Operators > Installed Operators`. Select `openshift-devspaces` in the `Project` drop-down. Click the `Upgrade Available` link for the `devspaces` operator. + image::op-manual-upgrade.png[title=Approval Required for Manual Install Mode] -. In the `InstallPlan Details` page, click `Preview InstallPlan`. You should see a list of resource that will be created. Click `Approve` to proceed with the installation. +. In the `InstallPlan Details` page, click `Preview InstallPlan`. You should see a list of resources that will be created. Click `Approve` to proceed with the installation. + image::install-plan-approve.png[title=Approve Install Plan] @@ -96,8 +96,8 @@ While you can install Dev Spaces using the OpenShift `oc` CLI tool and YAML conf === Pre-requisites -* You should have provisioned an OpenShift 4.16+ cluster as outlined the `Classroom Environment` section of the course home page. -* Download the OpenShift client `oc` for your platform from from the OpenShift web console by clicking the "?" icon on the top right navigation bar. Uncompress the archive file, and then copy the `oc` binary for your platform to the system path (usually `/usr/local/bin` on UNIX systems). +* You should have provisioned an OpenShift 4.16+ cluster as outlined in the `Classroom Environment` section of the course home page. +* Download the OpenShift client `oc` for your platform from the OpenShift web console by clicking the "?" icon on the top right navigation bar. Uncompress the archive file, and then copy the `oc` binary for your platform to the system path (usually `/usr/local/bin` on UNIX systems). * Cluster administrator access to OpenShift (both CLI and web console). Verify that you can log in to the OpenShift web console and CLI as a cluster administrator. * Download the latest `dsc` tool for your operating system from https://developers.redhat.com/products/openshift-dev-spaces/download. ** Extract the archive file and copy the `dsc` directory to a suitable location in your workstation (`/usr/local` is a good choice). @@ -107,7 +107,7 @@ While you can install Dev Spaces using the OpenShift `oc` CLI tool and YAML conf WARNING: If you have previously installed Dev Spaces using a different method, then run *dsc server:delete --delete-all --delete-namespace -n openshift-devspaces* as the `admin` user to completely remove the existing instance before you proceed with the installation. -. The `dsc` tool uses the log in context provided by the `oc` CLI tool to manage Dev Spaces instances. Log in as the `admin` user with the `oc` CLI before running `dsc`. Verify that you can execute the `dsc` binary file on your operating system. +. The `dsc` tool uses the login context provided by the `oc` CLI tool to manage Dev Spaces instances. Log in as the `admin` user with the `oc` CLI before running `dsc`. Verify that you can execute the `dsc` binary file on your operating system. + [subs=+quotes] ---- @@ -179,7 +179,7 @@ Command server:deploy has completed successfully in 02:51. + TIP: Use the `dsc server:deploy --help` command to list the full options to control the installation. In this course, we will configure a basic instance and then customize it using YAML configuration files. -. The previous command should print a lot of details about your Dev Spaces instance if installation was successful. You can also run the `dsc server:status` command to get the URL of the Dev Spaces dashboard +. The previous command should print a lot of details about your Dev Spaces instance if the installation was successful. You can also run the `dsc server:status` command to get the URL of the Dev Spaces dashboard + [subs=+quotes] ---- diff --git a/modules/ROOT/pages/config.adoc b/modules/ROOT/pages/config.adoc index 2d8e9d9..1881c3d 100644 --- a/modules/ROOT/pages/config.adoc +++ b/modules/ROOT/pages/config.adoc @@ -1,7 +1,7 @@ # Red Hat OpenShift Dev Spaces Configuration :navtitle: Configuration -Configuration involves controlling multiple aspects Red Hat OpenShift Dev Spaces around security, resource management, storage management, networking and customizing workspaces tailored to the kinds of applications being developed. +Configuration involves controlling multiple aspects of Red Hat OpenShift Dev Spaces around security, resource management, storage management, networking, and customizing workspaces tailored to the kinds of applications being developed. In this section, we focus on tasks that are typically managed by Dev Spaces administrators and OpenShift administrators: diff --git a/modules/ROOT/pages/fuse-overlay.adoc b/modules/ROOT/pages/fuse-overlay.adoc index ad2904a..7383a1b 100644 --- a/modules/ROOT/pages/fuse-overlay.adoc +++ b/modules/ROOT/pages/fuse-overlay.adoc @@ -169,7 +169,7 @@ spec: io.kubernetes.cri-o.Devices: /dev/fuse* ---- -. Log in as the `user1` user and launch an empty workspace from the dashboard. Launch a new terminal in the web IDE and first verify that the `/dev/fuse` device exists +. Log in as the `user1` user and launch an empty workspace from the dashboard. Launch a new terminal in the web IDE and first verify that the `/dev/fuse` device exists. + [source,bash,subs=+quotes] ---- diff --git a/modules/ROOT/pages/gitops.adoc b/modules/ROOT/pages/gitops.adoc index 948f392..7a4a838 100644 --- a/modules/ROOT/pages/gitops.adoc +++ b/modules/ROOT/pages/gitops.adoc @@ -1,4 +1,4 @@ -= Installing Dev Spaces using OpenShift GitOps += Installing Dev Spaces Using OpenShift GitOps :navtitle: GitOps For managing multiple operators with complex customization and configuration, the *GitOps* approach is recommended to simplify configuration management, and provide traceability and auditing. You maintain the operator configuration, along with other cluster resources needed for the operator to work in a Git repository, and a product like *OpenShift GitOps* (based on the open source ArgoCD project) keeps track of the Git repository and applies the changes automatically to the cluster without manual intervention. @@ -7,12 +7,12 @@ In this section, you will install OpenShift GitOps, and then store the Dev Space == Pre-requisites -* You should have provisioned an OpenShift 4.16+ cluster as outlined the `Classroom Environment` section of the course home page. -* Download the OpenShift client `oc` for your platform from from the OpenShift web console by clicking the "?" icon on the top right navigation bar. Uncompress the archive file, and then copy the `oc` binary for your platform to the system path (usually `/usr/local/bin` on UNIX systems). +* You should have provisioned an OpenShift 4.16+ cluster as outlined in the `Classroom Environment` section of the course home page. +* Download the OpenShift client `oc` for your platform from the OpenShift web console by clicking the "?" icon on the top right navigation bar. Uncompress the archive file, and then copy the `oc` binary for your platform to the system path (usually `/usr/local/bin` on UNIX systems). * Cluster administrator access to OpenShift (both CLI and web console). Verify that you can log in to the OpenShift web console and CLI as a cluster administrator. * Download the latest `dsc` tool for your operating system from https://developers.redhat.com/products/openshift-dev-spaces/download. ** Extract the archive file and copy the `dsc` directory to a suitable location in your workstation (`/usr/local` is a good choice). -** Add the `/usr/local/dsc/bin` folder to your operating system `PATH` environment variable +** Add the `/usr/local/dsc/bin` folder to your operating system `PATH` environment variable. == Lab: Installing Dev Spaces using OpenShift GitOps @@ -22,7 +22,7 @@ WARNING: If you have previously installed Dev Spaces using a different method, t . Fork the Git repository https://github.com/RedHatQuickCourses/devspaces-apps.git to your own Git account (GitHub or GitLab should work fine). + -WARNING: You will point the OpenShift GitOps configuration to fetch the operator configuration from this forked Git repository. If you fail to point the GitOps configuration to the your forked repository, then the configuration from the upstream `RedHatQuickCourses` repository will be applied and may break your Dev Spaces instance! +WARNING: You will point to the OpenShift GitOps configuration to fetch the operator configuration from this forked Git repository. If you fail to point the GitOps configuration to your forked repository, then the configuration from the upstream `RedHatQuickCourses` repository will be applied and may break your Dev Spaces instance! . Log in to the OpenShift cluster as the `admin` user (user with cluster administrator permissions) using the `oc` CLI. + @@ -31,7 +31,7 @@ WARNING: You will point the OpenShift GitOps configuration to fetch the operator $ oc login -u admin __ ---- -. Download and inspect the https://github.com/RedHatQuickCourses/devspaces-apps/blob/main/gitops-install/gitops-operator.yaml file from your forked repository. This configuration is used to install the OpenShift GitOps operator (For simplicity sake, we install it in `Automatic` approval mode). +. Download and inspect the https://github.com/RedHatQuickCourses/devspaces-apps/blob/main/gitops-install/gitops-operator.yaml file from your forked repository. This configuration is used to install the OpenShift GitOps operator (For simplicity's sake, we install it in `Automatic` approval mode). . Apply the configuration to install OpenShift GitOps + @@ -44,11 +44,11 @@ Wait for a few minutes while the GitOps operator is installed. Click on `Operato + image::gitops-op-success.png[title=GitOps operator installed] -. After the installation finishes, the OpenShift web console will inform you that you need to refresh the web console. Do so, and you will now see a new application shortcut to the OpenShift GitOps dashboard +. After the installation finishes, the OpenShift web console will inform you that you need to refresh the web console. Do so, and you will now see a new application shortcut to the OpenShift GitOps dashboard. + image::new-argocd-link.png[title=New ArgoCD Dashboard Link] -. Click the `Cluster ArgoCD` link. You will be shown the ArgoCD log in page. A random password has been automatically generated for you by the operator. To get the password, run the following `oc` command: +. Click the `Cluster ArgoCD` link. You will be shown the ArgoCD login page. A random password has been automatically generated for you by the operator. To get the password, run the following `oc` command: + [subs=+quotes] ---- @@ -60,7 +60,7 @@ Copy the password for the next step. . Log in to ArgoCD as the user `admin` with the password extracted from the previous step. + -image::argocd-login.png[title=ArgoCD Log in Page] +image::argocd-login.png[title=ArgoCD Login Page] . After you log in you should see the ArgoCD dashboard page with no ArgoCD applications installed. Before you create a new ArgoCD application, you need to provide permissions to the ArgoCD controller running in the `openshift-gitops` namespace to create resources in the `openshift-devspaces` namespace. The easiest way to do this is to provide `cluster-admin` role to the service account running the controller. Run the following command as a cluster administrator user: + diff --git a/modules/ROOT/pages/image-puller.adoc b/modules/ROOT/pages/image-puller.adoc index 142e7f0..164a407 100644 --- a/modules/ROOT/pages/image-puller.adoc +++ b/modules/ROOT/pages/image-puller.adoc @@ -1,11 +1,11 @@ # Configuring the Kubernetes Image Puller :navtitle: Image Puller -In the previous lab, you would have noted that it took a long time for the Workspace to start and display the IDE, even if the Workspace was empty (No source code tree). Dev Spaces loads a default container image (called the **Universal Developer Image - UDI**) in a Workspace if you did not specify one explicitly. To reduce the start up time of workspaces, use the **Image Puller**, an OpenShift component that can be used to pre-pull and cache container images. +In the previous lab, you would have noted that it took a long time for the Workspace to start and display the IDE, even if the Workspace was empty (No source code tree). Dev Spaces loads a default container image (called the **Universal Developer Image - UDI**) in a Workspace if you did not specify one explicitly. To reduce the start-up time of workspaces, use the **Image Puller**, an OpenShift component that can be used to pre-pull and cache container images. -The Image Puller is an additional OpenShift deployment which creates a `DaemonSet` that can be configured to pre-pull relevant OpenShift Dev Spaces workspace images on each node. These images would already be available when an OpenShift Dev Spaces workspace starts, therefore improving the workspace start up time. +The Image Puller is an additional OpenShift deployment that creates a `DaemonSet` that can be configured to pre-pull relevant OpenShift Dev Spaces workspace images on each node. These images would already be available when an OpenShift Dev Spaces workspace starts, therefore improving the workspace start-up time. -NOTE: Dev Spaces, by default caches container images at the OpenShift node level. For example, if `user1` downloads a 5GB container image, and if his workspace is scheduled on `node1` of an OpenShift cluster, then if `user2` uses the same container image in his workspace, which is also scheduled on `node1`, then `user2` will see faster start up time of his workspace due to caching. However if `user2` workspace is scheduled on `node2`, which does NOT have the container images cached, he will see increased start up time while the 5GB image is downloaded on `node2`. The Kubernetes image puller solves this problem by caching a list of container images on **every** node in the OpenShift cluster. +NOTE: Dev Spaces, by default caches container images at the OpenShift node level. For example, if `user1` downloads a 5GB container image, and if his workspace is scheduled on `node1` of an OpenShift cluster, then if `user2` uses the same container image in his workspace, which is also scheduled on `node1`, then `user2` will see faster start-up time of his workspace due to caching. However, if `user2` workspace is scheduled on `node2`, which does NOT have the container images cached, he will see increased start-up time while the 5GB image is downloaded on `node2`. The Kubernetes image puller solves this problem by caching a list of container images on **every** node in the OpenShift cluster. == Lab: Configure the Kubernetes Image Puller @@ -78,7 +78,7 @@ spec: <1> - Enable the image puller <2> - List of images to pre-pull on OpenShift nodes separated by semi-colon (";") -. Navigate back to the `Operators > Installed Operators` page in the OpenShift web console. Click `Kubernetes Image Puller` in the `Provided APIs` column. Observe that a new instance of `KubernetesImagePuller` CR, named `devspaces-image-puller` is now active. Click on `devspaces-image-puller` and verify that your list of images is listed in the `Images to pull` field at the bottom of the screen +. Navigate back to the `Operators > Installed Operators` page in the OpenShift web console. Click `Kubernetes Image Puller` in the `Provided APIs` column. Observe that a new instance of `KubernetesImagePuller` CR, named `devspaces-image-puller` is now active. Click on `devspaces-image-puller` and verify that your list of images is listed in the `Images to pull` field at the bottom of the screen. + image::image-puller-list.png[title=List of images to pull] diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc index bb6615c..49e1666 100644 --- a/modules/ROOT/pages/index.adoc +++ b/modules/ROOT/pages/index.adoc @@ -12,15 +12,15 @@ This course is the `second` in a series of `five` courses about Red Hat OpenShif . Creating and Customizing Workspaces in Red Hat OpenShift Dev Spaces (_Under Development_) . Configuring Plugins in Red Hat OpenShift Dev Spaces (_Under Development_) -This course covers the install, updates and uninstall process for Red Hat OpenShift Dev Spaces. +This course covers the install, updates, and uninstall process for Red Hat OpenShift Dev Spaces. -NOTE: The hands-on labs for this course have been tested on *Red Hat OpenShift Dev Spaces 3.16*. The labs should mostly work in minor update releases of Dev Spaces. If you encounter any issues, please open a GitHub issue in the course repository. +NOTE: The hands-on labs for this course have been tested on *Red Hat OpenShift Dev Spaces 3.16*. The labs should mostly work on minor update releases of Dev Spaces. If you encounter any issues, please open a GitHub issue in the course repository. == Course Objectives The overall objectives of this course include: -* Install, Upgrade and Uninstall Red Hat OpenShift Dev Spaces on OpenShift Container Platform +* Install, Upgrade, and Uninstall Red Hat OpenShift Dev Spaces on the OpenShift Container Platform ** Using the operator ** Using the `dsc` CLI ** Using OpenShift GitOps @@ -30,7 +30,7 @@ The overall objectives of this course include: * Basic knowledge of OpenShift (or Kubernetes) administration * Knowledge of building Docker or Podman containers * Deploying container images on OpenShift or Kubernetes -* OpenShift or Kubernetes User and Role administration +* OpenShift or Kubernetes User and Role Administration == Contributors @@ -50,11 +50,11 @@ Red Hat associates and others who have access to the Red Hat Demo Platform (RHDP This classroom does *NOT* have Dev Spaces pre-installed. You install and configure a basic Dev Spaces instance in this course, and then continue using this instance with other courses in the learning path. -Click the RHDP link above, log in to RHDP, and click `Order` to request a new OpenShift cluster. In the order page for the catalog item, do the following: +Click the RHDP link above, log in to RHDP, and click `Order` to request a new OpenShift cluster. On the order page for the catalog item, do the following: * *Activity*: Select `Practice/Enablement` * *Purpose*: Select `Learning about the Product` -* *Salesforce ID*: If you have an opportunity ID, enter it into this field, otherwise select `Project`, and then enter "Learning about Dev Spaces" in the text field. You will see a warning message that a Salesforce ID is required, but you can safely ignore it +* *Salesforce ID*: If you have an opportunity ID, enter it into this field, otherwise select `Project`, and then enter "Learning about Dev Spaces" in the text field. You will see a warning message that a Salesforce ID is required, but you can safely ignore it. * *Features*: Select `Enable Let's Encrypt` * *Region*: Select the AWS region closest to your location * *User count*: `1` @@ -64,7 +64,7 @@ Click the RHDP link above, log in to RHDP, and click `Order` to request a new Op Select the checkbox at the bottom of the page to confirm that lab costs will be charged to your cost center, and click `Order`. -NOTE: The lab environment will take an hour to provision. You can check the status and details of the OpenShift cluster from the `Services` page of RHDP. The classroom is available for 48 hours initially. You can extend the duration of classroom availability by clicking `Help > Get Technical Help` in RHDP, and then requesting for an extension by opening a ServiceNow ticket with the RHDP team. +NOTE: The lab environment will take an hour to provision. You can check the status and details of the OpenShift cluster from the `Services` page of RHDP. The classroom is available for 48 hours initially. You can extend the duration of classroom availability by clicking `Help > Get Technical Help` in RHDP, and then requesting an extension by opening a ServiceNow ticket with the RHDP team. === For Red Hat Partners @@ -96,8 +96,10 @@ $ oc replace -f *authentication.yaml* $ oc apply -f *secret.yaml* ---- + -Log out from the OpenShift web console and CLI. You may have to wait for 5 minutes while the changes take effect. You will see a log in prompt with the `htpasswd_provider` displayed. +Log out from the OpenShift web console and CLI. You may have to wait for 5 minutes while the changes take effect. You will see a login prompt with the `htpasswd_provider` displayed. + image::htpasswd-provider.png[title=Updated Log in Page] -. On the updated log in page, click the `htpasswd_provider` button, and log in as the `admin` user with password `openshift23` to access the OpenShift web console as a cluster administrator. Repeat the process for the `user1` user and verify that you can access the OpenShift web console as a regular non-admin user. +. On the updated login page, click the `htpasswd_provider` button, and log in as the `admin` user with password `openshift23` to access the OpenShift web console as a cluster administrator. Repeat the process for the `user1` user and verify that you can access the OpenShift web console as a regular non-admin user. + +// Just one question - Should this "Configuring OpenShift Users and Authentication" be on a seperate page than on the landing page? I mean, ideally, landing page should only have a short description, objectives, pre-requisites, and similar stuff. \ No newline at end of file diff --git a/modules/ROOT/pages/install.adoc b/modules/ROOT/pages/install.adoc index 159038d..10ddb38 100644 --- a/modules/ROOT/pages/install.adoc +++ b/modules/ROOT/pages/install.adoc @@ -10,7 +10,7 @@ CLI:: You can install Dev Spaces using the Dev Spaces client (`dsc`), or the OpenShift client (`oc`) CLI. GitOps:: -You can automate the installation, configuration and maintenance of the Dev Spaces instance using **OpenShift GitOps**. You maintain a set of YAML configuration files in a Git repository, and OpenShift GitOps tracks the changes in this repository and applies the changes automatically to the OpenShift cluster. +You can automate the installation, configuration, and maintenance of the Dev Spaces instance using **OpenShift GitOps**. You maintain a set of YAML configuration files in a Git repository, and OpenShift GitOps tracks the changes in this repository and applies the changes automatically to the OpenShift cluster. The following sections will cover these options in more detail. diff --git a/modules/ROOT/pages/operator.adoc b/modules/ROOT/pages/operator.adoc index 52fae19..eddebaa 100644 --- a/modules/ROOT/pages/operator.adoc +++ b/modules/ROOT/pages/operator.adoc @@ -5,8 +5,8 @@ Red Hat OpenShift Dev Spaces is available as an operator that can be installed u == Pre-requisites -* You should have provisioned an OpenShift 4.16+ cluster as outlined the `Classroom Environment` section of the course home page. -* Download the OpenShift client `oc` for your platform from from the OpenShift web console by clicking the "?" icon on the top right navigation bar. Uncompress the archive file, and then copy the `oc` binary for your platform to the system path (usually `/usr/local/bin` on UNIX systems). +* You should have provisioned an OpenShift 4.16+ cluster as outlined in the `Classroom Environment` section of the course home page. +* Download the OpenShift client `oc` for your platform from the OpenShift web console by clicking the "?" icon on the top right navigation bar. Uncompress the archive file, and then copy the `oc` binary for your platform to the system path (usually `/usr/local/bin` on UNIX systems). * Cluster administrator access to OpenShift (both CLI and web console). Verify that you can log in to the OpenShift web console and CLI as a cluster administrator. == Lab: Installing Dev Spaces Using the OpenShift Web Console diff --git a/modules/ROOT/pages/upgrade.adoc b/modules/ROOT/pages/upgrade.adoc index aac9b90..bab494e 100644 --- a/modules/ROOT/pages/upgrade.adoc +++ b/modules/ROOT/pages/upgrade.adoc @@ -6,7 +6,7 @@ The Red Hat OpenShift Dev Spaces Operator supports two upgrade strategies: * Automatic - The Operator __automatically__ installs new updates when they become available. * Manual - New updates need to be __manually__ approved before installation begins. -If you chose the `Manual` approval mode, then the OpenShift web console indicates that an upgrade is available in the `Operators > Installed Operators` page. +If you chose the `Manual` approval mode, then the OpenShift web console indicates that an upgrade is available on the `Operators > Installed Operators` page. image::upgrades-available.png[title=Upgrades Available for Dev Spaces]