jupyter-r ingressclassname

charts/jupyter-r/Chart.yaml

@@ -23,7 +23,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: 1.0.2
+version: 1.0.3
 
 # 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
@@ -32,5 +32,5 @@ appVersion: latest
 
 dependencies:
   - name: library-chart
-    version: 1.0.0
+    version: 1.0.3
     repository: https://inseefrlab.github.io/helm-charts-datascience-internal

charts/jupyter-r/values.schema.json

@@ -219,6 +219,19 @@
                         "x-onyxia": {
                             "overwriteDefaultWith": "region.defaultNetworkPolicy"
                         }
+                      },
+                      "from": {
+                        "type": "array",
+                        "description": "Array of source allowed to have network access to your service",
+                        "default" : [], 
+                        "x-form": {
+                          "hidden": true,
+                          "value": "{{region.from}}"
+                        },
+                        "x-onyxia": {
+                            "hidden": true,
+                            "overwriteDefaultWith": "region.from"
+                        }
                       }
                     }
                 }
@@ -531,6 +544,20 @@
                       "hidden": true,
                       "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-user.{{k8s.domain}}"
                   }
+                },
+                "ingressClassName": {
+                    "type": "string",
+                    "form": true,
+                    "title": "ingressClassName",
+                    "default": "",
+                    "x-form": {
+                        "hidden": true,
+                        "value": "{{k8s.ingressClassName}}"
+                    },
+                    "x-onyxia": {
+                        "hidden": true,
+                        "overwriteDefaultWith": "{{k8s.ingressClassName}}"
+                    }
                 }
             }
         },

charts/jupyter-r/values.yaml

@@ -12,11 +12,7 @@ security:
   password: "changeme"
   networkPolicy: 
     enabled: false
-    from: 
-    - ipBlock:
-        cidr: 10.233.103.0/32
-    - ipBlock:
-        cidr: 10.233.111.0/32
+    from: []
   allowlist:
     enabled: true
     ip: "0.0.0.0/0"
@@ -117,8 +113,8 @@ networking:
 ingress:
   enabled: true
   tls: true
-  annotations:
-    kubernetes.io/ingress.class: nginx
+  ingressClassName: ""  
+  annotations: []
     # kubernetes.io/tls-acme: "true"
   hostname: chart-example.local
   userHostname: chart-example-user.local