From d817e442fcf38564b5fc0cf97ecc01150cae7a70 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Sun, 12 May 2024 17:14:45 +0200 Subject: [PATCH 01/45] fix(k8s): :wrench: update api version of backup batch job --- k8s/templates/backup.job.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/templates/backup.job.yaml b/k8s/templates/backup.job.yaml index f320994e0..f90cbf883 100644 --- a/k8s/templates/backup.job.yaml +++ b/k8s/templates/backup.job.yaml @@ -1,5 +1,5 @@ {{- if .Values.backup.enabled -}} -apiVersion: batch/v1beta1 +apiVersion: batch/v1 kind: CronJob metadata: name: {{ include "chart.fullname" . }}-backup From d8d14bfee7681d0d922a374aacff62bb2bd63d22 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Thu, 22 Aug 2024 16:08:01 +0200 Subject: [PATCH 02/45] fix(k8s): :art: missing EOF --- k8s/templates/backup.job.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/templates/backup.job.yaml b/k8s/templates/backup.job.yaml index f90cbf883..52b5facba 100644 --- a/k8s/templates/backup.job.yaml +++ b/k8s/templates/backup.job.yaml @@ -58,4 +58,4 @@ spec: {{- toYaml . | nindent 10 }} {{- end }} backoffLimit: 4 -{{- end }} \ No newline at end of file +{{- end }} From 7b2aa13e9c8037417f1185acf2eff1257baf5a4f Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Thu, 22 Aug 2024 16:09:23 +0200 Subject: [PATCH 03/45] fix(k8s): :wrench: update pvc resource policy --- k8s/templates/data-backup.pvc.yaml | 2 ++ k8s/templates/data-workflows.pvc.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/k8s/templates/data-backup.pvc.yaml b/k8s/templates/data-backup.pvc.yaml index 2ab35b82e..3e93460b2 100644 --- a/k8s/templates/data-backup.pvc.yaml +++ b/k8s/templates/data-backup.pvc.yaml @@ -5,6 +5,8 @@ kind: PersistentVolumeClaim metadata: name: {{ include "chart.lifemonitor.data.backup" . }} namespace: {{ .Release.Namespace }} + annotations: + "helm.sh/resource-policy": keep spec: storageClassName: {{ .Values.global.readWriteManyStorageClass }} accessModes: diff --git a/k8s/templates/data-workflows.pvc.yaml b/k8s/templates/data-workflows.pvc.yaml index d2092fa04..253bbeb56 100644 --- a/k8s/templates/data-workflows.pvc.yaml +++ b/k8s/templates/data-workflows.pvc.yaml @@ -5,6 +5,8 @@ kind: PersistentVolumeClaim metadata: name: {{ include "chart.lifemonitor.data.workflows" . }} namespace: {{ .Release.Namespace }} + annotations: + helm.sh/resource-policy: keep spec: storageClassName: {{ .Values.global.readWriteManyStorageClass }} accessModes: From f680378f423d5402513e8229beaaac519bffd986 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Thu, 22 Aug 2024 16:18:32 +0200 Subject: [PATCH 04/45] fix(k8s): :wrench: perform init job only in maintenance mode --- k8s/templates/init.job.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/k8s/templates/init.job.yaml b/k8s/templates/init.job.yaml index 83b50aff3..b27b63b94 100644 --- a/k8s/templates/init.job.yaml +++ b/k8s/templates/init.job.yaml @@ -1,3 +1,4 @@ +{{- if not .Values.maintenanceMode.enabled -}} apiVersion: batch/v1 kind: Job metadata: @@ -47,3 +48,4 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} backoffLimit: 4 +{{- end }} From c12abe7baa8bfc1d0863615cac492bbc2cdab6bd Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 23 Aug 2024 10:24:01 +0200 Subject: [PATCH 05/45] build(deps): :construction_worker: bump urllib3 from 1.26.18 to 1.26.19 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f053f76ca..756bfe1fd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -51,7 +51,7 @@ SQLAlchemy==1.4.41 wheel~=0.40.0 Werkzeug~=2.2.3 repo2rocrate~=0.1.2 -urllib3==1.26.18 +urllib3==1.26.19 flask-socketio==5.3.4 gevent-websocket==0.10.1 eventlet==0.35.2 From a1dcc2ea96a0a51e8cdcd1bb6687347a88f927aa Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 23 Aug 2024 10:37:34 +0200 Subject: [PATCH 06/45] build(deps): :construction_worker: bump flask-cors from 3.0.10 to 4.0.1 bump flask-cors from 3.0.10 to 4.0.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 756bfe1fd..6e4d6e7af 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ giturlparse~=0.10.0 click-option-group~=0.5.5 cryptography>=41.0.3 dnspython==2.6.1 -flask-cors==3.0.10 +flask-cors==4.0.1 flask-marshmallow~=0.14.0 flask-restful==0.3.9 flask-login~=0.6.2 From 36f95f53d52f70d16d24a78c32594fbe3ea0fe2a Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 23 Aug 2024 11:30:16 +0200 Subject: [PATCH 07/45] build(deps): :construction_worker: bump Authlib to 0.15.6 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6e4d6e7af..460f5b353 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Authlib~=0.15.4 +Authlib~=0.15.6 apscheduler==3.10.1 connexion[swagger-ui]~=2.14.2 dramatiq[redis,watch]==1.14.2 From 9dd8106b0dc5530e2960efb50682f867d99b4655 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 23 Aug 2024 11:38:02 +0200 Subject: [PATCH 08/45] build(deps): :construction_worker: bump boto3 to 1.35.4 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 460f5b353..c88a7419e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ apscheduler==3.10.1 connexion[swagger-ui]~=2.14.2 dramatiq[redis,watch]==1.14.2 email-validator~=1.1.3 -boto3~=1.24.80 +boto3~=1.35.4 Bcrypt-Flask==1.0.2 giturlparse~=0.10.0 click-option-group~=0.5.5 From 9d4e8799072a859cc9238ff38d2d036483c86591 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 23 Aug 2024 11:52:03 +0200 Subject: [PATCH 09/45] build(deps): :construction_worker: bump APScheduler to 3.10.4 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c88a7419e..ff5251a5e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ Authlib~=0.15.6 -apscheduler==3.10.1 +apscheduler==3.10.4 connexion[swagger-ui]~=2.14.2 dramatiq[redis,watch]==1.14.2 email-validator~=1.1.3 From 05f7dc2c52eaca4edbc0a9e196d714191b0a5204 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 23 Aug 2024 12:23:40 +0200 Subject: [PATCH 10/45] build(deps): :construction_worker: bump eventlet to 0.36.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ff5251a5e..33fe43210 100644 --- a/requirements.txt +++ b/requirements.txt @@ -54,7 +54,7 @@ repo2rocrate~=0.1.2 urllib3==1.26.19 flask-socketio==5.3.4 gevent-websocket==0.10.1 -eventlet==0.35.2 +eventlet==0.36.1 uwsgi==2.0.22 # watchdog version 2.3 introduces a change that breaks Flask in development mode. # Don't use watchdog > 2.2.1 until up update Flask to something >= 2.2 From 35c66120aa1bf4ea270c703e0e5df44d2a2e0797 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 23 Aug 2024 14:53:56 +0200 Subject: [PATCH 11/45] style(docker): :art: missing EOF --- docker/worker_entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/worker_entrypoint.sh b/docker/worker_entrypoint.sh index d82d65a4d..9417da5cf 100755 --- a/docker/worker_entrypoint.sh +++ b/docker/worker_entrypoint.sh @@ -94,4 +94,4 @@ done log "Worker exiting with exit code ${exit_code}" -exit ${exit_code} \ No newline at end of file +exit ${exit_code} From 7ed952684ffb0d736fb2c9160bd6e80fb35a83b9 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 23 Aug 2024 14:55:33 +0200 Subject: [PATCH 12/45] feat(docker): :sparkles: add VERBOSE option to the worker entrypoint --- docker/worker_entrypoint.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/worker_entrypoint.sh b/docker/worker_entrypoint.sh index 9417da5cf..5e0305db2 100755 --- a/docker/worker_entrypoint.sh +++ b/docker/worker_entrypoint.sh @@ -41,9 +41,10 @@ export dramatiq_prom_db="${PROMETHEUS_MULTIPROC_DIR}" log "Starting task queue worker container" debug_log "PROMETHEUS_MULTIPROC_DIR = ${PROMETHEUS_MULTIPROC_DIR}" -if [[ -n "${DEBUG:-}" ]]; then +verbose="" +if [[ -n "${VERBOSE:-}" ]]; then verbose='--verbose' - log "Debug Mode Enabled" + echo "Verbose Mode Enabled" fi if [[ ${FLASK_ENV} == "development" ]]; then From 31a90d648ce4e9f52ba2866f810f27faf0a75498 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 23 Aug 2024 14:57:01 +0200 Subject: [PATCH 13/45] build(deps): :construction_worker: bump watchdog to the latest 4.0.2 version --- requirements.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 33fe43210..d10ef5fe4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -56,6 +56,4 @@ flask-socketio==5.3.4 gevent-websocket==0.10.1 eventlet==0.36.1 uwsgi==2.0.22 -# watchdog version 2.3 introduces a change that breaks Flask in development mode. -# Don't use watchdog > 2.2.1 until up update Flask to something >= 2.2 -watchdog==2.2.1 +watchdog==4.0.2 From beb7d4339f7f0e2d15bf6283b4c9f6a5847dadc2 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 23 Aug 2024 15:02:09 +0200 Subject: [PATCH 14/45] fix(docker): :art: ensure casing matches --- docker/lifemonitor.Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/lifemonitor.Dockerfile b/docker/lifemonitor.Dockerfile index 55f9b0acd..6b2b637ff 100644 --- a/docker/lifemonitor.Dockerfile +++ b/docker/lifemonitor.Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim-buster as base +FROM python:3.10-slim-buster AS base # Install base requirements RUN apt-get update -q \ @@ -100,7 +100,7 @@ RUN find /lm/lifemonitor/ -type d -exec chmod a+r {} \; ################################################################## ## Node Stage ################################################################## -FROM node:14.16.0-alpine3.12 as node +FROM node:14.16.0-alpine3.12 AS node RUN mkdir -p /static && apk add --no-cache bash python3 make g++ \ @@ -119,7 +119,7 @@ RUN npm run production ################################################################## ## Target Stage ################################################################## -FROM base as target +FROM base AS target # Set software and build number ARG SW_VERSION From 7ab0386750aa5ec8d1deeceb38801b343bf27a30 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 23 Aug 2024 15:05:02 +0200 Subject: [PATCH 15/45] build(deps): :construction_worker: bump FLASK-APScheduler to 1.13.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d10ef5fe4..f1d88038e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,7 @@ flask-restful==0.3.9 flask-login~=0.6.2 flask-shell-ipython==0.5.1 flask-wtf~=1.1.1 -Flask-APScheduler==1.12.4 +Flask-APScheduler==1.13.1 Flask-SQLAlchemy==2.5.1 Flask-Migrate==3.1.0 Flask-Mail~=0.9.1 From a393786e7ce8fd53cd6d30b77c8e85a288595c8c Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 23 Aug 2024 15:26:10 +0200 Subject: [PATCH 16/45] build(deps): :construction_worker: bump Flask-Mail to 0.10.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f1d88038e..34f0d5b2f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,7 @@ flask-wtf~=1.1.1 Flask-APScheduler==1.13.1 Flask-SQLAlchemy==2.5.1 Flask-Migrate==3.1.0 -Flask-Mail~=0.9.1 +Flask-Mail~=0.10.0 Flask~=2.2.5 gunicorn~=20.1.0 itsdangerous~=2.1.0 From 7962f407785b05bd78ce3175b811c8d1ecf01729 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 23 Aug 2024 16:55:45 +0200 Subject: [PATCH 17/45] build(deps): :construction_worker: bump Flask-Migrate to 4.0.7 (cherry picked from commit cefd1e18c4679feb69d9557e6805d51eeb2b3339) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 34f0d5b2f..71b26a2f1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,7 +17,7 @@ flask-shell-ipython==0.5.1 flask-wtf~=1.1.1 Flask-APScheduler==1.13.1 Flask-SQLAlchemy==2.5.1 -Flask-Migrate==3.1.0 +Flask-Migrate==4.0.7 Flask-Mail~=0.10.0 Flask~=2.2.5 gunicorn~=20.1.0 From 42b94c04319e6f8263228d6bb278b57625dfbaef Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 23 Aug 2024 17:03:18 +0200 Subject: [PATCH 18/45] build(deps): :construction_worker: bump networkx to 3.3 (cherry picked from commit d3ca9f67af20982467c4b1ab83271dcc6dc5e82c) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 71b26a2f1..87c20ad69 100644 --- a/requirements.txt +++ b/requirements.txt @@ -44,7 +44,7 @@ pika~=1.2.0 redis~=4.5.5 requests~=2.31.0 snakemake==6.13.1 -networkx~=3.1.0 +networkx~=3.3 rich~=13.4.1 rocrate==0.8.0 SQLAlchemy==1.4.41 From aa5953a43f1a175e5b5d82743431fd3ce98b3976 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 23 Aug 2024 17:09:17 +0200 Subject: [PATCH 19/45] build(deps): :construction_worker: bump rich to 13.7.1 (cherry picked from commit c3906de18fde7be1492d2a0817dbb1b7d1ec1e3a) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 87c20ad69..1bf3ca1d9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -45,7 +45,7 @@ redis~=4.5.5 requests~=2.31.0 snakemake==6.13.1 networkx~=3.3 -rich~=13.4.1 +rich~=13.7.1 rocrate==0.8.0 SQLAlchemy==1.4.41 wheel~=0.40.0 From c396436fb7616858dc9e6dc6cdeb2e3afa90c479 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 23 Aug 2024 17:19:16 +0200 Subject: [PATCH 20/45] build(deps): :construction_worker: bump wheel to 0.44.0 (cherry picked from commit 62bbaa0747258575fb5a687b98e514e86bae1f0c) --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 1bf3ca1d9..6c24ce03f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -48,12 +48,12 @@ networkx~=3.3 rich~=13.7.1 rocrate==0.8.0 SQLAlchemy==1.4.41 -wheel~=0.40.0 +wheel~=0.44.0 Werkzeug~=2.2.3 repo2rocrate~=0.1.2 urllib3==1.26.19 flask-socketio==5.3.4 gevent-websocket==0.10.1 eventlet==0.36.1 -uwsgi==2.0.22 +uwsgi==2.0.26 watchdog==4.0.2 From cdadf3e346ce20c9201900334a78d7abf622ae62 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 23 Aug 2024 17:24:02 +0200 Subject: [PATCH 21/45] build(deps): :construction_worker: bump pyOpenSSL 24.2.1 (cherry picked from commit a34e6bf0e86cb01ae5f6bc34c45125ed17b74caf) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6c24ce03f..09f3d2aa2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -30,7 +30,7 @@ nf-core~=2.5.0 prometheus-flask-exporter~=0.22 pygit2~=1.12.1 psycopg2-binary~=2.9.6 -pyopenssl==23.2.0 +pyopenssl==24.2.1 pytest-mock~=3.11.1 pytest~=7.4.0 pytest-rerunfailures~=12.0.0 From 9efe1a211f7701bfb898a1b124e6dcae15bb67b5 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 23 Aug 2024 17:24:30 +0200 Subject: [PATCH 22/45] build(deps): :construction_worker: bump itsdangerous to 2.2.0 (cherry picked from commit a861eeb394d2f60740ccb7296d1f4fb80dc7665a) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 09f3d2aa2..7ba53fc04 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,7 +21,7 @@ Flask-Migrate==4.0.7 Flask-Mail~=0.10.0 Flask~=2.2.5 gunicorn~=20.1.0 -itsdangerous~=2.1.0 +itsdangerous~=2.2.0 jwt==1.3.1 jsonschema==3.2.0 loginpass==0.5 From cad29d130d8f87a462a9dbe1eb769d64eeccf3d3 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 23 Aug 2024 17:26:52 +0200 Subject: [PATCH 23/45] build(deps): :construction_worker: bump flask-restful to 0.3.10 (cherry picked from commit e38932197e94016097b16916080b297971b64665) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7ba53fc04..6db6a7d30 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ cryptography>=41.0.3 dnspython==2.6.1 flask-cors==4.0.1 flask-marshmallow~=0.14.0 -flask-restful==0.3.9 +flask-restful==0.3.10 flask-login~=0.6.2 flask-shell-ipython==0.5.1 flask-wtf~=1.1.1 From 88a248a2df6aee68c582aef32655d29704c970f3 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 23 Aug 2024 17:27:45 +0200 Subject: [PATCH 24/45] build(deps): :construction_worker: bump flask-socketio to 5.3.6 (cherry picked from commit 6d324239a3da23444b13588f0d6d24ef1ddd1a4f) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6db6a7d30..5fce48575 100644 --- a/requirements.txt +++ b/requirements.txt @@ -52,7 +52,7 @@ wheel~=0.44.0 Werkzeug~=2.2.3 repo2rocrate~=0.1.2 urllib3==1.26.19 -flask-socketio==5.3.4 +flask-socketio==5.3.6 gevent-websocket==0.10.1 eventlet==0.36.1 uwsgi==2.0.26 From 27c9e6a9d0cf597df8ef42d16c6eb302ca4c4c2a Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 23 Aug 2024 17:29:20 +0200 Subject: [PATCH 25/45] build(deps): :construction_worker: bump Flask-WTF to 1.2.0 (cherry picked from commit 5cf690010bde1f68f53d835a2f73330d23a40c77) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5fce48575..09e463a29 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ flask-marshmallow~=0.14.0 flask-restful==0.3.10 flask-login~=0.6.2 flask-shell-ipython==0.5.1 -flask-wtf~=1.1.1 +flask-wtf~=1.2.0 Flask-APScheduler==1.13.1 Flask-SQLAlchemy==2.5.1 Flask-Migrate==4.0.7 From 26aefe9d2f74364fa92b679b3d57455a9ea55aa4 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 23 Aug 2024 17:33:06 +0200 Subject: [PATCH 26/45] build(deps): :construction_worker: bump giturlparse to 0.12.0 (cherry picked from commit c5df70bc492493707c38365a9d8adb82cb5e3a2e) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 09e463a29..57710dadf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ dramatiq[redis,watch]==1.14.2 email-validator~=1.1.3 boto3~=1.35.4 Bcrypt-Flask==1.0.2 -giturlparse~=0.10.0 +giturlparse~=0.12.0 click-option-group~=0.5.5 cryptography>=41.0.3 dnspython==2.6.1 From ccca3c1ee8c3e9152fcd6f7861b9f5bda10e6228 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 23 Aug 2024 17:40:17 +0200 Subject: [PATCH 27/45] build(deps): :construction_worker: bump gunicorn 23.0.0 (cherry picked from commit d0e3cc0429cc04dcc64406a9584689c47f8954ad) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 57710dadf..57841fc89 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,7 @@ Flask-SQLAlchemy==2.5.1 Flask-Migrate==4.0.7 Flask-Mail~=0.10.0 Flask~=2.2.5 -gunicorn~=20.1.0 +gunicorn~=23.0.0 itsdangerous~=2.2.0 jwt==1.3.1 jsonschema==3.2.0 From 9969ed0b4d592811e913183bd6d56da8ee5580ef Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 23 Aug 2024 17:42:22 +0200 Subject: [PATCH 28/45] build(deps): :construction_worker: bump pika to 1.3.2 (cherry picked from commit 7ab640732cfaec5bf504ebdb47f11b46bb713aaa) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 57841fc89..f5966de28 100644 --- a/requirements.txt +++ b/requirements.txt @@ -40,7 +40,7 @@ python-jenkins==1.7.0 python-redis-lock~=4.0.0 PyGithub==1.55 PyYAML~=6.0.1 -pika~=1.2.0 +pika~=1.3.2 redis~=4.5.5 requests~=2.31.0 snakemake==6.13.1 From 2a4f9d16a0fef47de25375573b0cae7484424390 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 23 Aug 2024 17:47:43 +0200 Subject: [PATCH 29/45] build(deps): :construction_worker: bump python-dotenv 1.0.1 (cherry picked from commit a2533eee4439dfea46cd89e028c72647c64266d0) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f5966de28..90d606d81 100644 --- a/requirements.txt +++ b/requirements.txt @@ -35,7 +35,7 @@ pytest-mock~=3.11.1 pytest~=7.4.0 pytest-rerunfailures~=12.0.0 pytest-xdist~=3.3.1 -python-dotenv~=0.19.0 +python-dotenv~=1.0.1 python-jenkins==1.7.0 python-redis-lock~=4.0.0 PyGithub==1.55 From 66e773f312dc7a3ed4292a2faddc66aeae1d911d Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 30 Aug 2024 14:58:54 +0200 Subject: [PATCH 30/45] build(deps): :construction_worker: bump boto3 to 1.35.9 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 90d606d81..bd02e5689 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ apscheduler==3.10.4 connexion[swagger-ui]~=2.14.2 dramatiq[redis,watch]==1.14.2 email-validator~=1.1.3 -boto3~=1.35.4 +boto3~=1.35.9 Bcrypt-Flask==1.0.2 giturlparse~=0.12.0 click-option-group~=0.5.5 From f1ffc9d6577bbb4387bb05378693ba699883328f Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 30 Aug 2024 15:09:04 +0200 Subject: [PATCH 31/45] build(deps): :construction_worker: bump jsonschema to 4.23.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index bd02e5689..13477ece5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,7 +23,7 @@ Flask~=2.2.5 gunicorn~=23.0.0 itsdangerous~=2.2.0 jwt==1.3.1 -jsonschema==3.2.0 +jsonschema==4.23.0 loginpass==0.5 marshmallow-sqlalchemy~=0.28.2 nf-core~=2.5.0 From df5112df1ae42cbfcb5bf727ad9bdc5d5d64a721 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 30 Aug 2024 15:12:06 +0200 Subject: [PATCH 32/45] refactor(deps): :recycle: sort requirements alphabetically --- requirements.txt | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/requirements.txt b/requirements.txt index 13477ece5..508d11e73 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,38 +1,43 @@ Authlib~=0.15.6 apscheduler==3.10.4 -connexion[swagger-ui]~=2.14.2 -dramatiq[redis,watch]==1.14.2 -email-validator~=1.1.3 boto3~=1.35.9 Bcrypt-Flask==1.0.2 -giturlparse~=0.12.0 click-option-group~=0.5.5 +connexion[swagger-ui]~=2.14.2 cryptography>=41.0.3 dnspython==2.6.1 +dramatiq[redis,watch]==1.14.2 +email-validator~=1.1.3 +eventlet==0.36.1 flask-cors==4.0.1 +flask-login~=0.6.2 flask-marshmallow~=0.14.0 flask-restful==0.3.10 -flask-login~=0.6.2 flask-shell-ipython==0.5.1 flask-wtf~=1.2.0 Flask-APScheduler==1.13.1 -Flask-SQLAlchemy==2.5.1 -Flask-Migrate==4.0.7 Flask-Mail~=0.10.0 +Flask-Migrate==4.0.7 +Flask-SQLAlchemy==2.5.1 Flask~=2.2.5 +flask-socketio==5.3.6 +gevent-websocket==0.10.1 +giturlparse~=0.12.0 gunicorn~=23.0.0 itsdangerous~=2.2.0 jwt==1.3.1 jsonschema==4.23.0 loginpass==0.5 marshmallow-sqlalchemy~=0.28.2 +networkx~=3.3 nf-core~=2.5.0 +pika~=1.3.2 prometheus-flask-exporter~=0.22 -pygit2~=1.12.1 psycopg2-binary~=2.9.6 +pygit2~=1.12.1 pyopenssl==24.2.1 -pytest-mock~=3.11.1 pytest~=7.4.0 +pytest-mock~=3.11.1 pytest-rerunfailures~=12.0.0 pytest-xdist~=3.3.1 python-dotenv~=1.0.1 @@ -40,20 +45,15 @@ python-jenkins==1.7.0 python-redis-lock~=4.0.0 PyGithub==1.55 PyYAML~=6.0.1 -pika~=1.3.2 redis~=4.5.5 +repo2rocrate~=0.1.2 requests~=2.31.0 -snakemake==6.13.1 -networkx~=3.3 rich~=13.7.1 rocrate==0.8.0 +snakemake==6.13.1 SQLAlchemy==1.4.41 -wheel~=0.44.0 -Werkzeug~=2.2.3 -repo2rocrate~=0.1.2 urllib3==1.26.19 -flask-socketio==5.3.6 -gevent-websocket==0.10.1 -eventlet==0.36.1 uwsgi==2.0.26 watchdog==4.0.2 +wheel~=0.44.0 +Werkzeug~=2.2.3 From 94f62306e408d9a917200db8496a65ac821ce315 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 30 Aug 2024 15:13:04 +0200 Subject: [PATCH 33/45] build(deps): :construction_worker: bump email-validator to 2.2.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 508d11e73..18f931259 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ connexion[swagger-ui]~=2.14.2 cryptography>=41.0.3 dnspython==2.6.1 dramatiq[redis,watch]==1.14.2 -email-validator~=1.1.3 +email-validator~=2.2.0 eventlet==0.36.1 flask-cors==4.0.1 flask-login~=0.6.2 From 76ad38f3247a7001151325aeba323740de2d6867 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 30 Aug 2024 15:32:13 +0200 Subject: [PATCH 34/45] build(deps): :construction_worker: bump pygit2 to 1.15.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 18f931259..4a3f947f9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -34,7 +34,7 @@ nf-core~=2.5.0 pika~=1.3.2 prometheus-flask-exporter~=0.22 psycopg2-binary~=2.9.6 -pygit2~=1.12.1 +pygit2~=1.15.1 pyopenssl==24.2.1 pytest~=7.4.0 pytest-mock~=3.11.1 From d09536840dcbca2158f57f490593d19454016818 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 30 Aug 2024 15:34:35 +0200 Subject: [PATCH 35/45] build(deps): :construction_worker: bump rich to 13.8.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4a3f947f9..905995350 100644 --- a/requirements.txt +++ b/requirements.txt @@ -48,7 +48,7 @@ PyYAML~=6.0.1 redis~=4.5.5 repo2rocrate~=0.1.2 requests~=2.31.0 -rich~=13.7.1 +rich~=13.8.0 rocrate==0.8.0 snakemake==6.13.1 SQLAlchemy==1.4.41 From 0437a0c2520230eb0ff8e8226d3f476da4e3cf77 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Fri, 30 Aug 2024 15:35:56 +0200 Subject: [PATCH 36/45] build(deps): :construction_worker: bump rocrate to 0.10.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 905995350..8c76d6ad9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -49,7 +49,7 @@ redis~=4.5.5 repo2rocrate~=0.1.2 requests~=2.31.0 rich~=13.8.0 -rocrate==0.8.0 +rocrate==0.10.0 snakemake==6.13.1 SQLAlchemy==1.4.41 urllib3==1.26.19 From 8956bac16480cc9c98c1c328bf4558db877c44db Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Mon, 2 Sep 2024 10:19:05 +0200 Subject: [PATCH 37/45] feat(docker): :sparkles: add maintenance mode on compose deployment --- docker-compose.maintenance.yml | 63 ++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 docker-compose.maintenance.yml diff --git a/docker-compose.maintenance.yml b/docker-compose.maintenance.yml new file mode 100644 index 000000000..6974e2152 --- /dev/null +++ b/docker-compose.maintenance.yml @@ -0,0 +1,63 @@ +version: "3.5" + +services: + db: + environment: + - "ALLOW_EMPTY_PASSWORD=yes" + + console: + image: crs4/lifemonitor + restart: "unless-stopped" + depends_on: + - "db" + - "init" + - "redis" + entrypoint: /bin/bash + command: | + -c "sleep infinity" + user: "${USER_UID}:${USER_GID}" + env_file: + - settings.conf + environment: + - "FLASK_ENV=development" + - "TEMPLATES_AUTO_RELOAD=True" + - "HOME=/lm" + # Normally, OAuthLib will raise an InsecureTransportError if you attempt to use OAuth2 over HTTP, + # rather than HTTPS. Setting this environment variable will prevent this error from being raised. + # This is mostly useful for local testing, or automated tests. Never set this variable in production. + - "AUTHLIB_INSECURE_TRANSPORT=1" + # - "SERVER_NAME=lm:8000" + volumes: + - "./certs:/certs:ro" + - "./instance:/lm/instance:ro" + - "./settings.conf:/lm/settings.conf:ro" # default settings + - "./:/lm" + - "data_workflows:/var/data/lm" + ports: + - "8000" + networks: + - life_monitor + + init: + user: "${USER_UID}:${USER_GID}" + environment: + - "FLASK_ENV=development" + # Normally, OAuthLib will raise an InsecureTransportError if you attempt to use OAuth2 over HTTP, + # rather than HTTPS. Setting this environment variable will prevent this error from being raised. + # This is mostly useful for local testing, or automated tests. Never set this variable in production. + - "AUTHLIB_INSECURE_TRANSPORT=1" + - "HOME=/lm" + volumes: + - "./:/lm" + + lm: + environment: + - "FLASK_ENV=maintenance" + + ws_server: + environment: + - "FLASK_ENV=maintenance" + + worker: + environment: + - "FLASK_ENV=maintenance" From d372226b01e474c2b8c742afcdfa9e5d1a1611f9 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Mon, 2 Sep 2024 10:36:29 +0200 Subject: [PATCH 38/45] fix(docker): :fire: remove obsolete `version` keyword --- docker-compose.base.yml | 2 -- docker-compose.dev.yml | 2 -- docker-compose.extra.yml | 2 -- docker-compose.maintenance.yml | 2 -- docker-compose.monitoring.yml | 2 -- docker-compose.test.yml | 2 -- 6 files changed, 12 deletions(-) diff --git a/docker-compose.base.yml b/docker-compose.base.yml index ee0d60d0c..8ab70fb87 100644 --- a/docker-compose.base.yml +++ b/docker-compose.base.yml @@ -1,5 +1,3 @@ -version: "3.5" - services: db: # Docker image docs: https://github.com/bitnami/bitnami-docker-postgresql diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index df1310b32..1c880321a 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -1,5 +1,3 @@ -version: "3.5" - services: db: environment: diff --git a/docker-compose.extra.yml b/docker-compose.extra.yml index 4cd89b6c9..2a6c5530a 100644 --- a/docker-compose.extra.yml +++ b/docker-compose.extra.yml @@ -1,5 +1,3 @@ -version: "3.5" - services: seek: image: crs4/lifemonitor-tests:seek diff --git a/docker-compose.maintenance.yml b/docker-compose.maintenance.yml index 6974e2152..17646c293 100644 --- a/docker-compose.maintenance.yml +++ b/docker-compose.maintenance.yml @@ -1,5 +1,3 @@ -version: "3.5" - services: db: environment: diff --git a/docker-compose.monitoring.yml b/docker-compose.monitoring.yml index 2e17806e1..569839991 100644 --- a/docker-compose.monitoring.yml +++ b/docker-compose.monitoring.yml @@ -1,5 +1,3 @@ -version: "3.5" - services: prometheus: image: prom/prometheus:v2.48.0 diff --git a/docker-compose.test.yml b/docker-compose.test.yml index c2fe73b11..046066eb6 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -1,5 +1,3 @@ -version: "3.5" - services: lmtests: image: crs4/lifemonitor From 5c391466e842dee0a0113ba2c5fbaa7ab06f0335 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Mon, 2 Sep 2024 10:55:29 +0200 Subject: [PATCH 39/45] fix(docker): :bug: fix {U,G}ID warning in tests --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0b3bb6138..fe649bab1 100644 --- a/Makefile +++ b/Makefile @@ -223,7 +223,8 @@ start-dev: images compose-files dev reset_compose permissions ## Start LifeMonit start-testing: compose-files aux_images ro_crates images reset_compose permissions ## Start LifeMonitor in a Testing environment @printf "\n$(bold)Starting testing services...$(reset)\n" ; \ base=$$(if [[ -f "docker-compose.yml" ]]; then echo "-f docker-compose.yml"; fi) ; \ - echo "$$($(docker_compose) $${base} \ + echo "$$(USER_UID=$$(id -u) USER_GID=$$(id -g) \ + $(docker_compose) $${base} \ -f docker-compose.extra.yml \ -f docker-compose.base.yml \ -f docker-compose.monitoring.yml \ From 022e3327d6c3252a9cb49e284cf8dd24af6ce990 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Mon, 2 Sep 2024 13:21:14 +0200 Subject: [PATCH 40/45] fix(docker): :bug: fix permission of the log folder --- Makefile | 3 ++- docker-compose.base.yml | 1 + docker-compose.test.yml | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fe649bab1..64bb9792f 100644 --- a/Makefile +++ b/Makefile @@ -185,7 +185,8 @@ permissions: certs prometheus.dev.yml \ settings.conf \ tests/config/registries/seek/nginx.conf \ - tests/config/registries/seek/doorkeeper.rb + tests/config/registries/seek/doorkeeper.rb \ + && mkdir -p /tmp/lifemonitor-logs aux_images: tests/config/registries/seek/seek.Dockerfile certs diff --git a/docker-compose.base.yml b/docker-compose.base.yml index 8ab70fb87..5e6820087 100644 --- a/docker-compose.base.yml +++ b/docker-compose.base.yml @@ -63,6 +63,7 @@ services: - "./instance:/lm/instance:ro" - "./settings.conf:/lm/settings.conf:ro" # default settings - "data_workflows:/var/data/lm" + - "/tmp/lifemonitor-logs:/var/log/lm" networks: - life_monitor diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 046066eb6..2389352be 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -32,6 +32,7 @@ services: - "./certs:/certs:ro" - "./instance:/lm/instance:ro" - "./settings.conf:/lm/settings.conf:ro" # default settings + - "/tmp/lifemonitor-logs:/var/log/lm" ports: - "8000" networks: From 0e7ba35f6c1b5841f86adf67db3503042c6f4e71 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Mon, 2 Sep 2024 11:08:18 +0200 Subject: [PATCH 41/45] refactor(logging): :loud_sound: add detailed log message in DEBUG mode --- lifemonitor/api/controllers.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lifemonitor/api/controllers.py b/lifemonitor/api/controllers.py index 16d681766..1b8c7ef55 100644 --- a/lifemonitor/api/controllers.py +++ b/lifemonitor/api/controllers.py @@ -249,7 +249,9 @@ def registry_user_workflows_get(user_id, status=False, versions=False): workflows = lm.get_user_registry_workflows(identity.user, current_registry) logger.debug("registry_user_workflows_get. Got %s workflows (user: %s)", len(workflows), current_user) return serializers.ListOfWorkflows(workflow_status=status, workflow_versions=versions).dump(workflows) - except OAuthIdentityNotFoundException: + except OAuthIdentityNotFoundException as e: + if logger.isEnabledFor(logging.DEBUG): + logger.exception(e) return lm_exceptions.report_problem(401, "Unauthorized", detail=messages.no_user_oauth_identity_on_registry .format(user_id, current_registry.name)) From a8db73cdc6c120d699ff39fc7c9dd25183beddad Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Mon, 2 Sep 2024 11:10:26 +0200 Subject: [PATCH 42/45] fix(services): :bug: query registry by `client_name` --- lifemonitor/api/services.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lifemonitor/api/services.py b/lifemonitor/api/services.py index 3c96094bd..58bf3ee6a 100644 --- a/lifemonitor/api/services.py +++ b/lifemonitor/api/services.py @@ -626,7 +626,8 @@ def find_registry_user_identity(registry: models.WorkflowRegistry, raise ValueError("external_id and internal_id cannot be both None") if internal_id: return OAuthIdentity.find_by_user_id(internal_id, registry.name) - return OAuthIdentity.find_by_provider_user_id(external_id, registry.name) + assert registry, "The registry should be defined" + return OAuthIdentity.find_by_provider_user_id(external_id, registry.client_name) @staticmethod def add_workflow_registry(type, name, From cdeb1f1cf95ef2911184889524ffb1f79ea5c5e8 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Mon, 2 Sep 2024 11:13:02 +0200 Subject: [PATCH 43/45] refactor(logging): :loud_sound: print a warning when a registry cannot be found --- lifemonitor/api/models/repositories/config.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lifemonitor/api/models/repositories/config.py b/lifemonitor/api/models/repositories/config.py index 51fcf375f..86f75dea6 100644 --- a/lifemonitor/api/models/repositories/config.py +++ b/lifemonitor/api/models/repositories/config.py @@ -150,7 +150,11 @@ def registries(self) -> List[models.WorkflowRegistry]: for rfs in self._get_refs_list(): for r in rfs.get("update_registries", []): if not registries.get(r, None): - registries[r] = models.WorkflowRegistry.find_by_client_name(r) + r_model = models.WorkflowRegistry.find_by_client_name(r) + if r_model is None: + logger.warning("Unable to find registry: %r", r) + else: + registries[r] = r_model return list(registries.values()) def get_ref_registries(self, ref_type: str, tag: str) -> List[models.WorkflowRegistry]: From 90932efec748d67196d0344d934079d7aee4fbe9 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Mon, 2 Sep 2024 11:22:25 +0200 Subject: [PATCH 44/45] refactor(k8s): :art: fix alignment --- k8s/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/k8s/values.yaml b/k8s/values.yaml index 35636f224..4c3151c22 100644 --- a/k8s/values.yaml +++ b/k8s/values.yaml @@ -288,7 +288,7 @@ worker: - name: github # image: *lifemonitorImage # - name: heartbeat - # image: *lifemonitorImage + # image: *lifemonitorImage - name: notifications # image: *lifemonitorImage - name: builds @@ -296,7 +296,7 @@ worker: - name: workflows # image: *lifemonitorImage # - name: metrics - # image: *lifemonitorImage + # image: *lifemonitorImage - name: ws # image: *lifemonitorImage From 1bd63cfcdf4cb12e8ab0cf267f2f48f996302e67 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Mon, 2 Sep 2024 14:54:40 +0200 Subject: [PATCH 45/45] build(core): :bookmark: Bump version to 0.15.0 --- k8s/Chart.yaml | 2 +- lifemonitor/static/src/package.json | 2 +- specs/api.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/k8s/Chart.yaml b/k8s/Chart.yaml index 1ae3d21f0..c4611c5c0 100644 --- a/k8s/Chart.yaml +++ b/k8s/Chart.yaml @@ -12,7 +12,7 @@ version: 0.12.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 0.14.0 +appVersion: 0.15.0 # Chart dependencies dependencies: diff --git a/lifemonitor/static/src/package.json b/lifemonitor/static/src/package.json index 0eed0ede5..cba44ce8e 100644 --- a/lifemonitor/static/src/package.json +++ b/lifemonitor/static/src/package.json @@ -1,7 +1,7 @@ { "name": "lifemonitor", "description": "Workflow Testing Service", - "version": "0.14.0", + "version": "0.15.0", "license": "MIT", "author": "CRS4", "main": "../dist/js/lifemonitor.min.js", diff --git a/specs/api.yaml b/specs/api.yaml index df3854f98..182630f31 100644 --- a/specs/api.yaml +++ b/specs/api.yaml @@ -3,7 +3,7 @@ openapi: "3.0.0" info: - version: "0.14.0" + version: "0.15.0" title: "Life Monitor API" description: | *Workflow sustainability service* @@ -18,7 +18,7 @@ info: servers: - url: / description: > - Version 0.14.0 of API. + Version 0.15.0 of API. tags: - name: GitHub Integration