Merge pull request #11 from dscc-admin-ch/fix-fso-lomas

Fix fso lomas
InseeFrLab · Apr 30, 2024 · 43abb0c · 43abb0c
2 parents 24fd282 + da0fd88
commit 43abb0c
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 13 deletions.
diff --git a/charts/lomas/Chart.yaml b/charts/lomas/Chart.yaml
@@ -15,7 +15,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: 0.0.6
+version: 0.0.7
 
 # 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/lomas/values.schema.json b/charts/lomas/values.schema.json
@@ -24,13 +24,15 @@
                             "type": "string",
                             "enum": [
                                 "dsccadminch/lomas_server"
-                            ]
+                            ],
+                            "default": "dsccadminch/lomas_server"
                         },
                         "tag": {
                             "type": "string",
                             "enum": [
                                 "latest"
-                            ]
+                            ],
+                            "default": "latest"
                         }
                     }
                 },
@@ -39,15 +41,38 @@
                     "form": true,
                     "title": "Ingress Details",
                     "properties": {
-                        "hostname": {
-                            "type": "string",
-                            "form": true,
-                            "title": "Hostname",
-                            "x-form": {
-                                "value": "{{project.id}}-{{k8s.randomSubdomain}}-{{k8s.domain}}"
-                            },
-                            "x-onyxia": {
-                                "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-{{k8s.domain}}"
+                        "hosts": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "host": {
+                                        "type": "string",
+                                        "title": "Hostname",
+                                        "x-form": {
+                                            "value": "{{project.id}}-{{k8s.randomSubdomain}}-{{k8s.domain}}"
+                                        },
+                                        "x-onyxia": {
+                                            "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-{{k8s.domain}}"
+                                        }
+                                    },
+                                    "paths": {
+                                        "type": "array",
+                                        "items": {
+                                            "type": "object",
+                                            "properties": {
+                                                "path": {
+                                                    "type": "string",
+                                                    "default": "/"
+                                                },
+                                                "pathType": {
+                                                    "type": "string",
+                                                    "default": "Prefix"
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
                             }
                         },
                         "ingressClassName": {
@@ -71,6 +96,12 @@
                                     "type": "array",
                                     "items": {
                                         "type": "string"
+                                    },
+                                    "x-form": {
+                                        "value": "{{project.id}}-{{k8s.randomSubdomain}}-{{k8s.domain}}"
+                                    },
+                                    "x-onyxia": {
+                                        "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-{{k8s.domain}}"
                                     }
                                 }
                             }
@@ -123,7 +154,9 @@
                                         "type": "string"
                                     },
                                     "description": "default databases",
-                                    "default": ["defaultdb"]
+                                    "default": [
+                                        "defaultdb"
+                                    ]
                                 }
                             }
                         },