x-onyxia dask

InseeFrLab · Jul 11, 2022 · 63c93f5 · 63c93f5
1 parent 3c40f22
commit 63c93f5
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 28 deletions.
diff --git a/charts/dask/Chart.yaml b/charts/dask/Chart.yaml
@@ -25,7 +25,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: 2.1.0
+version: 2.2.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

diff --git a/charts/dask/values.schema.json b/charts/dask/values.schema.json
@@ -81,33 +81,40 @@
       "description": "security specific configuration",
       "type": "object",
       "properties": {
-          "allowlist": {
-              "type": "object",
-              "description": "IP protection",
-              "properties": {
-                "enabled": {
-                  "type": "boolean",
-                  "title": "Enable IP protection",
-                  "description": "Only the configured set of IPs will be able to reach the service",
-                  "default": true,
-                  "x-form": {
-                    "value": "{{region.defaultIpProtection}}"
-                  }
-                },
-                "ip": {
-                  "type": "string",
-                  "description": "the allow list of IP is whitespace",
-                  "title": "Allowed IP",
-                  "x-form": {
-                    "value": "{{user.ip}}"
-                  },
-                  "hidden": {
-                      "value": false,
-                      "path": "security/allowlist/enabled"
-                  } 
-                }
+        "allowlist": {
+          "type": "object",
+          "description": "IP protection",
+          "properties": {
+            "enabled": {
+              "type": "boolean",
+              "title": "Enable IP protection",
+              "description": "Only the configured set of IPs will be able to reach the service",
+              "default": true,
+              "x-form": {
+                "value": "{{region.defaultIpProtection}}"
+              },
+              "x-onyxia": {
+                  "overwriteDefaultWith": "region.defaultIpProtection"
               }
-          },
+            },
+            "ip": {
+              "type": "string",
+              "description": "the allow list of IP is whitespace",
+              "title": "Allowed IP",
+              "default": "0.0.0.0/0",
+              "x-form": {
+                "value": "{{user.ip}}"
+              },
+              "x-onyxia": {
+                "overwriteDefaultWith": "{{user.ip}}"
+              },
+              "hidden": {
+                "value": false,
+                "path": "security/allowlist/enabled"
+              }
+            }
+          }
+      },
           "networkPolicy": {
             "type": "object",
             "description": "Define access policy to the service",
@@ -119,6 +126,9 @@
                 "default": true,
                 "x-form": {
                   "value": "{{region.defaultNetworkPolicy}}"
+                },
+                "x-onyxia": {
+                    "overwriteDefaultWith": "region.defaultNetworkPolicy"
                 }
               }
             }
@@ -137,7 +147,11 @@
             "x-form": {
               "hidden": true,
               "value": "{{project.id}}-{{k8s.randomSubdomain}}.{{k8s.domain}}"
-          }
+            },
+            "x-onyxia": {
+                "hidden": true,
+                "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}.{{k8s.domain}}"
+            }
         }
       }
     }