Skip to content

Commit

Permalink
Merge pull request #59 from MaastrichtU-IDS/SeunDev
Browse files Browse the repository at this point in the history
change every occurence of oc login to the new way of copying the toke…
  • Loading branch information
seunAdeks authored Jun 7, 2024
2 parents 84cdd46 + 88a1a7b commit 45f42b3
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 10 deletions.
8 changes: 3 additions & 5 deletions website/docs/access-dsri.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,12 @@ Use your general UM password.

If you do not have access to the DSRI [contact us](mailto:[email protected]).

You will be able to login at **[https://console-openshift-console.apps.dsri2.unimaas.nl](https://console-openshift-console.apps.dsri2.unimaas.nl)** either using:

* The **prefix of your UM email address** with the first letter capitalized, e.g. `Firstname.Lastname` or `F.Lastname`
* Or your **employee number** at Maastricht University (a.k.a. P number), e.g. `P7000000`
* If you are a **student**, it will always be your **student ID** at Maastricht University (a.k.a. your I number), e.g. `I6000000`
You will be able to login at **[https://console-openshift-console.apps.dsri2.unimaas.nl](https://console-openshift-console.apps.dsri2.unimaas.nl)** using the standard maastricht portal upon clicking the login button:

<img src="/img/screenshot_login_screen.png" alt="Login screen" style={{maxWidth: '100%', maxHeight: '100%'}} />

<img src="/img/screenshot_um_login_screen.png" alt="Login screen" style={{maxWidth: '100%', maxHeight: '100%'}} />

:::info Command line interface

We recommend you to install the `oc` command line interface to perform additional operations on your applications, such as loading large amount of data using `oc cp`, or deploying an application from a local `Dockerfile`. Instructions on installing the client can be found [➡ here](/docs/openshift-install)
Expand Down
3 changes: 2 additions & 1 deletion website/docs/guide-dockerfile-to-openshift.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ git clone [email protected]:dsri-examples/dockerfile-to-okd.git
After cloning you now have a local folder containing a Dockerfile and index.html file. Inspect both files.

Login with the openshift client:
[Authenticate to the OpenShift cluster](/docs/openshift-install) using `oc login` .
```shell
oc login https://console-openshift-console.apps.dsri2.unimaas.nl
oc login --token=<token>
```

Create a new project if you don't have a project yet you can work with (change myproject to a project name of your choice:
Expand Down
2 changes: 1 addition & 1 deletion website/docs/openshift-commands.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Here is an overview of common `oc` commands:

| **Command** | **Description** |
| -------------------------------- | ------------------------------------------------------------ |
| `oc login <host> -u <user>` | Login to the DSRI OpenShift cluster in your terminal |
| `oc login --token=<token>` | Login to the DSRI OpenShift cluster in your terminal |
| `oc get projects` | List all available projects |
| `oc project <project> ` | Switch to project |
| `oc get pods ` | Get running pods (a pod can run one or multiple containers for your application) |
Expand Down
6 changes: 3 additions & 3 deletions website/docs/openshift-install.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,13 @@ See the [official documentation to install the client](https://docs.okd.io/lates

## Login in the terminal with `oc`

To use the `oc` Command Line Interface, you will need to authenticate to the [DSRI](https://console-openshift-console.apps.dsri2.unimaas.nl/console) in you terminal (edit it to use your username):
To use the `oc` Command Line Interface, you will need to authenticate to the [DSRI](https://console-openshift-console.apps.dsri2.unimaas.nl/console) in your terminal:

```bash
oc login https://api.dsri2.unimaas.nl:6443 -u Your.Username
oc login --token=<token>
```

Otherwise try to use the token provided by the Web UI:
The token is provided by the Web UI:

1. Go to the [DSRI web UI](https://console-openshift-console.apps.dsri2.unimaas.nl/console).

Expand Down
Binary file modified website/static/img/screenshot_login_screen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added website/static/img/screenshot_um_login_screen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 45f42b3

Please sign in to comment.