From 968ae307396df3b51632bc20564caec8c76c776b Mon Sep 17 00:00:00 2001 From: PaulineMauryL Date: Wed, 30 Oct 2024 15:43:17 +0000 Subject: [PATCH 1/3] remove lru cache --- charts/lomas/Chart.yaml | 4 ++-- charts/lomas/values.schema.json | 32 +++++++------------------------- charts/lomas/values.yaml | 3 --- 3 files changed, 9 insertions(+), 30 deletions(-) diff --git a/charts/lomas/Chart.yaml b/charts/lomas/Chart.yaml index 1cfac81..602a85a 100644 --- a/charts/lomas/Chart.yaml +++ b/charts/lomas/Chart.yaml @@ -16,13 +16,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.3.5 +version: 0.3.6 # 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. # It is recommended to use it with quotes. -appVersion: "0.3.5" +appVersion: "0.3.6" dependencies: - name: lomas-server diff --git a/charts/lomas/values.schema.json b/charts/lomas/values.schema.json index b768297..2d09bbd 100644 --- a/charts/lomas/values.schema.json +++ b/charts/lomas/values.schema.json @@ -42,10 +42,11 @@ }, "tag": { "type": "string", - "default": "0.3.5", + "default": "0.3.4", "enum": [ "latest", - "0.3.5" + "0.3.1", + "0.3.4" ] } } @@ -453,10 +454,11 @@ }, "tag": { "type": "string", - "default": "0.3.5", + "default": "0.3.4", "enum": [ "latest", - "0.3.5" + "0.3.1", + "0.3.4" ] } } @@ -602,26 +604,6 @@ "settings": { "type": "object", "properties": { - "dataset_store": { - "type": "object", - "description": "Dataset store configuration", - "properties": { - "ds_store_type": { - "description": "The type of dataset store.", - "enum": [ - "basic", - "LRU_cache" - ], - "type": "string", - "default": "LRU_cache" - }, - "max_memory_usage": { - "description": "Max memory usage of dataset store, in MiB. Only useful for LRU_cache type.", - "type": "integer", - "default": 512 - } - } - }, "develop_mode": { "description": "When True, service database is reset to default user and dataset collections.", "type": "boolean", @@ -723,7 +705,7 @@ "private_db_credentials": { "description": "List of credentials to access private dataset", "type": "array", - "default": [] , + "default": [], "items": { "type": "object", "properties": { diff --git a/charts/lomas/values.yaml b/charts/lomas/values.yaml index bf4c533..0df410e 100644 --- a/charts/lomas/values.yaml +++ b/charts/lomas/values.yaml @@ -61,9 +61,6 @@ lomas-server: time_attack: method: "jitter" # or "stall" magnitude: 1 - dataset_store: - ds_store_type: "LRU_cache" - max_memory_usage : 512 dp_libraries: opendp: contrib: True From b71c1f6511370c01ce16aba7476929b9d8af2066 Mon Sep 17 00:00:00 2001 From: PaulineMauryL Date: Wed, 30 Oct 2024 16:11:30 +0000 Subject: [PATCH 2/3] onyxia version update --- charts/lomas/Chart.yaml | 2 +- charts/lomas/values.schema.json | 49 +++++++++++++++++---------------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/charts/lomas/Chart.yaml b/charts/lomas/Chart.yaml index 602a85a..96d0f16 100644 --- a/charts/lomas/Chart.yaml +++ b/charts/lomas/Chart.yaml @@ -26,5 +26,5 @@ appVersion: "0.3.6" dependencies: - name: lomas-server - version: "0.3.4" + version: "0.3.5" repository: https://dscc-admin-ch.github.io/helm-charts diff --git a/charts/lomas/values.schema.json b/charts/lomas/values.schema.json index 2d09bbd..d9a9366 100644 --- a/charts/lomas/values.schema.json +++ b/charts/lomas/values.schema.json @@ -42,11 +42,11 @@ }, "tag": { "type": "string", - "default": "0.3.4", + "default": "0.3.5", "enum": [ "latest", "0.3.1", - "0.3.4" + "0.3.5" ] } } @@ -271,17 +271,17 @@ "properties": { "max_pool_size": { "description": "Total number of open connections (active + idle) allowed in the pool.", - "type": "int", + "type": "integer", "default": 100 }, "min_pool_size": { "description": "Minimum number of idle connections that will be maintained, even when the application is idle or under low load.", - "type": "int", + "type": "integer", "default": 2 }, "max_connecting": { "description": "Controls the number of simultaneous new connection attempts being made.", - "type": "int", + "type": "integer", "default": 2 }, "architecture": { @@ -293,31 +293,32 @@ "type": "object", "description": "Authentification configuration", "properties": { + "databases": { + "type": "array", + "items": { + "type": "string" + } + }, "enabled": { - "type": "boolean", - "description": "add mongodb to server", - "default": true + "type": "boolean" }, - "rootUser": { - "type": "string", - "description": "root name", - "default": "root" + "passwords": { + "type": "array", + "items": { + "type": "string" + } }, "rootPassword": { - "type": "string", - "description": "root password", - "default": "changeme", - "x-onyxia": { - "overwriteDefaultWith": "{{project.password}}" - } + "type": "string" }, - "databases": { + "rootUser": { + "type": "string" + }, + "usernames": { "type": "array", "items": { "type": "string" - }, - "description": "default databases", - "default": ["defaultdb"] + } } } }, @@ -454,11 +455,11 @@ }, "tag": { "type": "string", - "default": "0.3.4", + "default": "0.3.5", "enum": [ "latest", "0.3.1", - "0.3.4" + "0.3.5" ] } } From 5f86c2471ec37e2f4a3a226e1f6e650787e7dabb Mon Sep 17 00:00:00 2001 From: PaulineMauryL Date: Wed, 30 Oct 2024 17:11:54 +0000 Subject: [PATCH 3/3] edit auth --- charts/lomas/values.schema.json | 44 +++++++++++++++++++++++---------- 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/charts/lomas/values.schema.json b/charts/lomas/values.schema.json index d9a9366..dfffa84 100644 --- a/charts/lomas/values.schema.json +++ b/charts/lomas/values.schema.json @@ -293,31 +293,49 @@ "type": "object", "description": "Authentification configuration", "properties": { + "enabled": { + "type": "boolean", + "description": "add mongodb to server", + "default": true + }, + "rootUser": { + "type": "string", + "description": "root name", + "default": "root" + }, + "rootPassword": { + "type": "string", + "description": "root password", + "default": "changeme", + "x-onyxia": { + "overwriteDefaultWith": "{{project.password}}" + } + }, "databases": { "type": "array", "items": { "type": "string" - } + }, + "description": "default databases", + "default": ["defaultdb"] }, - "enabled": { - "type": "boolean" - }, - "passwords": { + "usernames": { "type": "array", "items": { "type": "string" - } - }, - "rootPassword": { - "type": "string" + }, + "description": "default usernames", + "default": "user" }, - "rootUser": { - "type": "string" - }, - "usernames": { + "passwords": { "type": "array", "items": { "type": "string" + }, + "description": "default passwords", + "default": "change_me", + "x-onyxia": { + "overwriteDefaultWith": ["{{project.password}}"] } } }