mlflow

InseeFrLab · Jul 23, 2022 · d2c63a9 · d2c63a9
1 parent 6aa1171
commit d2c63a9
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 31 deletions.
diff --git a/charts/mlflow/Chart.yaml b/charts/mlflow/Chart.yaml
@@ -21,7 +21,7 @@ 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: 3.3.0
+version: 3.3.1
 
 # 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

diff --git a/charts/mlflow/templates/deployment.yaml b/charts/mlflow/templates/deployment.yaml
@@ -32,7 +32,7 @@ spec:
           args:
             - --host=0.0.0.0
             - --port=8000
-            - --backend-store-uri=postgresql://{{ .Values.global.postgresql.postgresqlUsername }}:{{ .Values.global.postgresql.postgresqlPassword }}@{{ .Values.postgresql.fullnameOverride }}:5432/{{ .Values.global.postgresql.postgresqlDatabase}}
+            - --backend-store-uri=postgresql://{{ .Values.global.postgresql.auth.username }}:{{ .Values.global.postgresql.auth.password }}@{{ .Values.postgresql.fullnameOverride }}:5432/{{ .Values.global.postgresql.auth.database}}
             - --default-artifact-root={{ .Values.service.directory }}
             - --workers=2
           imagePullPolicy: {{ .Values.service.image.pullPolicy }}

diff --git a/charts/mlflow/values.schema.json b/charts/mlflow/values.schema.json
@@ -199,33 +199,40 @@
           "type": "object",
           "title": "Database",
           "properties": {
-            "postgresqlUsername": {
-              "type": "string",
-              "title": "Admin user",
-              "default": "admin",
-              "x-form": {
-                "value": "{{project.id}}"
-              },
-              "x-onyxia": {
-                "overwriteDefaultWith": "{{project.id}}"
-              }
-            },
-            "postgresqlPassword": {
-              "type": "string",
-              "title": "Password",
-              "default": "changeme",
-              "x-form": {
-                "value": "{{project.password}}"
-              },
-              "x-onyxia": {
-                "overwriteDefaultWith": "{{project.password}}"
+            "auth": {
+              "description": "postgres specific configuration",
+              "type": "object",
+              "title": "Authentification",
+              "properties": {
+                "username": {
+                  "type": "string",
+                  "title": "Admin user",
+                  "default": "admin",
+                  "x-form": {
+                    "value": "{{project.id}}"
+                  },
+                  "x-onyxia": {
+                    "overwriteDefaultWith": "{{project.id}}"
+                  }
+                },
+                "password": {
+                  "type": "string",
+                  "title": "Password",
+                  "default": "changeme",
+                  "x-form": {
+                    "value": "{{project.password}}"
+                  },
+                  "x-onyxia": {
+                    "overwriteDefaultWith": "{{project.password}}"
+                  }
+                },
+                "database": {
+                  "description": "Name for the default database that is created when the image is first started.",
+                  "type": "string",
+                  "title": "Database",
+                  "default": "mlflow"
+                }
               }
-            },
-            "postgresqlDatabase": {
-              "description": "Name for the default database that is created when the image is first started.",
-              "type": "string",
-              "title": "Database",
-              "default": "mlflow"
             }
           }
         }

diff --git a/charts/mlflow/values.yaml b/charts/mlflow/values.yaml
@@ -3,9 +3,10 @@
 # Declare variables to be passed into your templates.
 global:
   postgresql:
-    postgresqlDatabase: "mlflow"
-    postgresqlUser: "admin"
-    postgresqlPassword: "changeme"
+    auth:
+      username: "admin"
+      password: "changeme"
+      database: "mlflow"
 
 replicaCount: 1