From e24071df861c2c326d3e22822a8a84706adcd8a5 Mon Sep 17 00:00:00 2001 From: Johann-Michael Thiebaut Date: Tue, 31 Oct 2023 13:30:49 +0100 Subject: [PATCH 01/11] feat: let users pin projects to the dashboard --- CHANGELOG.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 0cd231591b..6fb953f8ba 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,10 @@ .. _changelog: +0.43.0 +------ + +(ShapeUp): Let users pin projects to the dashboard. + 0.42.0 ------ From 398014b71383441b584aba252c472d35bbde62ea Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Mon, 13 Nov 2023 09:18:05 +0100 Subject: [PATCH 02/11] Add MAX_PINNED_PROJECTS config --- .../templates/data-service/deployment.yaml | 6 +- helm-chart/renku/values.yaml | 99 ++++++++++--------- 2 files changed, 56 insertions(+), 49 deletions(-) diff --git a/helm-chart/renku/templates/data-service/deployment.yaml b/helm-chart/renku/templates/data-service/deployment.yaml index e5062dca76..edfd12883c 100644 --- a/helm-chart/renku/templates/data-service/deployment.yaml +++ b/helm-chart/renku/templates/data-service/deployment.yaml @@ -53,7 +53,7 @@ spec: name: {{ .Values.global.db.common.passwordSecretName }} key: password - name: KEYCLOAK_URL - value: {{ (printf "%s://%s/auth/" (include "renku.http" .) .Values.global.renku.domain) | quote}} + value: {{ (printf "%s://%s/auth/" (include "renku.http" .) .Values.global.renku.domain) | quote }} - name: KEYCLOAK_TOKEN_SIGNATURE_ALGS value: "RS256" - name: SERVER_DEFAULTS @@ -63,7 +63,9 @@ spec: - name: K8S_NAMESPACE value: {{ .Release.Namespace | quote }} - name: GITLAB_URL - value: {{ .Values.global.gitlab.url | quote}} + value: {{ .Values.global.gitlab.url | quote }} + - name: MAX_PINNED_PROJECTS + value: {{ .Values.dataService.maxPinnedProjects | quote }} {{- include "certificates.env.python" $ | nindent 12 }} volumeMounts: - name: server-options diff --git a/helm-chart/renku/values.yaml b/helm-chart/renku/values.yaml index d9989a8293..e2806a6950 100644 --- a/helm-chart/renku/values.yaml +++ b/helm-chart/renku/values.yaml @@ -212,7 +212,7 @@ ingress: ## Hosts for the ingress ## Should include at least the value from `global.renku.domain` hosts: - - example.local + - example.local ## TLS setting for the ingress tls: [] # - secretName: chart-example-tls @@ -239,13 +239,13 @@ keycloakx: value: "10" command: - - "/opt/keycloak/bin/kc.sh" - - "start" - - "--http-enabled=true" - - "--http-port=8080" - - "--hostname-strict=false" - - "--hostname-strict-https=false" - - "--auto-build" + - "/opt/keycloak/bin/kc.sh" + - "start" + - "--http-enabled=true" + - "--http-port=8080" + - "--hostname-strict=false" + - "--hostname-strict-https=false" + - "--auto-build" # The following environment variables are provided to keycloak # as extraEnvFrom secrets. @@ -676,12 +676,12 @@ ui: templates: custom: true repositories: - - url: https://github.com/SwissDataScienceCenter/renku-project-template - ref: 0.7.1 - name: Renku - - url: https://github.com/SwissDataScienceCenter/contributed-project-templates - ref: 0.6.0 - name: Community + - url: https://github.com/SwissDataScienceCenter/renku-project-template + ref: 0.7.1 + name: Renku + - url: https://github.com/SwissDataScienceCenter/contributed-project-templates + ref: 0.6.0 + name: Community # This defines the threshold for automatically showing a preview when browsing projects' files. # Above the soft limit, the user receives a warning. Above the hard limit, no preview is available. previewSizeThreshold: @@ -742,7 +742,8 @@ ui: enabled: false title: "Renku real-world use cases: Conducted by SDSC and ETH Domain" # Markdown is allowed in the description - description: The case studies presented here **bridge the gap** from domain + description: + The case studies presented here **bridge the gap** from domain to data science and provide experts from both sides with the means to examine, confirm, and extend the datasets and their analyses, without extensive investments of time and infrastructure. @@ -751,12 +752,13 @@ ui: # To showcase projects, provide the identifier following the structure below # title, description, and imageUrl can be overridden, as illustrated below, if desired. projects: - - identifier: hdbi/data-management/cccooci - - identifier: renku-ui-tests/stable-project - overrideTitle: "Stable Project: A project for testing" - overrideDescription: "This is a project for **testing**. You may find it - useful to look at." - overrideImageUrl: https://gitlab.renkulab.io/uploads/-/system/project/avatar/36159/graphical_abstract.png + - identifier: hdbi/data-management/cccooci + - identifier: renku-ui-tests/stable-project + overrideTitle: "Stable Project: A project for testing" + overrideDescription: + "This is a project for **testing**. You may find it + useful to look at." + overrideImageUrl: https://gitlab.renkulab.io/uploads/-/system/project/avatar/36159/graphical_abstract.png coreApiVersionConfig: ## Configuration to specify which version of the core-service API should be used # "/" indicates that the latest version should be used @@ -805,8 +807,8 @@ ui: # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" hosts: - - host: chart-example.local - paths: [] + - host: chart-example.local + paths: [] tls: [] # - secretName: chart-example-tls # hosts: @@ -1063,7 +1065,7 @@ notebooks: # kubernetes.io/tls-acme: "true" path: / hosts: - - chart-example.local + - chart-example.local tls: [] # - secretName: chart-example-tls # hosts: @@ -1276,26 +1278,27 @@ jena: password: persistence: accessModes: - - ReadWriteOnce + - ReadWriteOnce size: 10Gi additionalEnvironmentVariables: - - name: JVM_ARGS - value: -Xmx2G -Xms2G + - name: JVM_ARGS + value: -Xmx2G -Xms2G resources: requests: cpu: 1000m memory: 3Gi additionalVolumeMounts: - - name: shiro - mountPath: /fuseki/shiro.ini - subPath: shiro.ini - readOnly: true + - name: shiro + mountPath: /fuseki/shiro.ini + subPath: shiro.ini + readOnly: true additionalVolumes: - - name: shiro - configMap: - name: shiro-ini - defaultMode: 0555 - additionalInitContainerScript: "find /fuseki -name tdb.lock -type f -delete && find + - name: shiro + configMap: + name: shiro-ini + defaultMode: 0555 + additionalInitContainerScript: + "find /fuseki -name tdb.lock -type f -delete && find /fuseki/configuration -name *.ttl -type f -empty -delete && echo clean-up done" test: enabled: false @@ -1303,7 +1306,7 @@ graph: webhookService: image: repository: renku/webhook-service - tag: '2.45.0' + tag: "2.45.0" pullPolicy: IfNotPresent service: type: ClusterIP @@ -1322,7 +1325,7 @@ graph: tokenRepository: image: repository: renku/token-repository - tag: '2.45.0' + tag: "2.45.0" pullPolicy: IfNotPresent service: type: ClusterIP @@ -1334,10 +1337,10 @@ graph: jvmXmx: 128M gitlab: rateLimit: 50/sec - projectTokenTTL: '365 days' + projectTokenTTL: "365 days" # name of the Project Access Tokens to be created on behalf of the user in GitLab; defaults to .Release.Name projectTokenName: - projectTokenDuePeriod: '184 days' + projectTokenDuePeriod: "184 days" connectionPool: 2 tokenEncryption: ## A secret for signing access tokens stored in the database @@ -1347,7 +1350,7 @@ graph: replicas: 1 image: repository: renku/triples-generator - tag: '2.45.0' + tag: "2.45.0" pullPolicy: IfNotPresent service: type: ClusterIP @@ -1369,7 +1372,7 @@ graph: replicas: 1 image: repository: renku/knowledge-graph - tag: '2.45.0' + tag: "2.45.0" pullPolicy: IfNotPresent service: type: ClusterIP @@ -1388,7 +1391,7 @@ graph: eventLog: image: repository: renku/event-log - tag: '2.45.0' + tag: "2.45.0" pullPolicy: IfNotPresent service: type: ClusterIP @@ -1403,7 +1406,7 @@ graph: commitEventService: image: repository: renku/commit-event-service - tag: '2.45.0' + tag: "2.45.0" pullPolicy: IfNotPresent service: type: ClusterIP @@ -1416,9 +1419,9 @@ graph: rateLimit: 10/sec sentry: enabled: false - dsn: '' # Sentry dsn - sentryDsnRenkuPython: '' # Sentry dsn for renku CLI - environment: '' # Environment name e.g. renkulabio + dsn: "" # Sentry dsn + sentryDsnRenkuPython: "" # Sentry dsn for renku CLI + environment: "" # Environment name e.g. renkulabio persistence: enabled: true ## A manually managed Persistent Volume and Claim @@ -1507,6 +1510,8 @@ dataService: nodeSelector: {} tolerations: [] affinity: {} + # This defines the maximum number of pinned projects in user preferences + maxPinnedProjects: 5 podSecurityContext: {} securityContext: runAsUser: 1000 From 11bbd40950701e0399bf614b60e6e2786402fa6b Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Tue, 14 Nov 2023 09:23:40 +0100 Subject: [PATCH 03/11] propagate maxPinnedProjects to UI --- .../renku/templates/ui/ui-client-deployment-template.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/helm-chart/renku/templates/ui/ui-client-deployment-template.yaml b/helm-chart/renku/templates/ui/ui-client-deployment-template.yaml index ecfa9e4f7a..0d554fc275 100644 --- a/helm-chart/renku/templates/ui/ui-client-deployment-template.yaml +++ b/helm-chart/renku/templates/ui/ui-client-deployment-template.yaml @@ -107,6 +107,8 @@ spec: value: {{ toJson .Values.ui.client.coreApiVersionConfig | quote }} - name: KEYCLOAK_REALM value: {{ include "renku.keycloak.realm" . | quote }} + - name: USER_PREFERENCES_MAX_PINNED_PROJECTS + value: {{ .Values.dataService.maxPinnedProjects | quote }} livenessProbe: httpGet: path: / From 80d36d3dc8da376b06f09430cea77cae81643047 Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Wed, 22 Nov 2023 13:54:29 +0100 Subject: [PATCH 04/11] Update renku-data-services tag --- helm-chart/renku/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-chart/renku/values.yaml b/helm-chart/renku/values.yaml index ebcc7e53be..a624e7a056 100644 --- a/helm-chart/renku/values.yaml +++ b/helm-chart/renku/values.yaml @@ -1491,7 +1491,7 @@ initDb: dataService: image: repository: renku/renku-data-service - tag: "0.2.3" + tag: "0.3.0" pullPolicy: IfNotPresent service: type: ClusterIP From 8d61a37019b853e43f48d6354be78cdaed3bb373 Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Fri, 24 Nov 2023 14:59:26 +0100 Subject: [PATCH 05/11] update renku-ui --- CHANGELOG.rst | 1 - helm-chart/renku/values.yaml | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f7cd955da4..24d3d4f55d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,7 +4,6 @@ ------ (ShapeUp): Let users pin projects to the dashboard. -Renku ``0.43.0`` brings improvements to the KG API. 0.43.0 ------ diff --git a/helm-chart/renku/values.yaml b/helm-chart/renku/values.yaml index 8fd58ee0e9..b538c7f204 100644 --- a/helm-chart/renku/values.yaml +++ b/helm-chart/renku/values.yaml @@ -619,7 +619,7 @@ ui: replicaCount: 1 image: repository: renku/renku-ui - tag: "3.15.1" + tag: "3.16.0" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. @@ -780,7 +780,7 @@ ui: keepCookies: [] image: repository: renku/renku-ui-server - tag: "3.15.1" + tag: "3.16.0" pullPolicy: IfNotPresent imagePullSecrets: [] nameOverride: "" @@ -1305,7 +1305,7 @@ graph: webhookService: image: repository: renku/webhook-service - tag: '2.47.1' + tag: "2.47.1" pullPolicy: IfNotPresent service: type: ClusterIP @@ -1324,7 +1324,7 @@ graph: tokenRepository: image: repository: renku/token-repository - tag: '2.47.1' + tag: "2.47.1" pullPolicy: IfNotPresent service: type: ClusterIP @@ -1349,7 +1349,7 @@ graph: replicas: 1 image: repository: renku/triples-generator - tag: '2.47.1' + tag: "2.47.1" pullPolicy: IfNotPresent service: type: ClusterIP @@ -1371,7 +1371,7 @@ graph: replicas: 1 image: repository: renku/knowledge-graph - tag: '2.47.1' + tag: "2.47.1" pullPolicy: IfNotPresent service: type: ClusterIP @@ -1390,7 +1390,7 @@ graph: eventLog: image: repository: renku/event-log - tag: '2.47.1' + tag: "2.47.1" pullPolicy: IfNotPresent service: type: ClusterIP @@ -1405,7 +1405,7 @@ graph: commitEventService: image: repository: renku/commit-event-service - tag: '2.47.1' + tag: "2.47.1" pullPolicy: IfNotPresent service: type: ClusterIP From 273294a5d59d6c8fdd6810cbf2883009942c9ed4 Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Fri, 24 Nov 2023 15:10:28 +0100 Subject: [PATCH 06/11] Update changelog --- CHANGELOG.rst | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 24d3d4f55d..2b39ab1c63 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -3,7 +3,35 @@ 0.44.0 ------ -(ShapeUp): Let users pin projects to the dashboard. +Renku ``0.44.0`` introduces pinning projects to the dashboard in RenkuLab. + +User-Facing Changes +~~~~~~~~~~~~~~~~~~~ + +**🌟 New Features** + +- 📌️ **UI**: Users can now pin projects to the dashboard, up to a maximum of + 5 projects (`#2898 `_). +- 📌️ **Data services**: New API endpoints to store and retrieve user + preferences have been added to support the projects pins (`#85 `_). + +**✨ Improvements** + +- 📑️**UI**: Correctly update progress of project indexing (`#2833 `_). + +**🐞 Bug Fixes** + +- **UI**: Change icons in the navbar to use Bootstrap icons (`#2882 `_). +- **UI**: Handle errors from the getSessions query in the Dashboard (`#2903 `_). +- **UI**: Adjust dropdown menus with anchors nested in buttons (`#2907 `_). +- **UI**: Update the workflows documentation link (`#2917 `_). +- **UI**: Add whitespace after author name (`#2921 `_). + +Individual components +~~~~~~~~~~~~~~~~~~~~~~ + +- `renku-ui 3.16.0 `_ +- `renku-data-services 0.3.0 `_ 0.43.0 ------ From 93b6f7c730c6e3134cc02e4248e5e7b1a394d559 Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Fri, 24 Nov 2023 15:11:33 +0100 Subject: [PATCH 07/11] fix --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 2b39ab1c63..583eb10ddd 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -17,7 +17,7 @@ User-Facing Changes **✨ Improvements** -- 📑️**UI**: Correctly update progress of project indexing (`#2833 `_). +- 📑️ **UI**: Correctly update progress of project indexing (`#2833 `_). **🐞 Bug Fixes** From c4281dc728c8ea3bd8bdc322bc82f921bfab2d5e Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Fri, 24 Nov 2023 15:16:05 +0100 Subject: [PATCH 08/11] =?UTF-8?q?spelling=20=F0=9F=A5=B9=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 583eb10ddd..4dcce225bd 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -21,8 +21,8 @@ User-Facing Changes **🐞 Bug Fixes** -- **UI**: Change icons in the navbar to use Bootstrap icons (`#2882 `_). -- **UI**: Handle errors from the getSessions query in the Dashboard (`#2903 `_). +- **UI**: Change icons in the Nav bar to use Bootstrap icons (`#2882 `_). +- **UI**: Handle errors from the ``getSessions`` query in the Dashboard (`#2903 `_). - **UI**: Adjust dropdown menus with anchors nested in buttons (`#2907 `_). - **UI**: Update the workflows documentation link (`#2917 `_). - **UI**: Add whitespace after author name (`#2921 `_). From aae481b475dadb8641216dadd5c3ede0b23e2516 Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Mon, 27 Nov 2023 12:53:28 +0100 Subject: [PATCH 09/11] Update CHANGELOG.rst Co-authored-by: Laura --- CHANGELOG.rst | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 87c459932d..0c1041b55b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -12,20 +12,30 @@ User-Facing Changes - 📌️ **UI**: Users can now pin projects to the dashboard, up to a maximum of 5 projects (`#2898 `_). -- 📌️ **Data services**: New API endpoints to store and retrieve user - preferences have been added to support the projects pins (`#85 `_). **✨ Improvements** -- 📑️ **UI**: Correctly update progress of project indexing (`#2833 `_). **🐞 Bug Fixes** +- **UI**: Correctly update progress of project indexing (`#2833 `_). - **UI**: Change icons in the Nav bar to use Bootstrap icons (`#2882 `_). -- **UI**: Handle errors from the ``getSessions`` query in the Dashboard (`#2903 `_). +- **UI**: Fixed bug that caused Dashboard to reload frequently by handling errors from the ``getSessions`` query in the Dashboard (`#2903 `_). - **UI**: Adjust dropdown menus with anchors nested in buttons (`#2907 `_). - **UI**: Update the workflows documentation link (`#2917 `_). -- **UI**: Add whitespace after author name (`#2921 `_). +- **UI**: Add whitespace after author name in session commit details (`#2921 `_). + +Internal Changes +~~~~~~~~~~~~~~~~ + +**Improvements** + +- **Data services**: New API endpoints to store and retrieve user + preferences have been added to support the projects pins (`#85 `_). + +**Bug Fixes** + + Individual components ~~~~~~~~~~~~~~~~~~~~~~ From be57a6b2773a1d189bf3b367f6c616b9fa1c69f8 Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Mon, 27 Nov 2023 12:54:10 +0100 Subject: [PATCH 10/11] =?UTF-8?q?make=20it=20=E2=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.rst | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 0c1041b55b..3901ebe064 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -13,9 +13,6 @@ User-Facing Changes - 📌️ **UI**: Users can now pin projects to the dashboard, up to a maximum of 5 projects (`#2898 `_). -**✨ Improvements** - - **🐞 Bug Fixes** - **UI**: Correctly update progress of project indexing (`#2833 `_). @@ -28,15 +25,11 @@ User-Facing Changes Internal Changes ~~~~~~~~~~~~~~~~ -**Improvements** +**✨ Improvements** - **Data services**: New API endpoints to store and retrieve user preferences have been added to support the projects pins (`#85 `_). -**Bug Fixes** - - - Individual components ~~~~~~~~~~~~~~~~~~~~~~ From c5137e823417a4229cfa24dc392ee5f78b266eaa Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Mon, 27 Nov 2023 13:30:11 +0100 Subject: [PATCH 11/11] little space guy --- CHANGELOG.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 3901ebe064..9603ed027c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -27,11 +27,11 @@ Internal Changes **✨ Improvements** -- **Data services**: New API endpoints to store and retrieve user +- **Data services**: New API endpoints to store and retrieve user preferences have been added to support the projects pins (`#85 `_). Individual components -~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~ - `renku-ui 3.16.0 `_ - `renku-data-services 0.3.0 `_