From b80ac82602f2085156e2f9abf3cbcff3c69e6245 Mon Sep 17 00:00:00 2001 From: Renku Bot Date: Thu, 3 Jul 2025 11:08:26 +0000 Subject: [PATCH 01/21] chore: create release 2.5.0 From 33ab556fbddafc87582b8e80cd25b9680adf1ba5 Mon Sep 17 00:00:00 2001 From: Tasko Olevski Date: Tue, 15 Jul 2025 10:52:53 +0200 Subject: [PATCH 02/21] feat: upgrade amalthea to 0.20.0 (#4090) --- helm-chart/renku/requirements.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm-chart/renku/requirements.yaml b/helm-chart/renku/requirements.yaml index d3d00c0055..161ede96a2 100644 --- a/helm-chart/renku/requirements.yaml +++ b/helm-chart/renku/requirements.yaml @@ -18,11 +18,11 @@ dependencies: condition: enableV1Services - name: amalthea repository: "https://swissdatasciencecenter.github.io/helm-charts/" - version: "0.19.2" + version: "0.20.0" condition: enableV1Services - name: amalthea-sessions repository: "https://swissdatasciencecenter.github.io/helm-charts/" - version: "0.19.2" + version: "0.20.0" - name: dlf-chart repository: "https://swissdatasciencecenter.github.io/datashim/" version: "0.3.9-renku-2" From a19feb0a20010cb78684bb7cd5e78828512562d1 Mon Sep 17 00:00:00 2001 From: Samuel Gaist Date: Tue, 15 Jul 2025 11:47:00 +0200 Subject: [PATCH 03/21] feat: make swagger-ui image configurable (#4089) This allows to customize swagger in the same way as other components. Useful for example when deploying on OpenShift where the default image cannot run due to security constraints. --- helm-chart/renku/templates/swagger.yaml | 2 +- helm-chart/renku/values.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/helm-chart/renku/templates/swagger.yaml b/helm-chart/renku/templates/swagger.yaml index 17446ae4a8..8fff260df9 100644 --- a/helm-chart/renku/templates/swagger.yaml +++ b/helm-chart/renku/templates/swagger.yaml @@ -19,7 +19,7 @@ spec: spec: containers: - name: swagger - image: swaggerapi/swagger-ui + image: "{{ .Values.swagger.image.repository }}:{{ .Values.swagger.image.tag }}" env: - name: BASE_URL value: /swagger diff --git a/helm-chart/renku/values.yaml b/helm-chart/renku/values.yaml index e4924f1bcf..2e5c6aa7ad 100644 --- a/helm-chart/renku/values.yaml +++ b/helm-chart/renku/values.yaml @@ -1449,6 +1449,9 @@ core: ## Configuration for the Swagger-UI available at /swagger swagger: enabled: true + image: + repository: swaggerapi/swagger-ui + tag: "latest" ## The image used in startup scripts to initialize different postgress databases initDb: image: From 47a3ef9cc54ce36c4d8a824ed7eae972e038300a Mon Sep 17 00:00:00 2001 From: Tasko Olevski Date: Tue, 15 Jul 2025 13:17:53 +0200 Subject: [PATCH 04/21] feat: upgrade data service to 0.50.0 (#4091) --- helm-chart/renku/values.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/helm-chart/renku/values.yaml b/helm-chart/renku/values.yaml index 2e5c6aa7ad..1e0940238b 100644 --- a/helm-chart/renku/values.yaml +++ b/helm-chart/renku/values.yaml @@ -1467,18 +1467,18 @@ dataService: create: true image: repository: renku/renku-data-service - tag: "0.49.0" + tag: "0.50.0" pullPolicy: IfNotPresent k8sWatcher: image: repository: renku/data-service-k8s-watcher - tag: "0.49.0" + tag: "0.50.0" pullPolicy: IfNotPresent resources: {} dataTasks: image: repository: renku/data-service-data-tasks - tag: "0.49.0" + tag: "0.50.0" pullPolicy: IfNotPresent resources: {} service: @@ -1564,7 +1564,7 @@ authz: secretsStorage: image: repository: renku/secrets-storage - tag: "0.49.0" + tag: "0.50.0" pullPolicy: IfNotPresent service: type: ClusterIP From aeac3d1145498241511275f7a408b38e572ede42 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Jul 2025 15:32:00 +0200 Subject: [PATCH 05/21] chore(deps): bump brace-expansion (#4048) Bumps the npm_and_yarn group with 1 update in the /cypress-tests directory: [brace-expansion](https://github.com/juliangruber/brace-expansion). Updates `brace-expansion` from 1.1.11 to 1.1.12 - [Release notes](https://github.com/juliangruber/brace-expansion/releases) - [Commits](https://github.com/juliangruber/brace-expansion/compare/1.1.11...v1.1.12) --- updated-dependencies: - dependency-name: brace-expansion dependency-version: 1.1.12 dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Lorenzo Cavazzi <43481553+lorenzo-cavazzi@users.noreply.github.com> --- cypress-tests/package-lock.json | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/cypress-tests/package-lock.json b/cypress-tests/package-lock.json index 22059ef5f6..d084ac8063 100644 --- a/cypress-tests/package-lock.json +++ b/cypress-tests/package-lock.json @@ -764,9 +764,10 @@ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -3746,9 +3747,9 @@ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" From a7ba6e415b2b97da83940a89063f3ac1c792aaa8 Mon Sep 17 00:00:00 2001 From: Lorenzo Cavazzi <43481553+lorenzo-cavazzi@users.noreply.github.com> Date: Wed, 16 Jul 2025 10:54:27 +0200 Subject: [PATCH 06/21] chore: swap swagger services order to show data service first (#4093) --- helm-chart/renku/templates/swagger.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm-chart/renku/templates/swagger.yaml b/helm-chart/renku/templates/swagger.yaml index 8fff260df9..0409a28642 100644 --- a/helm-chart/renku/templates/swagger.yaml +++ b/helm-chart/renku/templates/swagger.yaml @@ -26,10 +26,10 @@ spec: - name: URLS value: > [ - {"url": "/api/renku/spec.json", "name": "core service"}, + {"url": "/api/data/spec.json", "name": "data service"}, {"url": "/api/kg/spec.json", "name": "knowledge graph"}, {"url": "/api/notebooks/spec.json", "name": "notebooks service"}, - {"url": "/api/data/spec.json", "name": "data service"}, + {"url": "/api/renku/spec.json", "name": "core service"}, {"url": "/api/search/spec.json", "name": "search service"} ] - name: OAUTH2_REDIRECT_URL From 3469c68c1ce9a6d8dbe547f5df8bbfc883e0ee8a Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Wed, 16 Jul 2025 10:58:50 +0200 Subject: [PATCH 07/21] feat: update renku-gateway to x.y.z The gateway can now run without GitLab when `enableV1Services` is set to `false`. --- helm-chart/renku/templates/gateway/configmap.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/helm-chart/renku/templates/gateway/configmap.yaml b/helm-chart/renku/templates/gateway/configmap.yaml index a3d10052d1..282f8de2f3 100644 --- a/helm-chart/renku/templates/gateway/configmap.yaml +++ b/helm-chart/renku/templates/gateway/configmap.yaml @@ -10,6 +10,7 @@ metadata: data: config.yaml: | debugMode: {{ .Values.gateway.debug | default false }} + enableV1Services: {{ .Values.enableV1Services | default false }} server: port: 8080 host: 0.0.0.0 From d80fc131cbb83377ebc3a7d8479ad368706fdd96 Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Wed, 16 Jul 2025 11:52:52 +0200 Subject: [PATCH 08/21] revproxy.enableV1Services --- helm-chart/renku/templates/gateway/configmap.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/helm-chart/renku/templates/gateway/configmap.yaml b/helm-chart/renku/templates/gateway/configmap.yaml index 282f8de2f3..f4d764f4f7 100644 --- a/helm-chart/renku/templates/gateway/configmap.yaml +++ b/helm-chart/renku/templates/gateway/configmap.yaml @@ -37,6 +37,7 @@ data: audience: renku authorizedParty: renku-cli revproxy: + enableV1Services: {{ .Values.enableV1Services | default false }} renkuBaseUrl: {{ include "renku.baseUrl" . | quote }} externalGitlabUrl: {{ .Values.global.gitlab.url | default "" | quote }} k8sNamespace: {{ .Release.Namespace }} From c83036260801b313dafd8ba50d34e1bcc1089f46 Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Wed, 16 Jul 2025 12:05:29 +0200 Subject: [PATCH 09/21] adapt login --- helm-chart/renku/templates/gateway/configmap.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/helm-chart/renku/templates/gateway/configmap.yaml b/helm-chart/renku/templates/gateway/configmap.yaml index f4d764f4f7..64f08985f7 100644 --- a/helm-chart/renku/templates/gateway/configmap.yaml +++ b/helm-chart/renku/templates/gateway/configmap.yaml @@ -37,7 +37,7 @@ data: audience: renku authorizedParty: renku-cli revproxy: - enableV1Services: {{ .Values.enableV1Services | default false }} + enableV1Services: {{ .Values.enableV1Services | default false }} renkuBaseUrl: {{ include "renku.baseUrl" . | quote }} externalGitlabUrl: {{ .Values.global.gitlab.url | default "" | quote }} k8sNamespace: {{ .Release.Namespace }} @@ -56,6 +56,7 @@ data: uiserver: {{ printf "http://%s" (include "ui-server.fullname" .) | quote }} search: {{ printf "http://%s-search-api" .Release.Name | quote }} login: + enableV1Services: {{ .Values.enableV1Services | default false }} renkuBaseUrl: {{ include "renku.baseUrl" . | quote }} loginRoutesBasePath: "/api/auth" defaultAppRedirectURL: {{ include "renku.baseUrl" . | quote }} @@ -68,12 +69,14 @@ data: scopes: ["profile", "email", "openid", "microprofile-jwt"] callbackURI: {{ printf "%s/api/auth/callback" (include "renku.baseUrl" .) }} usePKCE: false + {{- if .Values.enableV1Services }} gitlab: issuer: {{ .Values.global.gitlab.url | quote }} clientID: {{ .Values.gateway.gitlabClientId | default .Values.global.gateway.gitlabClientId | quote }} scopes: ["openid", "api", "read_user", "read_repository"] callbackURI: {{ printf "%s/api/auth/callback" (include "renku.baseUrl" .) }} usePKCE: false + {{ end -}} oldGitLabLogout: {{ .Values.gateway.oldGitLabLogout | default false }} logoutGitLabUponRenkuLogout: {{ .Values.gateway.logoutGitLabUponRenkuLogout | default true }} redis: From 47a08bbe10abea80b786097aa528c9d67e449a34 Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Wed, 16 Jul 2025 13:14:23 +0200 Subject: [PATCH 10/21] fix config --- helm-chart/renku/templates/gateway/configmap.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/helm-chart/renku/templates/gateway/configmap.yaml b/helm-chart/renku/templates/gateway/configmap.yaml index 64f08985f7..02f03b0742 100644 --- a/helm-chart/renku/templates/gateway/configmap.yaml +++ b/helm-chart/renku/templates/gateway/configmap.yaml @@ -10,7 +10,6 @@ metadata: data: config.yaml: | debugMode: {{ .Values.gateway.debug | default false }} - enableV1Services: {{ .Values.enableV1Services | default false }} server: port: 8080 host: 0.0.0.0 @@ -76,7 +75,7 @@ data: scopes: ["openid", "api", "read_user", "read_repository"] callbackURI: {{ printf "%s/api/auth/callback" (include "renku.baseUrl" .) }} usePKCE: false - {{ end -}} + {{- end }} oldGitLabLogout: {{ .Values.gateway.oldGitLabLogout | default false }} logoutGitLabUponRenkuLogout: {{ .Values.gateway.logoutGitLabUponRenkuLogout | default true }} redis: From 410850ee5dca0ac1cd37f41ae6f095b8aa84eae7 Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Wed, 16 Jul 2025 13:42:18 +0200 Subject: [PATCH 11/21] port UI changes --- .../renku/templates/ui/ui-client-deployment-template.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 fae4655017..941257dcf1 100644 --- a/helm-chart/renku/templates/ui/ui-client-deployment-template.yaml +++ b/helm-chart/renku/templates/ui/ui-client-deployment-template.yaml @@ -88,7 +88,7 @@ spec: key: chart_version - name: HOMEPAGE value: {{ toJson .Values.ui.client.homepage | quote }} - - name: CORE_API_VERSION_CONFIG + - name: CORE_API_VERSION_CONFIG value: {{ toJson .Values.ui.client.coreApiVersionConfig | quote }} - name: KEYCLOAK_REALM value: {{ include "renku.keycloak.realm" . | quote }} @@ -98,6 +98,8 @@ spec: value: {{ toJson .Values.ui.client.sessionClassEmailUs | quote }} - name: IMAGE_BUILDERS_ENABLED value: {{ .Values.dataService.imageBuilders.enabled | quote }} + - name: LEGACY_SUPPORT + value: {{ printf "{\"enabled\": %t }" .Values.enableV1Services | quote }} livenessProbe: httpGet: path: / From 504fd65c838755e024d3f712680ec67f367367f2 Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Wed, 16 Jul 2025 15:39:37 +0200 Subject: [PATCH 12/21] adjust env vars --- helm-chart/renku/templates/gateway/deployment-revproxy.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/helm-chart/renku/templates/gateway/deployment-revproxy.yaml b/helm-chart/renku/templates/gateway/deployment-revproxy.yaml index 9428bb0af5..d9a5cae71a 100644 --- a/helm-chart/renku/templates/gateway/deployment-revproxy.yaml +++ b/helm-chart/renku/templates/gateway/deployment-revproxy.yaml @@ -71,11 +71,13 @@ spec: secretKeyRef: name: {{ cat (include "renku.fullname" .) "-gateway" | nospace }} key: oidcClientSecret + {{- if .Values.enableV1Services }} - name: GATEWAY_LOGIN_PROVIDERS_GITLAB_CLIENTSECRET valueFrom: secretKeyRef: name: {{ cat (include "renku.fullname" .) "-gateway" | nospace }} key: gitlabClientSecret + {{- end }} - name: GATEWAY_LOGIN_TOKENENCRYPTION_SECRETKEY valueFrom: secretKeyRef: @@ -91,6 +93,7 @@ spec: secretKeyRef: name: {{ cat (include "renku.fullname" .) "-gateway" | nospace }} key: cookieHashKey + {{- if .Values.enableV1Services }} - name: GATEWAY_LOGIN_PROVIDERS_GITLAB_COOKIEENCODINGKEY valueFrom: secretKeyRef: @@ -101,6 +104,7 @@ spec: secretKeyRef: name: {{ cat (include "renku.fullname" .) "-gateway" | nospace }} key: cookieHashKey + {{- end }} - name: GATEWAY_MONITORING_SENTRY_DSN value: {{ .Values.gateway.sentry.dsn }} - name: GATEWAY_POSTHOG_ENABLED From 2bb7826119e8378c09a78f7e181b18836de1c816 Mon Sep 17 00:00:00 2001 From: Renku Bot Date: Thu, 3 Jul 2025 11:08:26 +0000 Subject: [PATCH 13/21] chore: create release 2.5.0 From 586dc327b4b618042c6fb2bd2f0e419d64ac766e Mon Sep 17 00:00:00 2001 From: Tasko Olevski Date: Tue, 15 Jul 2025 10:52:53 +0200 Subject: [PATCH 14/21] feat: upgrade amalthea to 0.20.0 (#4090) --- helm-chart/renku/requirements.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm-chart/renku/requirements.yaml b/helm-chart/renku/requirements.yaml index d3d00c0055..161ede96a2 100644 --- a/helm-chart/renku/requirements.yaml +++ b/helm-chart/renku/requirements.yaml @@ -18,11 +18,11 @@ dependencies: condition: enableV1Services - name: amalthea repository: "https://swissdatasciencecenter.github.io/helm-charts/" - version: "0.19.2" + version: "0.20.0" condition: enableV1Services - name: amalthea-sessions repository: "https://swissdatasciencecenter.github.io/helm-charts/" - version: "0.19.2" + version: "0.20.0" - name: dlf-chart repository: "https://swissdatasciencecenter.github.io/datashim/" version: "0.3.9-renku-2" From f49aaa37eef5cfe27df9afdba69792dd870778cb Mon Sep 17 00:00:00 2001 From: Samuel Gaist Date: Tue, 15 Jul 2025 11:47:00 +0200 Subject: [PATCH 15/21] feat: make swagger-ui image configurable (#4089) This allows to customize swagger in the same way as other components. Useful for example when deploying on OpenShift where the default image cannot run due to security constraints. --- helm-chart/renku/templates/swagger.yaml | 2 +- helm-chart/renku/values.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/helm-chart/renku/templates/swagger.yaml b/helm-chart/renku/templates/swagger.yaml index 17446ae4a8..8fff260df9 100644 --- a/helm-chart/renku/templates/swagger.yaml +++ b/helm-chart/renku/templates/swagger.yaml @@ -19,7 +19,7 @@ spec: spec: containers: - name: swagger - image: swaggerapi/swagger-ui + image: "{{ .Values.swagger.image.repository }}:{{ .Values.swagger.image.tag }}" env: - name: BASE_URL value: /swagger diff --git a/helm-chart/renku/values.yaml b/helm-chart/renku/values.yaml index 62a143e2a0..1e0940238b 100644 --- a/helm-chart/renku/values.yaml +++ b/helm-chart/renku/values.yaml @@ -1449,6 +1449,9 @@ core: ## Configuration for the Swagger-UI available at /swagger swagger: enabled: true + image: + repository: swaggerapi/swagger-ui + tag: "latest" ## The image used in startup scripts to initialize different postgress databases initDb: image: From 3943b750f5ff3a9c04c9fb8753743f544e880204 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Jul 2025 15:32:00 +0200 Subject: [PATCH 16/21] chore(deps): bump brace-expansion (#4048) Bumps the npm_and_yarn group with 1 update in the /cypress-tests directory: [brace-expansion](https://github.com/juliangruber/brace-expansion). Updates `brace-expansion` from 1.1.11 to 1.1.12 - [Release notes](https://github.com/juliangruber/brace-expansion/releases) - [Commits](https://github.com/juliangruber/brace-expansion/compare/1.1.11...v1.1.12) --- updated-dependencies: - dependency-name: brace-expansion dependency-version: 1.1.12 dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Lorenzo Cavazzi <43481553+lorenzo-cavazzi@users.noreply.github.com> --- cypress-tests/package-lock.json | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/cypress-tests/package-lock.json b/cypress-tests/package-lock.json index 22059ef5f6..d084ac8063 100644 --- a/cypress-tests/package-lock.json +++ b/cypress-tests/package-lock.json @@ -764,9 +764,10 @@ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -3746,9 +3747,9 @@ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" From 606311f6ac3e732fdc2e3b155b04a718deaa5b8f Mon Sep 17 00:00:00 2001 From: Lorenzo Cavazzi <43481553+lorenzo-cavazzi@users.noreply.github.com> Date: Wed, 16 Jul 2025 10:54:27 +0200 Subject: [PATCH 17/21] chore: swap swagger services order to show data service first (#4093) --- helm-chart/renku/templates/swagger.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm-chart/renku/templates/swagger.yaml b/helm-chart/renku/templates/swagger.yaml index 8fff260df9..0409a28642 100644 --- a/helm-chart/renku/templates/swagger.yaml +++ b/helm-chart/renku/templates/swagger.yaml @@ -26,10 +26,10 @@ spec: - name: URLS value: > [ - {"url": "/api/renku/spec.json", "name": "core service"}, + {"url": "/api/data/spec.json", "name": "data service"}, {"url": "/api/kg/spec.json", "name": "knowledge graph"}, {"url": "/api/notebooks/spec.json", "name": "notebooks service"}, - {"url": "/api/data/spec.json", "name": "data service"}, + {"url": "/api/renku/spec.json", "name": "core service"}, {"url": "/api/search/spec.json", "name": "search service"} ] - name: OAUTH2_REDIRECT_URL From 7158798fc462776a1405c2cccfd4fadc695bbd2b Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Fri, 18 Jul 2025 08:59:33 +0200 Subject: [PATCH 18/21] adjust cypress tests --- .../cypress/e2e/checkWorkflows.cy.ts | 2 +- .../cypress/e2e/privateProject.cy.ts | 2 +- cypress-tests/cypress/e2e/publicProject.cy.ts | 2 +- .../cypress/e2e/rstudioSession.cy.ts | 2 +- cypress-tests/cypress/e2e/testDatasets.cy.ts | 2 +- .../cypress/e2e/updateProjects.cy.ts | 2 +- cypress-tests/cypress/e2e/useSession.cy.ts | 2 +- .../cypress/e2e/v2/anonymousNavigation.cy.ts | 2 +- .../cypress/e2e/v2/dashboardV2.cy.ts | 2 +- .../cypress/e2e/v2/groupBasics.cy.ts | 2 +- .../cypress/e2e/v2/projectBasics.cy.ts | 2 +- .../cypress/e2e/v2/projectResources.cy.ts | 4 ++-- .../cypress/e2e/v2/searchEntities.cy.ts | 4 ++-- .../cypress/e2e/v2/sessionBasics.cy.ts | 2 +- .../cypress/support/commands/login.ts | 20 ++++++++++--------- 15 files changed, 27 insertions(+), 25 deletions(-) diff --git a/cypress-tests/cypress/e2e/checkWorkflows.cy.ts b/cypress-tests/cypress/e2e/checkWorkflows.cy.ts index 5230e7477a..06e44d07e0 100644 --- a/cypress-tests/cypress/e2e/checkWorkflows.cy.ts +++ b/cypress-tests/cypress/e2e/checkWorkflows.cy.ts @@ -15,7 +15,7 @@ describe("Workflows pages", () => { cy.session( sessionId, () => { - cy.robustLogin(); + cy.robustLogin("v1"); }, validateLogin, ); diff --git a/cypress-tests/cypress/e2e/privateProject.cy.ts b/cypress-tests/cypress/e2e/privateProject.cy.ts index a3275ec173..7552403b91 100644 --- a/cypress-tests/cypress/e2e/privateProject.cy.ts +++ b/cypress-tests/cypress/e2e/privateProject.cy.ts @@ -34,7 +34,7 @@ describe("Basic public project functionality", () => { cy.session( sessionId, () => { - cy.robustLogin(); + cy.robustLogin("v1"); }, validateLogin, ); diff --git a/cypress-tests/cypress/e2e/publicProject.cy.ts b/cypress-tests/cypress/e2e/publicProject.cy.ts index 49b3596e0e..94ac717e93 100644 --- a/cypress-tests/cypress/e2e/publicProject.cy.ts +++ b/cypress-tests/cypress/e2e/publicProject.cy.ts @@ -35,7 +35,7 @@ describe("Basic public project functionality", () => { cy.session( sessionId, () => { - cy.robustLogin(); + cy.robustLogin("v1"); }, validateLogin, ); diff --git a/cypress-tests/cypress/e2e/rstudioSession.cy.ts b/cypress-tests/cypress/e2e/rstudioSession.cy.ts index 4fca930469..a5cf4d1534 100644 --- a/cypress-tests/cypress/e2e/rstudioSession.cy.ts +++ b/cypress-tests/cypress/e2e/rstudioSession.cy.ts @@ -36,7 +36,7 @@ describe("Basic rstudio functionality", () => { cy.session( sessionId, () => { - cy.robustLogin(); + cy.robustLogin("v1"); }, validateLogin, ); diff --git a/cypress-tests/cypress/e2e/testDatasets.cy.ts b/cypress-tests/cypress/e2e/testDatasets.cy.ts index ad94deb1c8..74a30dd396 100644 --- a/cypress-tests/cypress/e2e/testDatasets.cy.ts +++ b/cypress-tests/cypress/e2e/testDatasets.cy.ts @@ -30,7 +30,7 @@ describe("Basic datasets functionality", () => { cy.session( sessionId, () => { - cy.robustLogin(); + cy.robustLogin("v1"); }, validateLogin, ); diff --git a/cypress-tests/cypress/e2e/updateProjects.cy.ts b/cypress-tests/cypress/e2e/updateProjects.cy.ts index 5644bf0467..33ca82cd14 100644 --- a/cypress-tests/cypress/e2e/updateProjects.cy.ts +++ b/cypress-tests/cypress/e2e/updateProjects.cy.ts @@ -26,7 +26,7 @@ describe("Fork and update old projects", () => { cy.session( sessionId, () => { - cy.robustLogin(); + cy.robustLogin("v1"); }, validateLogin, ); diff --git a/cypress-tests/cypress/e2e/useSession.cy.ts b/cypress-tests/cypress/e2e/useSession.cy.ts index 8cd7a92323..0697cb8446 100644 --- a/cypress-tests/cypress/e2e/useSession.cy.ts +++ b/cypress-tests/cypress/e2e/useSession.cy.ts @@ -191,7 +191,7 @@ describe("Basic public project functionality", () => { // Stop the session -- mind that anonymous users cannot pause sessions cy.deleteSession({ fromSessionPage: true }); - cy.robustLogin(); + cy.robustLogin("v1"); }); it("Start a new session on a project without permissions.", () => { diff --git a/cypress-tests/cypress/e2e/v2/anonymousNavigation.cy.ts b/cypress-tests/cypress/e2e/v2/anonymousNavigation.cy.ts index dd80ba14e9..53ed34e460 100644 --- a/cypress-tests/cypress/e2e/v2/anonymousNavigation.cy.ts +++ b/cypress-tests/cypress/e2e/v2/anonymousNavigation.cy.ts @@ -21,7 +21,7 @@ const loggedSession = { id: ["anonymousNavigation-loggedUser", getRandomString()], setup: () => { cy.log("Logged in session"); - cy.robustLogin(); + cy.robustLogin("v2"); }, }; diff --git a/cypress-tests/cypress/e2e/v2/dashboardV2.cy.ts b/cypress-tests/cypress/e2e/v2/dashboardV2.cy.ts index 887f77b983..ac4c5e4cec 100644 --- a/cypress-tests/cypress/e2e/v2/dashboardV2.cy.ts +++ b/cypress-tests/cypress/e2e/v2/dashboardV2.cy.ts @@ -39,7 +39,7 @@ describe("Dashboard v2 - Authenticated user", () => { cy.session( sessionId, () => { - cy.robustLogin(); + cy.robustLogin("v2"); }, validateLogin, ); diff --git a/cypress-tests/cypress/e2e/v2/groupBasics.cy.ts b/cypress-tests/cypress/e2e/v2/groupBasics.cy.ts index 79e5f6a148..75f4cd4737 100644 --- a/cypress-tests/cypress/e2e/v2/groupBasics.cy.ts +++ b/cypress-tests/cypress/e2e/v2/groupBasics.cy.ts @@ -27,7 +27,7 @@ describe("Group - create, edit and delete", () => { cy.session( sessionId, () => { - cy.robustLogin(); + cy.robustLogin("v2"); }, validateLoginV2, ); diff --git a/cypress-tests/cypress/e2e/v2/projectBasics.cy.ts b/cypress-tests/cypress/e2e/v2/projectBasics.cy.ts index c745a986a6..c5434a339e 100644 --- a/cypress-tests/cypress/e2e/v2/projectBasics.cy.ts +++ b/cypress-tests/cypress/e2e/v2/projectBasics.cy.ts @@ -36,7 +36,7 @@ describe("Project - create, edit and delete", () => { cy.session( sessionId, () => { - cy.robustLogin(); + cy.robustLogin("v2"); }, validateLoginV2, ); diff --git a/cypress-tests/cypress/e2e/v2/projectResources.cy.ts b/cypress-tests/cypress/e2e/v2/projectResources.cy.ts index 3eaee4a1c4..b4ba4e490c 100644 --- a/cypress-tests/cypress/e2e/v2/projectResources.cy.ts +++ b/cypress-tests/cypress/e2e/v2/projectResources.cy.ts @@ -31,7 +31,7 @@ describe("Project resources - work with code, data, environments", () => { cy.session( sessionId, () => { - cy.robustLogin(); + cy.robustLogin("v2"); }, validateLoginV2, ); @@ -54,7 +54,7 @@ describe("Project resources - work with code, data, environments", () => { cy.session( sessionId, () => { - cy.robustLogin(); + cy.robustLogin("v2"); }, validateLoginV2, ); diff --git a/cypress-tests/cypress/e2e/v2/searchEntities.cy.ts b/cypress-tests/cypress/e2e/v2/searchEntities.cy.ts index 04a51134be..3bbfb1839c 100644 --- a/cypress-tests/cypress/e2e/v2/searchEntities.cy.ts +++ b/cypress-tests/cypress/e2e/v2/searchEntities.cy.ts @@ -44,7 +44,7 @@ describe("Search for resources: groups, projects, users", () => { cy.session( sessionId, () => { - cy.robustLogin(); + cy.robustLogin("v2"); }, validateLoginV2, ); @@ -84,7 +84,7 @@ describe("Search for resources: groups, projects, users", () => { cy.session( sessionId, () => { - cy.robustLogin(); + cy.robustLogin("v2"); }, validateLoginV2, ); diff --git a/cypress-tests/cypress/e2e/v2/sessionBasics.cy.ts b/cypress-tests/cypress/e2e/v2/sessionBasics.cy.ts index 88370e1247..7dfe579211 100644 --- a/cypress-tests/cypress/e2e/v2/sessionBasics.cy.ts +++ b/cypress-tests/cypress/e2e/v2/sessionBasics.cy.ts @@ -39,7 +39,7 @@ describe("Start a session that consumes project resources", () => { cy.session( sessionId, () => { - cy.robustLogin(); + cy.robustLogin("v2"); }, validateLoginV2, ); diff --git a/cypress-tests/cypress/support/commands/login.ts b/cypress-tests/cypress/support/commands/login.ts index f540bfd9df..ea97c30d7c 100644 --- a/cypress-tests/cypress/support/commands/login.ts +++ b/cypress-tests/cypress/support/commands/login.ts @@ -76,7 +76,7 @@ type RegisterAndVerifyProps = { lastName?: string; }; -function registerAndVerify(props: RegisterAndVerifyProps) { +function registerAndVerify(renkuVersion : 'v1' | 'v2', props: RegisterAndVerifyProps) { // Register with the CI deployment const { email, password, firstName, lastName } = props; cy.register(email, password, firstName, lastName); @@ -107,13 +107,14 @@ function registerAndVerify(props: RegisterAndVerifyProps) { // allow Gitlab to "settle" after the login and properly recognize the token and respond with 200. // eslint-disable-next-line cypress/no-unnecessary-waiting cy.wait(TIMEOUTS.short); - cy.request("ui-server/api/data/user").its("status").should("eq", 200); - cy.request("ui-server/api/user").then((response) => { + cy.request("/api/data/user").its("status").should("eq", 200); + if (renkuVersion === 'v1') { + cy.request("/api/user").then((response) => { expect(response.status).to.eq(200); expect(response.body).property("username").to.not.be.empty; expect(response.body).property("username").to.not.be.null; expect(response.body).property("state").to.equal("active"); - }); + });} } type RobustLoginProps = { @@ -121,11 +122,12 @@ type RobustLoginProps = { password: string; firstName?: string; lastName?: string; + }; -function robustLogin(props?: RobustLoginProps) { +function robustLogin(renkuVersion: 'v1' | 'v2',props?: RobustLoginProps) { // Check if we are already logged in - cy.request({ failOnStatusCode: false, url: "ui-server/api/data/user" }).then( + cy.request({ failOnStatusCode: false, url: "/api/data/user" }).then( (resp) => { // we are already logged in if (resp.status >= 200 && resp.status < 400) return; @@ -139,7 +141,7 @@ function robustLogin(props?: RobustLoginProps) { ...props, }; - return registerAndVerify(localProps); + return registerAndVerify(renkuVersion, localProps); }, ); } @@ -162,8 +164,8 @@ declare global { firstName?: string, lastName?: string, ); - registerAndVerify(props: RegisterAndVerifyProps); - robustLogin(props?: RobustLoginProps); + registerAndVerify(renkuVersion: 'v1' | 'v2', props: RegisterAndVerifyProps); + robustLogin(renkuVersion: 'v1' | 'v2', props?: RobustLoginProps); } } } From d715d61748c79caed2c8cd2afe0672fd294508d7 Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Fri, 18 Jul 2025 09:07:36 +0200 Subject: [PATCH 19/21] fix dashboard test --- cypress-tests/cypress/e2e/v2/dashboardV2.cy.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress-tests/cypress/e2e/v2/dashboardV2.cy.ts b/cypress-tests/cypress/e2e/v2/dashboardV2.cy.ts index ac4c5e4cec..0f77b6c7d7 100644 --- a/cypress-tests/cypress/e2e/v2/dashboardV2.cy.ts +++ b/cypress-tests/cypress/e2e/v2/dashboardV2.cy.ts @@ -1,4 +1,4 @@ -import { getRandomString, validateLogin } from "../../support/commands/general"; +import { getRandomString, validateLoginV2 } from "../../support/commands/general"; import { generatorProjectName } from "../../support/commands/projects"; import { ProjectIdentifierV2 } from "../../support/types/project.types"; import { @@ -41,7 +41,7 @@ describe("Dashboard v2 - Authenticated user", () => { () => { cy.robustLogin("v2"); }, - validateLogin, + validateLoginV2, ); getUserNamespaceAPIV2().then((namespace) => { if (namespace) { From bf8301ca03f7a60fc3842a9bc33dfd2048491be5 Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Fri, 18 Jul 2025 09:20:58 +0200 Subject: [PATCH 20/21] bump renku-gateway to v1.6.0 --- 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 1e0940238b..6a8098e46a 100644 --- a/helm-chart/renku/values.yaml +++ b/helm-chart/renku/values.yaml @@ -1148,7 +1148,7 @@ gateway: secretKey: image: repository: renku/renku-gateway - tag: "1.5.1" + tag: "1.6.0" pullPolicy: IfNotPresent service: type: ClusterIP From 4dead18f3aedf23917975e69cb46d3011495e4a0 Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Wed, 16 Jul 2025 13:03:54 +0200 Subject: [PATCH 21/21] ignore: test pr --- 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 6a8098e46a..6d8155ee7d 100644 --- a/helm-chart/renku/values.yaml +++ b/helm-chart/renku/values.yaml @@ -1585,7 +1585,7 @@ secretsStorage: # This is used to indicate whether services needed exclusively for Renku V1 are deployed or not. # The support for this feature is experimental and it should not be set to false in production at all. -enableV1Services: true +enableV1Services: false podSecurityContext: {} securityContext: