Skip to content

Commit a2f2df4

Browse files
PanaetiusPanaetius
authored
Merge pull request #3536 from SwissDataScienceCenter/release/v2.6.0
chore: release v2.6.0
2 parents bca49a4 + d06a7fd commit a2f2df4

File tree

23 files changed

+391
-471
lines changed

23 files changed

+391
-471
lines changed

‎CHANGES.rst

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,24 @@
1818
Changes
1919
=======
2020

21+
`2.6.0 <https://github.com/SwissDataScienceCenter/renku-python/compare/v2.5.0...v2.6.0>`__ (2023-06-20)
22+
-------------------------------------------------------------------------------------------------------
23+
24+
Bug Fixes
25+
~~~~~~~~~
26+
27+
- **service:** fixes importing private datasets in deployments with
28+
external gitlab
29+
(`#3523 <https://github.com/SwissDataScienceCenter/renku-python/issues/3523>`__)
30+
(`d64c179 <https://github.com/SwissDataScienceCenter/renku-python/commit/d64c179857d0f1faa08c11a0cf0149eec97b4e46>`__)
31+
32+
Features
33+
~~~~~~~~
34+
35+
- **service:** add support for horizontal scaling
36+
(`#3178 <https://github.com/SwissDataScienceCenter/renku-python/issues/3178>`__)
37+
(`fab2b58 <https://github.com/SwissDataScienceCenter/renku-python/commit/fab2b583f3c36fa179b6388ca7a28fa68b2aad8b>`__)
38+
2139
`2.5.0 <https://github.com/SwissDataScienceCenter/renku-python/compare/v2.4.1...v2.5.0>`__ (2023-06-02)
2240
-------------------------------------------------------------------------------------------------------
2341

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM python:3.9-slim as base
22

33
# hadolint ignore=DL3008,DL3009,DL3013
44
RUN apt-get update && \
5-
apt-get install --no-install-recommends -y git git-lfs=2.* python3-dev tini bash curl && \
5+
apt-get install --no-install-recommends -y git git-lfs=3.* python3-dev tini bash curl && \
66
pip install --no-cache-dir --upgrade pip
77

88
FROM base as builder

‎chartpress.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ charts:
1515
buildArgs:
1616
CLEAN_INSTALL: "1"
1717
BUILD_CORE_SERVICE: "1"
18+

‎helm-chart/renku-core/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ appVersion: "1.0"
33
description: A Helm chart for Kubernetes
44
name: renku-core
55
icon: https://avatars0.githubusercontent.com/u/53332360?s=400&u=a4311d22842343604ef61a8c8a1e5793209a67e9&v=4
6-
version: 2.5.0
6+
version: 2.6.0

‎helm-chart/renku-core/templates/configmap.yaml

