Merge branch 'master' into develop

Author: Panaetius

CHANGES.rst

@@ -18,6 +18,24 @@
 Changes
 =======
 
+`2.6.0 <https://github.com/SwissDataScienceCenter/renku-python/compare/v2.5.0...v2.6.0>`__ (2023-06-20)
+-------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+~~~~~~~~~
+
+-  **service:** fixes importing private datasets in deployments with
+   external gitlab
+   (`#3523 <https://github.com/SwissDataScienceCenter/renku-python/issues/3523>`__)
+   (`d64c179 <https://github.com/SwissDataScienceCenter/renku-python/commit/d64c179857d0f1faa08c11a0cf0149eec97b4e46>`__)
+
+Features
+~~~~~~~~
+
+-  **service:** add support for horizontal scaling
+   (`#3178 <https://github.com/SwissDataScienceCenter/renku-python/issues/3178>`__)
+   (`fab2b58 <https://github.com/SwissDataScienceCenter/renku-python/commit/fab2b583f3c36fa179b6388ca7a28fa68b2aad8b>`__)
+
 `2.5.0 <https://github.com/SwissDataScienceCenter/renku-python/compare/v2.4.1...v2.5.0>`__ (2023-06-02)
 -------------------------------------------------------------------------------------------------------
 

helm-chart/renku-core/Chart.yaml

@@ -3,4 +3,4 @@ appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: renku-core
 icon: https://avatars0.githubusercontent.com/u/53332360?s=400&u=a4311d22842343604ef61a8c8a1e5793209a67e9&v=4
-version: 2.5.0
+version: 2.6.0

helm-chart/renku-core/templates/deployment.yaml

@@ -1,11 +1,4 @@
 {{- range $version := .Values.versions }}
-{{- $queuesWithVersion := dict "datasetqueues" (list) "managementqueues" (list) -}}
-{{- range $queue := (split "," $.Values.datasetsWorkerQueues) -}}
-{{- $var := printf "%s.%s" $version.name $queue | append $queuesWithVersion.datasetqueues | set $queuesWithVersion "datasetqueues" -}}
-{{- end }}
-{{- range $queue := (split "," $.Values.managementWorkerQueues) -}}
-{{- $var := printf "%s.%s" $version.name $queue | append $queuesWithVersion.managementqueues | set $queuesWithVersion "managementqueues" -}}
-{{- end }}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -199,7 +192,7 @@ spec:
             - name: RENKU_SVC_CLEANUP_INTERVAL
               value: {{ $.Values.cleanupInterval | quote }}
             - name: RENKU_SVC_WORKER_QUEUES
-              value: {{ join "," $queuesWithVersion.datasetqueues }}
+              value: {{ $.Values.datasetsWorkerQueues}}
             - name: RENKU_SVC_CLEANUP_TTL_FILES
               value: {{ $.Values.cleanupFilesTTL | quote }}
             - name: RENKU_SVC_CLEANUP_TTL_PROJECTS
@@ -255,7 +248,7 @@ spec:
             - name: RENKU_SVC_CLEANUP_INTERVAL
               value: {{ $.Values.cleanupInterval | quote }}
             - name: RENKU_SVC_WORKER_QUEUES
-              value: {{ join "," $queuesWithVersion.managementqueues }}
+              value: {{ $.Values.managementWorkerQueues }}
             - name: RENKU_SVC_CLEANUP_TTL_FILES
               value: {{ $.Values.cleanupFilesTTL | quote }}
             - name: RENKU_SVC_CLEANUP_TTL_PROJECTS

helm-chart/renku-core/values.yaml

@@ -68,7 +68,6 @@ resources:
   datasetsWorkers: {}
   managementWorkers: {}
   scheduler: {}
-
 # nodeSelector: {}
 
 # tolerations: []
@@ -90,7 +89,7 @@ versions:
     fullnameOverride: ""
     image:
       repository: renku/renku-core
-      tag: "v2.5.0"
+      tag: "v2.6.0"
       pullPolicy: IfNotPresent
   v9:
     name: v9
@@ -99,15 +98,14 @@ versions:
     fullnameOverride: ""
     image:
       repository: renku/renku-core
-      tag: "v1.11.3"
+      tag: "v1.11.4"
       pullPolicy: IfNotPresent
 podSecurityContext:
   runAsUser: 1000
   runAsGroup: 1000
   fsGroup: 100
 securityContext:
   allowPrivilegeEscalation: false
-
 horizontalPodAutoscaling:
   minReplicas: 2
   maxReplicas: 10