From caf9baaf3e35ab5b7643f9d0fbf9d08b6f07a825 Mon Sep 17 00:00:00 2001 From: Renku Bot Date: Thu, 19 Sep 2024 06:35:54 +0000 Subject: [PATCH 01/15] chore: create release 0.58.0 --- CHANGELOG.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 66283099a2..22562a5f19 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,9 @@ .. _changelog: +0.58.0 +------ + + 0.57.1 ------ From 8eb227400a83f756d3cab89527a294cc513f183e Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Fri, 20 Sep 2024 14:27:04 +0200 Subject: [PATCH 02/15] fix: update more GitLab redirect URLs (#3780) --- docs/how-to-guides/admin/configurations/external-gitlab.rst | 2 +- scripts/generate-values/README.rst | 2 +- scripts/init-db/gitlab_db_init.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/how-to-guides/admin/configurations/external-gitlab.rst b/docs/how-to-guides/admin/configurations/external-gitlab.rst index 5088afd9a7..903178ca5f 100644 --- a/docs/how-to-guides/admin/configurations/external-gitlab.rst +++ b/docs/how-to-guides/admin/configurations/external-gitlab.rst @@ -19,7 +19,7 @@ Callback URLs: .. code-block:: console - https:///login/redirect/gitlab + https:///api/auth/callback https:///api/auth/gitlab/token Scopes: diff --git a/scripts/generate-values/README.rst b/scripts/generate-values/README.rst index 48e89c77ce..dc2f94b35f 100644 --- a/scripts/generate-values/README.rst +++ b/scripts/generate-values/README.rst @@ -32,7 +32,7 @@ Configure the callback URLs: .. code-block:: - https:///login/redirect/gitlab + https:///api/auth/callback https:///api/auth/gitlab/token And set the scopes: diff --git a/scripts/init-db/gitlab_db_init.py b/scripts/init-db/gitlab_db_init.py index 67594dbd43..82038def55 100644 --- a/scripts/init-db/gitlab_db_init.py +++ b/scripts/init-db/gitlab_db_init.py @@ -83,7 +83,7 @@ def main(): config.gitlab_oauth_client_id, config.gitlab_oauth_client_secret, [ - f"{config.renku_url}/login/redirect/gitlab", + f"{config.renku_url}/api/auth/callback" f"{config.renku_url}/api/auth/gitlab/token", ], gitlab_db_connection, From a2e8e6a37299e023ed995dbb7405ac285ea0c3a5 Mon Sep 17 00:00:00 2001 From: Lorenzo Cavazzi <43481553+lorenzo-cavazzi@users.noreply.github.com> Date: Wed, 2 Oct 2024 11:38:23 +0200 Subject: [PATCH 03/15] refactor: polish Renku 2.0 pages according to the latest design (#3786) --- CHANGELOG.rst | 17 +++++++++++++++++ helm-chart/renku/values.yaml | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 22562a5f19..cddf23937a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -3,6 +3,23 @@ 0.58.0 ------ +User-Facing Changes +~~~~~~~~~~~~~~~~~~~ + +**✨ Improvements** + +- **UI**: Polish Renku 2.0 pages and elements according to the latest design changes (`#3254 `__). + +**🐞 Bug Fixes** + +- **UI**: Prevent glitches in the new session details sections (`#3313 `__). + +Internal Changes +~~~~~~~~~~~~~~~~ + +**Improvements** + +- **UI**: Update Storybook to show Renku 2.0 re-usable elements (`#3254 `__). 0.57.1 ------ diff --git a/helm-chart/renku/values.yaml b/helm-chart/renku/values.yaml index b500a21118..72482709f4 100644 --- a/helm-chart/renku/values.yaml +++ b/helm-chart/renku/values.yaml @@ -673,7 +673,7 @@ ui: replicaCount: 1 image: repository: renku/renku-ui - tag: "3.35.1" + tag: "3.36.0" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. @@ -862,7 +862,7 @@ ui: keepCookies: [] image: repository: renku/renku-ui-server - tag: "3.35.1" + tag: "3.36.0" pullPolicy: IfNotPresent imagePullSecrets: [] nameOverride: "" From 0fcdaaac088a7f1fe24d65531fa6e42609d286da Mon Sep 17 00:00:00 2001 From: Lorenzo Cavazzi <43481553+lorenzo-cavazzi@users.noreply.github.com> Date: Wed, 2 Oct 2024 15:20:44 +0200 Subject: [PATCH 04/15] docs: fix changelog (#3789) --- CHANGELOG.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index cddf23937a..c630622960 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -21,6 +21,12 @@ Internal Changes - **UI**: Update Storybook to show Renku 2.0 re-usable elements (`#3254 `__). +Individual Components +~~~~~~~~~~~~~~~~~~~~~ + +- `renku-ui 3.36.0 `_ + + 0.57.1 ------ From 84dea3515f9e2942365acdf340e28512004c0a78 Mon Sep 17 00:00:00 2001 From: eikek <701128+eikek@users.noreply.github.com> Date: Fri, 4 Oct 2024 09:50:45 +0200 Subject: [PATCH 05/15] Update search services to 0.6.1 (#3790) --- CHANGELOG.rst | 8 +++++ helm-chart/renku/templates/_helpers.tpl | 35 +++++++++++++++++++ .../search/search-provision-deployment.yaml | 5 +-- helm-chart/renku/values.yaml | 23 ++---------- 4 files changed, 46 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c630622960..f2468d80e0 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -3,6 +3,7 @@ 0.58.0 ------ + User-Facing Changes ~~~~~~~~~~~~~~~~~~~ @@ -20,6 +21,13 @@ Internal Changes **Improvements** - **UI**: Update Storybook to show Renku 2.0 re-usable elements (`#3254 `__). +- **Search Services**: Allow to re-provision the index from data-services and as part of a SOLR schema migration + + +Individual Components +~~~~~~~~~~~~~~~~~~~~~ + +- `renku-search 0.6.1 `_ Individual Components ~~~~~~~~~~~~~~~~~~~~~ diff --git a/helm-chart/renku/templates/_helpers.tpl b/helm-chart/renku/templates/_helpers.tpl index 7cec86a39f..c7d07db31d 100644 --- a/helm-chart/renku/templates/_helpers.tpl +++ b/helm-chart/renku/templates/_helpers.tpl @@ -176,3 +176,38 @@ renku-authz-tls-cert {{- define "renku.CASecretName" -}} renku-ca {{- end -}} + +{{- define "renku.events.streamEnvVars" -}} +- name: "RS_REDIS_QUEUE_PROJECT_CREATED" + value: "project.created" +- name: "RS_REDIS_QUEUE_PROJECT_UPDATED" + value: "project.updated" +- name: "RS_REDIS_QUEUE_PROJECT_REMOVED" + value: "project.removed" +- name: "RS_REDIS_QUEUE_PROJECTAUTH_ADDED" + value: "projectAuth.added" +- name: "RS_REDIS_QUEUE_PROJECTAUTH_UPDATED" + value: "projectAuth.updated" +- name: "RS_REDIS_QUEUE_PROJECTAUTH_REMOVED" + value: "projectAuth.removed" +- name: "RS_REDIS_QUEUE_USER_ADDED" + value: "user.added" +- name: "RS_REDIS_QUEUE_USER_UPDATED" + value: "user.updated" +- name: "RS_REDIS_QUEUE_USER_REMOVED" + value: "user.removed" +- name: "RS_REDIS_QUEUE_GROUP_ADDED" + value: "group.added" +- name: "RS_REDIS_QUEUE_GROUP_UPDATED" + value: "group.updated" +- name: "RS_REDIS_QUEUE_GROUP_REMOVED" + value: "group.removed" +- name: "RS_REDIS_QUEUE_GROUPMEMBER_ADDED" + value: "groupMember.added" +- name: "RS_REDIS_QUEUE_GROUPMEMBER_UPDATED" + value: "groupMember.updated" +- name: "RS_REDIS_QUEUE_GROUPMEMBER_REMOVED" + value: "groupMember.removed" +- name: "RS_REDIS_QUEUE_DATASERVICE_ALLEVENTS" + value: "data_service.all_events" +{{- end -}} \ No newline at end of file diff --git a/helm-chart/renku/templates/search/search-provision-deployment.yaml b/helm-chart/renku/templates/search/search-provision-deployment.yaml index 537818f36f..bd77e719e3 100644 --- a/helm-chart/renku/templates/search/search-provision-deployment.yaml +++ b/helm-chart/renku/templates/search/search-provision-deployment.yaml @@ -48,10 +48,7 @@ spec: key: {{ .Values.global.redis.existingSecretPasswordKey }} - name: RS_REDIS_MASTER_SET value: {{ .Values.global.redis.sentinel.masterSet | quote }} - {{- range $k, $v := .Values.global.events.streams }} - - name: RS_REDIS_QUEUE_{{ $k }} - value: {{ $v }} - {{- end }} + {{- include "renku.events.streamEnvVars" . | nindent 12 }} - name: RS_SOLR_URL value: "http://{{ template "solr.fullname" . }}:{{ .Values.global.solr.port }}" - name: RS_SOLR_CORE diff --git a/helm-chart/renku/values.yaml b/helm-chart/renku/values.yaml index 72482709f4..d0e8b25d58 100644 --- a/helm-chart/renku/values.yaml +++ b/helm-chart/renku/values.yaml @@ -85,25 +85,6 @@ global: ## for a new project based on its own version. ## NOTE should only be set for CI deployments and development purposes. cli_version: - ## Events related values definitions - events: - streams: - projectCreated: "project.created" - projectUpdated: "project.updated" - projectRemoved: "project.removed" - projectAuthAdded: "projectAuth.added" - projectAuthUpdated: "projectAuth.updated" - projectAuthRemoved: "projectAuth.removed" - userAdded: "user.added" - userUpdated: "user.updated" - userRemoved: "user.removed" - groupAdded: "group.added" - groupUpdated: "group.updated" - groupRemoved: "group.removed" - groupMemberAdded: "groupMember.added" - groupMemberUpdated: "groupMember.updated" - groupMemberRemoved: "groupMember.removed" - dataServiceAllEvents: "data_service.all_events" ## Note that the graph will not turned on by default until renku 0.4.0 graph: dbEventLog: @@ -1383,7 +1364,7 @@ search: replicas: 1 image: repository: renku/search-api - tag: "0.5.0" + tag: "0.6.1" pullPolicy: IfNotPresent service: type: ClusterIP @@ -1396,7 +1377,7 @@ search: replicas: 1 image: repository: renku/search-provision - tag: "0.5.0" + tag: "0.6.1" pullPolicy: IfNotPresent service: type: ClusterIP From 63f85fe47c2373789052613d3c19bd8ee18f92da Mon Sep 17 00:00:00 2001 From: eikek <701128+eikek@users.noreply.github.com> Date: Fri, 4 Oct 2024 10:21:56 +0200 Subject: [PATCH 06/15] docs: Fix changelog (#3794) The "Individual Components" section was repeated during a merge. --- CHANGELOG.rst | 5 ----- 1 file changed, 5 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f2468d80e0..a0d5736dfe 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -3,7 +3,6 @@ 0.58.0 ------ - User-Facing Changes ~~~~~~~~~~~~~~~~~~~ @@ -28,10 +27,6 @@ Individual Components ~~~~~~~~~~~~~~~~~~~~~ - `renku-search 0.6.1 `_ - -Individual Components -~~~~~~~~~~~~~~~~~~~~~ - - `renku-ui 3.36.0 `_ From 2e5f6b1e4329289929a717e0ef4cd065b9cd5292 Mon Sep 17 00:00:00 2001 From: Tasko Olevski Date: Thu, 3 Oct 2024 15:20:59 +0200 Subject: [PATCH 07/15] chore: add rbac for new AmaltheaSessions CR --- CHANGELOG.rst | 2 +- helm-chart/renku/templates/notebooks/role.yaml | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a0d5736dfe..2827c1dc3e 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -21,7 +21,7 @@ Internal Changes - **UI**: Update Storybook to show Renku 2.0 re-usable elements (`#3254 `__). - **Search Services**: Allow to re-provision the index from data-services and as part of a SOLR schema migration - +- **Helm chart**: Add RBAC for K8s cache for new AmaltheaSessions custom resource Individual Components ~~~~~~~~~~~~~~~~~~~~~ diff --git a/helm-chart/renku/templates/notebooks/role.yaml b/helm-chart/renku/templates/notebooks/role.yaml index 13ca5ad43d..1ebe6b008e 100644 --- a/helm-chart/renku/templates/notebooks/role.yaml +++ b/helm-chart/renku/templates/notebooks/role.yaml @@ -67,5 +67,17 @@ rules: - list - get - watch + - apiGroups: + - amalthea.dev + resources: + - amaltheasessions + verbs: + - create + - update + - delete + - patch + - list + - get + - watch {{ end }} {{ end }} From 1010e2b10764655919acb6c6d36e678357fe6446 Mon Sep 17 00:00:00 2001 From: Tasko Olevski Date: Thu, 3 Oct 2024 22:55:21 +0200 Subject: [PATCH 08/15] feat: update gateway to 1.1.0 Adds new credentials for new Amalthea version and removes obsolete Python code. --- CHANGELOG.rst | 4 +++- helm-chart/renku/values.yaml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 2827c1dc3e..cb6fa0b7f8 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -22,13 +22,15 @@ Internal Changes - **UI**: Update Storybook to show Renku 2.0 re-usable elements (`#3254 `__). - **Search Services**: Allow to re-provision the index from data-services and as part of a SOLR schema migration - **Helm chart**: Add RBAC for K8s cache for new AmaltheaSessions custom resource +- **Gateway**: Add extra credentials for the data service for the new AmaltheaSessions +- **Gateway**: Remove unused Python code Individual Components ~~~~~~~~~~~~~~~~~~~~~ - `renku-search 0.6.1 `_ - `renku-ui 3.36.0 `_ - +- `renku-gateway 1.1.0 `_ 0.57.1 ------ diff --git a/helm-chart/renku/values.yaml b/helm-chart/renku/values.yaml index d0e8b25d58..bfb26567c3 100644 --- a/helm-chart/renku/values.yaml +++ b/helm-chart/renku/values.yaml @@ -1271,7 +1271,7 @@ gateway: secretKey: image: repository: renku/renku-gateway - tag: "1.0.3" + tag: "1.1.0" pullPolicy: IfNotPresent service: type: ClusterIP From 143e47ddabe44a6bed7577039a95a29c8ac9f2a7 Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Fri, 4 Oct 2024 13:38:21 +0200 Subject: [PATCH 09/15] feat: debug mode for the gateway --- helm-chart/renku/templates/gateway/configmap.yaml | 1 + helm-chart/renku/values.yaml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/helm-chart/renku/templates/gateway/configmap.yaml b/helm-chart/renku/templates/gateway/configmap.yaml index c163177252..61b69f19b9 100644 --- a/helm-chart/renku/templates/gateway/configmap.yaml +++ b/helm-chart/renku/templates/gateway/configmap.yaml @@ -9,6 +9,7 @@ metadata: heritage: {{ .Release.Service }} data: config.yaml: | + debugMode: {{ .Values.gateway.debug | default false }} server: port: 8080 host: 0.0.0.0 diff --git a/helm-chart/renku/values.yaml b/helm-chart/renku/values.yaml index bfb26567c3..d301aacff8 100644 --- a/helm-chart/renku/values.yaml +++ b/helm-chart/renku/values.yaml @@ -1298,6 +1298,8 @@ gateway: # dedicated GitLab instance is deployed, so, logging out from Renku should # trigger a logout from GitLab. logoutGitLabUponRenkuLogout: true + # Turns on debug logs from the gateway + debug: false # sentry configuration sentry: enabled: false From 68bab9f651893f82eba473ccac6968da4948e2f5 Mon Sep 17 00:00:00 2001 From: Renku Bot Date: Wed, 9 Oct 2024 14:18:32 +0000 Subject: [PATCH 10/15] chore: create release 0.60.0 --- CHANGELOG.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f5ea1ede88..b75c043bb3 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,9 @@ .. _changelog: +0.60.0 +------ + + 0.59.1 ------ From 7502cda32b80f5cb7e3bacc12678916a99a711ce Mon Sep 17 00:00:00 2001 From: eikek <701128+eikek@users.noreply.github.com> Date: Fri, 11 Oct 2024 20:08:58 +0200 Subject: [PATCH 11/15] chore: Mute selenium dependency updates (#3574) --- .scala-steward.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.scala-steward.conf b/.scala-steward.conf index 0d337b2c64..14bb7f406d 100644 --- a/.scala-steward.conf +++ b/.scala-steward.conf @@ -7,3 +7,6 @@ # directory itself also contains a build.sbt the dot can be used to # specify it. Default: ["."] buildRoots = [ "acceptance-tests" ] +updates.ignore = [ + { groupId = "org.seleniumhq.selenium", artifactId = "selenium-java" } +] From 4b29bedb278bc1480f9af9792a0cdfc200ff0e29 Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Mon, 28 Oct 2024 15:16:45 +0100 Subject: [PATCH 12/15] bump --- 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 d80e942baf..2911347064 100644 --- a/helm-chart/renku/values.yaml +++ b/helm-chart/renku/values.yaml @@ -1272,7 +1272,7 @@ gateway: secretKey: image: repository: renku/renku-gateway - tag: "1.2.0" + tag: "1.3.0" pullPolicy: IfNotPresent service: type: ClusterIP From 2d97fa3cce21f405079b3855cdb3c8bcd71032f1 Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Mon, 28 Oct 2024 15:18:01 +0100 Subject: [PATCH 13/15] changelog --- helm-chart/values.yaml.changelog.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/helm-chart/values.yaml.changelog.md b/helm-chart/values.yaml.changelog.md index 756465bed9..94789add28 100644 --- a/helm-chart/values.yaml.changelog.md +++ b/helm-chart/values.yaml.changelog.md @@ -5,6 +5,10 @@ For changes that require manual steps other than changing values, please check o Please follow this convention when adding a new row * ` - **:
` +## Upgrading to Renku 0.60.0 + +* NEW ``gateway.debug`` to enable debug logs from the gateway. + ## Upgrading to Renku 0.59.1 * NEW ``notebooks.bypassCacheOnFailure`` has been added. Setting this to false prevents renku-notebooks to call From fe753bd6daa0d51b1db976b1e54e0b5170652e50 Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Mon, 28 Oct 2024 15:19:08 +0100 Subject: [PATCH 14/15] changelog --- CHANGELOG.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index b75c043bb3..13e7d3af13 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -3,6 +3,18 @@ 0.60.0 ------ +Internal Changes +~~~~~~~~~~~~~~~~ + +**Improvements** + +- **Gateway**: Add support for enabling debug logs from the gateway (`#730 `__). + +Individual Components +~~~~~~~~~~~~~~~~~~~~~ + +- `renku-gateway 1.3.0 `_ + 0.59.1 ------ From 505a141ded2851eeb56ee74b2c8d1b03885b2a6e Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Tue, 29 Oct 2024 16:30:14 +0100 Subject: [PATCH 15/15] fix merge --- CHANGELOG.rst | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 7716d9ae16..aaf6cb6a0e 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -22,25 +22,14 @@ Internal Changes **Improvements** - **UI**: Update the Admin page to set up Connected services (`#3332 `__). - -Individual Components -~~~~~~~~~~~~~~~~~~~~~ - -- `renku-data-services 0.25.0 `__ -- `renku-ui 3.41.0 `_ - -Internal Changes -~~~~~~~~~~~~~~~~ - -**Improvements** - - **Gateway**: Add support for enabling debug logs from the gateway (`#730 `__). Individual Components ~~~~~~~~~~~~~~~~~~~~~ +- `renku-data-services 0.25.0 `_ - `renku-gateway 1.3.0 `_ - +- `renku-ui 3.41.0 `_ 0.59.2 ------