Lines changed: 2 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,9 @@
11
apiVersion: v1
22
kind: ConfigMap
33
metadata:
4-
name: {{ include "renku-core.fullname" . }}-nginx
4+
name: {{ include "renku-core.fullname" . }}-metadata-versions
55
data:
6-
nginx-server-blocks.conf: |
7-
{{- range $version := .Values.versions }}
8-
upstream {{ $version.name }} {
9-
server {{ include "renku-core.fullname" $ }}-{{ $version.name }};
10-
keepalive 32;
11-
keepalive_timeout 60s;
12-
}
13-
{{ end }}
14-
15-
server {
16-
listen 8080;
17-
18-
server_name {{ include "renku-core.fullname" . }};
19-
20-
sendfile on;
21-
tcp_nopush on;
22-
client_max_body_size 0; # Required for uploading large files
23-
24-
location /renku/version {
25-
root /;
26-
add_header Content-Type application/json;
27-
try_files /usr/share/nginx/html/version.json =404;
28-
}
29-
30-
{{- range $version := .Values.versions }}
31-
location /renku/{{ $version.prefix }} {
32-
rewrite /renku/{{ $version.prefix }}/(.*) /renku/$1 break;
33-
proxy_set_header Host $host;
34-
proxy_pass http://{{ $version.name }};
35-
proxy_send_timeout {{ $.Values.requestTimeout }}s;
36-
proxy_read_timeout {{ $.Values.requestTimeout }}s;
37-
proxy_http_version 1.1;
38-
proxy_set_header "Connection" "";
39-
}
40-
{{- end }}
41-
42-
location /renku {
43-
proxy_set_header Host $host;
44-
proxy_pass http://{{ .Values.versions.latest.name }};
45-
proxy_send_timeout {{ $.Values.requestTimeout }}s;
46-
proxy_read_timeout {{ $.Values.requestTimeout }}s;
47-
proxy_http_version 1.1;
48-
proxy_set_header "Connection" "";
49-
}
50-
}
51-
version.json: |
6+
metadata-versions.json: |
527
{
538
"name": "renku-core",
549
"versions": [

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

Lines changed: 0 additions & 41 deletions
This file was deleted.

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

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ metadata:
1717
spec:
1818
replicas: {{ $.Values.replicaCount }}
1919
strategy:
20-
type: Recreate
20+
type: RollingUpdate
21+
rollingUpdate:
22+
maxUnavailable: 0
23+
maxSurge: 1
2124
selector:
2225
matchLabels:
2326
app.kubernetes.io/name: {{ include "renku-core.name" $ }}
@@ -44,6 +47,9 @@ spec:
4447
volumes:
4548
- name: shared-volume
4649
emptyDir: {}
50+
- name: metadata-versions
51+
configMap:
52+
name: {{ include "renku-core.fullname" $ }}-metadata-versions
4753
{{- include "certificates.volumes" $ | nindent 8 }}
4854
initContainers:
4955
{{- include "certificates.initContainer" $ | nindent 8 }}
@@ -139,10 +145,14 @@ spec:
139145
value: {{ $.Values.global.renku.domain }}
140146
- name: RENKU_PROJECT_DEFAULT_CLI_VERSION
141147
value: {{ $.Values.global.renku.cli_version | default "" | quote }}
148+
- name: METADATA_VERSIONS_LIST
149+
value: /svc/config/metadata-versions/metadata-versions.json
142150
{{- include "certificates.env.python" $ | nindent 12 }}
143151
volumeMounts:
144152
- name: shared-volume
145153
mountPath: {{ $.Values.cacheDirectory }}
154+
- name: metadata-versions
155+
mountPath: /svc/config/metadata-versions
146156
{{- include "certificates.volumeMounts.system" $ | nindent 12 }}
147157
ports:
148158
- name: http
@@ -157,7 +167,7 @@ spec:
157167
path: /health
158168
port: http
159169
resources:
160-
{{- toYaml $.Values.resources | nindent 12 }}
170+
{{- toYaml $.Values.resources.core | nindent 12 }}
161171
- name: {{ $.Chart.Name }}-datasets-workers
162172
image: "{{ $version.image.repository }}:{{ $version.image.tag }}"
163173
imagePullPolicy: {{ $version.image.pullPolicy }}
@@ -213,6 +223,8 @@ spec:
213223
- name: shared-volume
214224
mountPath: {{ $.Values.cacheDirectory }}
215225
{{- include "certificates.volumeMounts.system" $ | nindent 12 }}
226+
resources:
227+
{{- toYaml $.Values.resources.datasetsWorkers | nindent 12 }}
216228

217229
- name: {{ $.Chart.Name }}-management-workers
218230
image: "{{ $version.image.repository }}:{{ $version.image.tag }}"
@@ -267,6 +279,8 @@ spec:
267279
- name: shared-volume
268280
mountPath: {{ $.Values.cacheDirectory }}
269281
{{- include "certificates.volumeMounts.system" $ | nindent 12 }}
282+
resources:
283+
{{- toYaml $.Values.resources.managementWorkers | nindent 12 }}
270284

271285
- name: {{ $.Chart.Name }}-scheduler
272286
image: "{{ $version.image.repository }}:{{ $version.image.tag }}"
@@ -307,6 +321,8 @@ spec:
307321
{{- include "certificates.env.python" $ | nindent 12 }}
308322
volumeMounts:
309323
{{- include "certificates.volumeMounts.system" $ | nindent 12 }}
324+
resources:
325+
{{- toYaml $.Values.resources.scheduler | nindent 12 }}
310326
{{- with $.Values.nodeSelector }}
311327
nodeSelector:
312328
{{- toYaml . | nindent 8 }}

‎helm-chart/renku-core/templates/hpa.yaml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{{- range $version := .Values.versions }}
2+
---
3+
{{- if $.Capabilities.APIVersions.Has "autoscaling/v2" }}
4+
apiVersion: autoscaling/v2
5+
{{- else if $.Capabilities.APIVersions.Has "autoscaling/v2beta2" }}
6+
apiVersion: autoscaling/v2beta2
7+
{{- else if $.Capabilities.APIVersions.Has "autoscaling/v2beta1" }}
8+
apiVersion: autoscaling/v2beta1
9+
{{- else }}
10+
{{- fail "ERROR: You must have at least autoscaling/v2beta1 to use HorizontalPodAutoscaler" }}
11+
{{- end }}
12+
kind: HorizontalPodAutoscaler
13+
metadata:
14+
name: {{ include "renku-core.fullname" $ }}-{{ $version.name }}
15+
spec:
16+
scaleTargetRef:
17+
apiVersion: apps/v1
18+
kind: Deployment
19+
name: {{ include "renku-core.fullname" $ }}-{{ $version.name }}
20+
minReplicas: {{ $.Values.horizontalPodAutoscaling.minReplicas }}
21+
maxReplicas: {{ $.Values.horizontalPodAutoscaling.maxReplicas }}
22+
metrics:
23+
- type: Resource
24+
resource:
25+
name: memory
26+
target:
27+
type: Utilization
28+
averageUtilization: {{ $.Values.horizontalPodAutoscaling.averageMemoryUtilization }}
29+
{{ end }}

‎helm-chart/renku-core/templates/pdb.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{{- range $version := .Values.versions }}
2+
---
3+
apiVersion: policy/v1
4+
kind: PodDisruptionBudget
5+
metadata:
6+
name: {{ include "renku-core.fullname" $ }}-{{ $version.name }}
7+
spec:
8+
minAvailable: 1
9+
selector:
10+
matchLabels:
11+
app.kubernetes.io/deploymentVersion: {{ $version.name }}
12+
{{ end }}

‎helm-chart/renku-core/templates/service-nginx.yaml

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)