Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[data-dashboard-backend] Change path for api to /dashboard-data #307

Merged
merged 1 commit into from
Jan 3, 2025
Merged

[data-dashboard-backend] Change path for api to /dashboard-data #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions charts/data-dashboard-backend/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
appVersion: "0.2.2"
name: data-dashboard-backend
description: API for data in the data dashboard
version: 0.3.7
version: 0.3.8
sources: ["https://github.com/thehyve/radar-data-dashboard-backend"]
deprecated: false
type: application
Expand All @@ -11,9 +11,6 @@ maintainers:
- email: [email protected]
name: Keyvan Hedayati
url: https://www.thehyve.nl
- email: [email protected]
name: Nivethika Mahasivam
url: https://www.thehyve.nl/experts/nivethika-mahasivam
- email: [email protected]
name: Pim van Nierop
url: https://www.thehyve.nl/experts/pim-van-nierop
6 changes: 2 additions & 4 deletions charts/data-dashboard-backend/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# data-dashboard-backend

![Version: 0.3.7](https://img.shields.io/badge/Version-0.3.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.2](https://img.shields.io/badge/AppVersion-0.2.2-informational?style=flat-square)
![Version: 0.3.8](https://img.shields.io/badge/Version-0.3.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.2](https://img.shields.io/badge/AppVersion-0.2.2-informational?style=flat-square)

API for data in the data dashboard

Expand All @@ -13,7 +13,6 @@ API for data in the data dashboard
| Name | Email | Url |
| ---- | ------ | --- |
| Keyvan Hedayati | <[email protected]> | <https://www.thehyve.nl> |
| Nivethika Mahasivam | <[email protected]> | <https://www.thehyve.nl/experts/nivethika-mahasivam> |
| Pim van Nierop | <[email protected]> | <https://www.thehyve.nl/experts/pim-van-nierop> |

## Source Code
Expand Down Expand Up @@ -44,7 +43,7 @@ API for data in the data dashboard
| ingress.enabled | bool | `true` | Enable ingress controller resource |
| ingress.ingressClassName | string | `"nginx"` | Ingress class name |
| ingress.annotations | object | check values.yaml | Annotations that define default ingress class, certificate issuer |
| ingress.path | string | `"/api"` | Path within the url structure |
| ingress.path | string | `"/dashboard-data"` | Path within the url structure |
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a need for documentation to be updated for this? Or maybe the radar-home chart?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@keyvaann No I do not think so. Since this is only a backend (used by aRMT for now) we not need it in radar-home. The change in this PR is there so we no longer have to set this in helmfile (done for MySkin).

| ingress.pathType | string | `"ImplementationSpecific"` | |
| ingress.hosts | list | `["localhost"]` | Hosts to accept requests from |
| ingress.tls.secretName | string | `"radar-base-tls"` | |
Expand All @@ -63,7 +62,6 @@ API for data in the data dashboard
| managementPortal.clientId | string | `"radar_data_dashboard_backend"` | ManagementPortal OAuth 2.0 client ID, having grant type client_credentials |
| managementPortal.clientSecret | string | `"secret"` | ManagementPortal OAuth 2.0 client secret |
| jwtResourceName | string | `"res_DataDashboardAPI"` | JWT Resource name to use for this service in ManagementPortal |
| path | string | `"/api"` | Base path to use in application |
| jdbc.driver | string | `"org.postgresql.Driver"` | JDBC Driver to connect to the database. |
| jdbc.url | string | `"jdbc:postgresql://postgresql:5432/data-dashboard"` | JDBC Connection url of the database. |
| jdbc.user | string | `"postgres"` | Username of the database |
Expand Down
2 changes: 1 addition & 1 deletion charts/data-dashboard-backend/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
data:
dashboard.yml: |
service:
baseUri: http://0.0.0.0:9000{{ .Values.path }}
baseUri: http://0.0.0.0:9000{{ .Values.ingress.path }}
advertisedBaseUri: null
enableCors: true
auth:
Expand Down
5 changes: 1 addition & 4 deletions charts/data-dashboard-backend/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ ingress:
annotations:
cert-manager.io/cluster-issuer: letsencrypt-prod
# -- Path within the url structure
path: /api
path: /dashboard-data
pathType: ImplementationSpecific
# -- Hosts to accept requests from
hosts:
Expand Down Expand Up @@ -148,9 +148,6 @@ managementPortal:
# -- JWT Resource name to use for this service in ManagementPortal
jwtResourceName: res_DataDashboardAPI

# -- Base path to use in application
path: /api

jdbc:
# -- JDBC Driver to connect to the database.
driver: org.postgresql.Driver
Expand Down
Loading