Merge pull request #27 from PaulineMauryL/fix_0.3.5

Remove LRU and fix version
InseeFrLab · Oct 30, 2024 · 37bfb15 · 37bfb15
2 parents 50b3e1e + 5f86c24
commit 37bfb15
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 30 deletions.
diff --git a/charts/lomas/Chart.yaml b/charts/lomas/Chart.yaml
@@ -16,15 +16,15 @@ 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
-    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
@@ -45,6 +45,7 @@
                                     "default": "0.3.5",
                                     "enum": [
                                         "latest",
+                                        "0.3.1",
                                         "0.3.5"
                                     ]
                                 }
@@ -270,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": {
@@ -317,6 +318,25 @@
                                     },
                                     "description": "default databases",
                                     "default": ["defaultdb"]
+                                },
+                                "usernames": {
+                                    "type": "array",
+                                    "items": {
+                                        "type": "string"
+                                    },
+                                    "description": "default usernames",
+                                    "default": "user"
+                                },
+                                "passwords": {
+                                    "type": "array",
+                                    "items": {
+                                        "type": "string"
+                                    },
+                                    "description": "default passwords",
+                                    "default": "change_me",
+                                    "x-onyxia": {
+                                        "overwriteDefaultWith": ["{{project.password}}"]
+                                    }
                                 }
                             }
                         },
@@ -456,6 +476,7 @@
                                     "default": "0.3.5",
                                     "enum": [
                                         "latest",
+                                        "0.3.1",
                                         "0.3.5"
                                     ]
                                 }
@@ -602,26 +623,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 +724,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
@@ -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