feat: admin panel for compute resources (#3328)

Allows RenkuLab administrators to configure resource pools on the UI. --------- Co-authored-by: Andrea Cordoba <[email protected]> Co-authored-by: Tasko Olevski <[email protected]> Co-authored-by: Renku Bot <[email protected]> Co-authored-by: Lorenzo Cavazzi <[email protected]>
SwissDataScienceCenter · Oct 30, 2023 · f09f1c8 · f09f1c8
1 parent 3bca807
commit f09f1c8
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 18 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,15 +1,46 @@
 .. _changelog:
 
+0.42.0
+------
+
+Renku ``0.42.0`` allows RenkuLab administrators to configure compute resources to be used
+in interactive sessions.
+
+User-Facing Changes
+~~~~~~~~~~~~~~~~~~~
+
+**🌟 New Features**
+
+- 🖼 **UI**: Admins can configure compute resources to be used in interactive session.
+  (`#2752 <https://github.com/SwissDataScienceCenter/renku-ui/pull/2752>`_).
+
+**✨ Improvements**
+
+- 💾 **UI**: Show a confirmation text when saving a session
+  (`#2856 <https://github.com/SwissDataScienceCenter/renku-ui/pull/2856>`_).
+
+Internal Changes
+~~~~~~~~~~~~~~~~~~~
+
+- ``renku-gateway`` can now proxy to Keycloak endpoints
+
+Individual components
+~~~~~~~~~~~~~~~~~~~~~~
+
+- `renku-gateway 0.23.0 <https://github.com/SwissDataScienceCenter/renku-gateway/releases/tag/0.23.0>`_
+- `renku-ui 3.15.0 <https://github.com/SwissDataScienceCenter/renku-ui/releases/tag/3.15.0>`_
+
+
 0.41.0
 ------
 
 Renku ``0.41.0`` adds new functionality for configuring external storage in projects! Users can now
 configure external storage to be mounted automatically in their sessions. The settings are persisted for the project, 
 but access control is managed by the provider of the storage, not by Renku. This means that for restricted
 data sources, users must enter credentials separately. This first implementation only supports S3-compatible storage, 
-but we will add support for additional providers soon. 
+but we will add support for additional providers soon.
 
-In addition, with this release administrators can configure the RenkuLab homepage to highlight chosen projects.
+Lastly, with this release administrators can configure the RenkuLab homepage to highlight chosen projects.
 
 **A note to Renku administrators**: this release includes breaking changes in our Helm chart values file.
 Refer to the ``Internal Changes`` section below for more details.
@@ -31,7 +62,6 @@ User-Facing Changes
 - 🌈 **UI**: Improve color contrast and other UX elements
   (`#2846 <https://github.com/SwissDataScienceCenter/renku-ui/pull/2846>`_).
 
-
 Internal Changes
 ~~~~~~~~~~~~~~~~~~~
 

diff --git a/cypress-tests/cypress/e2e/useSession.cy.ts b/cypress-tests/cypress/e2e/useSession.cy.ts
@@ -142,7 +142,7 @@ describe("Basic public project functionality", () => {
       .contains("Saving Session", { timeout: TIMEOUTS.long })
       .should("be.visible");
     cy.get(".modal")
-      .contains("There are no changes", { timeout: TIMEOUTS.long })
+      .contains("Your session has been saved successfully", { timeout: TIMEOUTS.long })
       .should("be.visible");
     cy.get(".modal .btn-close").should("be.visible").click();
 

diff --git a/helm-chart/renku/templates/_helpers.tpl b/helm-chart/renku/templates/_helpers.tpl
@@ -160,3 +160,7 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end -}}
+
+{{- define "renku.keycloak.realm" -}}
+{{ .Values.global.keycloak.realm | default "Renku" }}
+{{- end -}}
diff --git a/helm-chart/renku/templates/gateway/deployment-revproxy.yaml b/helm-chart/renku/templates/gateway/deployment-revproxy.yaml
@@ -69,6 +69,8 @@ spec:
               value: {{ printf "http://%s-gateway-auth" .Release.Name }}
             - name: REVPROXY_RENKU_SERVICES_DATA_SERVICE
               value: {{ printf "http://%s-data-service" .Release.Name | quote }}
+            - name: REVPROXY_RENKU_SERVICES_KEYCLOAK
+              value: {{ include "renku.keycloakUrl" . | quote }}
             - name: REVPROXY_PORT
               value: "8080"
             - name: REVPROXY_METRICS_ENABLED

diff --git a/helm-chart/renku/templates/gateway/deployment.yaml b/helm-chart/renku/templates/gateway/deployment.yaml
@@ -57,10 +57,8 @@ spec:
               value: {{ .Values.gateway.gitlabClientId | default .Values.global.gateway.gitlabClientId | quote }}
             - name: KEYCLOAK_URL
               value: {{ include "renku.keycloakUrl" . | quote }}
-            {{ if .Values.global.keycloak.realm }}
             - name: KEYCLOAK_REALM
-              value: {{ .Values.global.keycloak.realm | quote }}
-            {{ end }}
+              value: {{ include "renku.keycloak.realm" . | quote }}
             - name: GATEWAY_SERVICE_PREFIX
               value: "/api/"
             - name: REDIS_HOST

diff --git a/helm-chart/renku/templates/notebooks/statefulset.yaml b/helm-chart/renku/templates/notebooks/statefulset.yaml
@@ -180,10 +180,8 @@ spec:
               value: renku
             - name: NB_SESSIONS__GIT_PROXY__RENKU_CLIENT_SECRET
               value: {{ .Values.global.gateway.clientSecret | quote }}
-            {{ if .Values.global.keycloak.realm }}
             - name: NB_KEYCLOAK_REALM
-              value: {{ .Values.global.keycloak.realm | quote }}
-            {{ end }}
+              value: {{ include "renku.keycloak.realm" . | quote }}
             - name: NB_SESSIONS__SSH__ENABLED
               value: {{ .Values.notebooks.ssh.enabled | quote }}
             {{- if not (kindIs "invalid" .Values.notebooks.ssh.hostKeySecret) }}

diff --git a/helm-chart/renku/templates/notebooks/test.yaml b/helm-chart/renku/templates/notebooks/test.yaml
@@ -103,10 +103,8 @@ spec:
           value: "true"
         - name: NB_SESSIONS__GIT_PROXY__RENKU_CLIENT_SECRET
           value: {{ $.Values.global.gateway.clientSecret | default "renku-client-secret" | quote }}
-        {{ if $.Values.global.keycloak.realm }}
         - name: NB_KEYCLOAK_REALM
-          value: {{ $.Values.global.keycloak.realm | quote }}
-        {{ end }}
+          value: {{ include "renku.keycloak.realm" $ | quote }}
         - name: NB_SESSIONS__SSH__ENABLED
           value: {{ $.Values.notebooks.ssh.enabled | quote }}
         {{- if not (kindIs "invalid" $.Values.notebooks.ssh.hostKeySecret) }}

diff --git a/helm-chart/renku/templates/ui/ui-client-deployment-template.yaml b/helm-chart/renku/templates/ui/ui-client-deployment-template.yaml
@@ -105,6 +105,8 @@ spec:
               value: {{ toJson .Values.ui.client.homepage | quote }}
             - name: CORE_API_VERSION_CONFIG			
               value: {{ toJson .Values.ui.client.coreApiVersionConfig | quote }}
+            - name: KEYCLOAK_REALM
+              value: {{ include "renku.keycloak.realm" . | quote }}
           livenessProbe:
             httpGet:
               path: /

diff --git a/helm-chart/renku/templates/ui/ui-server-deployment.yaml b/helm-chart/renku/templates/ui/ui-server-deployment.yaml
@@ -58,7 +58,7 @@ spec:
             - name: GATEWAY_LOGOUT_PATH
               value: {{ .Values.gateway.logoutSuffix | default (printf "/auth/logout") | quote }}
             - name: AUTH_SERVER_URL
-              value: {{ printf "%s/auth/realms/Renku" (include "renku.baseUrl" .) | quote }}
+              value: {{ printf "%s/auth/realms/%s" (include "renku.baseUrl" .) (include "renku.keycloak.realm" .) | quote }}
             - name: AUTH_CLIENT_ID
               value: {{ .Values.ui.server.authentication.id | default (printf "renku-ui") | quote }}
             - name: AUTH_CLIENT_SECRET

diff --git a/helm-chart/renku/values.yaml b/helm-chart/renku/values.yaml
@@ -670,7 +670,7 @@ ui:
 
     image:
       repository: renku/renku-ui
-      tag: "3.14.0"
+      tag: "3.15.0"
       pullPolicy: IfNotPresent
 
       ## Optionally specify an array of imagePullSecrets.
@@ -848,7 +848,7 @@ ui:
 
     image:
       repository: renku/renku-ui-server
-      tag: "3.14.0"
+      tag: "3.15.0"
       pullPolicy: IfNotPresent
 
     imagePullSecrets: []
@@ -1334,7 +1334,7 @@ gateway:
     ## Define the image for the auth middleware
     auth:
       repository: renku/renku-gateway
-      tag: "0.22.0"
+      tag: "0.23.0"
       pullPolicy: IfNotPresent
 
   service:
@@ -1375,7 +1375,7 @@ gateway:
   reverseProxy:
     image:
       repository: renku/renku-revproxy
-      tag: "0.22.0"
+      tag: "0.23.0"
       pullPolicy: IfNotPresent
     metrics:
       enabled: true