From 792125da4464091766aee296b209f8ea13c840b2 Mon Sep 17 00:00:00 2001
From: fcomte <frederic.comte@insee.fr>
Date: Sat, 23 Jul 2022 20:24:38 +0000
Subject: [PATCH] dask from tolereation nodeselector

---
 charts/dask/Chart.yaml         |  4 +--
 charts/dask/values.schema.json | 66 ++++++++++++++++++++++++++++++++++
 charts/dask/values.yaml        |  6 +---
 3 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/charts/dask/Chart.yaml b/charts/dask/Chart.yaml
index 0644b4f1..3516d7ad 100644
--- 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.2.0
+version: 2.3.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
@@ -33,7 +33,7 @@ version: 2.2.0
 appVersion: 1
 dependencies:
   - name: dask
-    version: 2021.11.1
+    version: 2022.6.0
     repository:  https://helm.dask.org/
     enabled: true
   - name: library-chart
diff --git a/charts/dask/values.schema.json b/charts/dask/values.schema.json
index 58071b0d..fc7aaebd 100644
--- a/charts/dask/values.schema.json
+++ b/charts/dask/values.schema.json
@@ -21,6 +21,28 @@
                   "default": "inseefrlab/rapidsai"   
                 }
               }
+            },
+            "tolerations": {
+              "type": "array",
+              "description": "Array of tolerations",
+              "default": [],
+              "x-form": {
+                  "value": "{{region.tolerations}}"
+              },
+              "x-onyxia": {
+                  "overwriteDefaultWith": "region.tolerations"
+              }
+            },
+            "nodeSelector": {
+                "type": "object",
+                "description": "NodeSelector",
+                "default": {},
+                "x-form": {
+                    "value": "{{region.nodeSelector}}"
+                },
+                "x-onyxia": {
+                    "overwriteDefaultWith": "region.nodeSelector"
+                }
             }
           }
         },
@@ -46,6 +68,28 @@
                 }
               }
             },
+            "tolerations": {
+              "type": "array",
+              "description": "Array of tolerations",
+              "default": [],
+              "x-form": {
+                  "value": "{{region.tolerations}}"
+              },
+              "x-onyxia": {
+                  "overwriteDefaultWith": "region.tolerations"
+              }
+            },
+            "nodeSelector": {
+                "type": "object",
+                "description": "NodeSelector",
+                "default": {},
+                "x-form": {
+                    "value": "{{region.nodeSelector}}"
+                },
+                "x-onyxia": {
+                    "overwriteDefaultWith": "region.nodeSelector"
+                }
+            },
             "replicas": {
               "description": "number of worker",
               "type": "integer",
@@ -130,6 +174,28 @@
                 "x-onyxia": {
                     "overwriteDefaultWith": "region.defaultNetworkPolicy"
                 }
+              },
+              "from": {
+                "type": "array",
+                "description": "Array of source allowed to have network access to your service",
+                "default" : [
+                    {
+                      "ipBlock": {
+                        "cidr": "10.233.103.0/32"
+                      }
+                    },
+                    {
+                      "ipBlock": {
+                        "cidr": "10.233.111.0/32"
+                      }
+                    }
+                  ], 
+                "x-form": {
+                    "value": "{{region.from}}"
+                },
+                "x-onyxia": {
+                    "overwriteDefaultWith": "region.from"
+                }
               }
             }
           }
diff --git a/charts/dask/values.yaml b/charts/dask/values.yaml
index f3cfd5c5..c3d5a2a7 100644
--- a/charts/dask/values.yaml
+++ b/charts/dask/values.yaml
@@ -35,11 +35,7 @@ security:
     ip: "0.0.0.0/0" 
   networkPolicy: 
     enabled: true
-    from: 
-    - ipBlock:
-        cidr: 10.233.103.0/32
-    - ipBlock:
-        cidr: 10.233.111.0/32 
+    from: []
 
 ingress:
   enabled: true