no more x-forms (#107)

* no more x-form + reformat * no more x-form * no more x-form
InseeFrLab · Nov 8, 2023 · edcd890 · edcd890
1 parent e5346a6
commit edcd890
Show file tree

Hide file tree

Showing 38 changed files with 1,129 additions and 2,783 deletions.
diff --git a/charts/jupyter-pyspark/Chart.yaml b/charts/jupyter-pyspark/Chart.yaml
@@ -24,7 +24,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.32.21
+version: 1.32.22
 
 dependencies:
   - name: library-chart

diff --git a/charts/jupyter-pyspark/values.schema.json b/charts/jupyter-pyspark/values.schema.json
@@ -14,7 +14,11 @@
               "type": "string",
               "description": "option when pulling the docker image",
               "default": "IfNotPresent",
-              "enum": ["IfNotPresent", "Always", "Never"]
+              "enum": [
+                "IfNotPresent",
+                "Always",
+                "Never"
+              ]
             },
             "version": {
               "description": "supported versions",
@@ -25,7 +29,7 @@
                 "inseefrlab/onyxia-jupyter-pyspark:py3.11.4-spark3.4.1",
                 "inseefrlab/onyxia-jupyter-pyspark:py3.10.12-spark3.4.1",
                 "inseefrlab/trevas-jupyter:0.4.1"
-               ],
+              ],
               "render": "list",
               "hidden": {
                 "value": true,
@@ -210,7 +214,7 @@
               "x-onyxia": {
                 "overwriteDefaultWith": "region.resources.memoryLimit",
                 "useRegionSliderConfig": "memory"
-             }
+              }
             }
           }
         }
@@ -256,9 +260,6 @@
           "description": "Password",
           "default": "changeme",
           "render": "password",
-          "x-form": {
-            "value": "{{project.password}}"
-          },
           "x-onyxia": {
             "overwriteDefaultWith": "{{project.password}}"
           }
@@ -272,9 +273,6 @@
               "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"
               }
@@ -283,9 +281,6 @@
               "type": "string",
               "description": "the white list of IP is whitespace",
               "title": "Whitelist of IP",
-              "x-form": {
-                "value": "{{user.ip}}"
-              },
               "x-onyxia": {
                 "overwriteDefaultWith": "{{user.ip}}"
               },
@@ -305,9 +300,6 @@
               "title": "Enable network policy",
               "description": "Only pod from the same namespace will be allowed",
               "default": true,
-              "x-form": {
-                "value": "{{region.defaultNetworkPolicy}}"
-              },
               "x-onyxia": {
                 "overwriteDefaultWith": "region.defaultNetworkPolicy"
               }
@@ -316,10 +308,6 @@
               "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"
@@ -346,7 +334,11 @@
             "value": false,
             "path": "kubernetes/enabled"
           },
-          "enum": ["view", "edit", "admin"]
+          "enum": [
+            "view",
+            "edit",
+            "admin"
+          ]
         }
       }
     },
@@ -363,9 +355,6 @@
           "type": "string",
           "description": "user name for git",
           "default": "",
-          "x-form": {
-            "value": "{{git.name}}"
-          },
           "x-onyxia": {
             "overwriteDefaultWith": "{{git.name}}"
           },
@@ -378,9 +367,6 @@
           "type": "string",
           "description": "user email for git",
           "default": "",
-          "x-form": {
-            "value": "{{git.email}}"
-          },
           "x-onyxia": {
             "overwriteDefaultWith": "{{git.email}}"
           },
@@ -393,9 +379,6 @@
           "type": "string",
           "description": "duration in seconds of the credentials cache duration",
           "default": "",
-          "x-form": {
-            "value": "{{git.credentials_cache_duration}}"
-          },
           "x-onyxia": {
             "overwriteDefaultWith": "{{git.credentials_cache_duration}}"
           },
@@ -409,9 +392,6 @@
           "description": "personal access token",
           "default": "",
           "render": "password",
-          "x-form": {
-            "value": "{{git.token}}"
-          },
           "x-onyxia": {
             "overwriteDefaultWith": "{{git.token}}"
           },
@@ -424,9 +404,6 @@
           "type": "string",
           "description": "Repository url",
           "default": "",
-          "x-form": {
-            "value": "{{git.project}}"
-          },
           "x-onyxia": {
             "overwriteDefaultWith": "{{git.project}}"
           },
@@ -459,9 +436,6 @@
           "description": "token vault",
           "type": "string",
           "render": "password",
-          "x-form": {
-            "value": "{{vault.VAULT_TOKEN}}"
-          },
           "x-onyxia": {
             "overwriteDefaultWith": "{{vault.VAULT_TOKEN}}"
           },
@@ -473,9 +447,6 @@
         "url": {
           "description": "url of vault server",
           "type": "string",
-          "x-form": {
-            "value": "{{vault.VAULT_ADDR}}"
-          },
           "x-onyxia": {
             "overwriteDefaultWith": "{{vault.VAULT_ADDR}}"
           },
@@ -487,9 +458,6 @@
         "mount": {
           "description": "mount of the v2 secret engine",
           "type": "string",
-          "x-form": {
-            "value": "{{vault.VAULT_MOUNT}}"
-          },
           "x-onyxia": {
             "overwriteDefaultWith": "{{vault.VAULT_MOUNT}}"
           },
@@ -501,9 +469,6 @@
         "directory": {
           "description": "top level directory",
           "type": "string",
-          "x-form": {
-            "value": "{{vault.VAULT_TOP_DIR}}"
-          },
           "x-onyxia": {
             "overwriteDefaultWith": "{{vault.VAULT_TOP_DIR}}"
           },
@@ -535,9 +500,6 @@
         "accessKeyId": {
           "description": "AWS Access Key",
           "type": "string",
-          "x-form": {
-            "value": "{{s3.AWS_ACCESS_KEY_ID}}"
-          },
           "x-onyxia": {
             "overwriteDefaultWith": "{{s3.AWS_ACCESS_KEY_ID}}"
           },
@@ -549,9 +511,6 @@
         "endpoint": {
           "description": "AWS S3 Endpoint",
           "type": "string",
-          "x-form": {
-            "value": "{{s3.AWS_S3_ENDPOINT}}"
-          },
           "x-onyxia": {
             "overwriteDefaultWith": "{{s3.AWS_S3_ENDPOINT}}"
           },
@@ -563,9 +522,6 @@
         "defaultRegion": {
           "description": "AWS S3 default region",
           "type": "string",
-          "x-form": {
-            "value": "{{s3.AWS_DEFAULT_REGION}}"
-          },
           "x-onyxia": {
             "overwriteDefaultWith": "{{s3.AWS_DEFAULT_REGION}}"
           },
@@ -578,9 +534,6 @@
           "description": "AWS S3 secret access key",
           "type": "string",
           "render": "password",
-          "x-form": {
-            "value": "{{s3.AWS_SECRET_ACCESS_KEY}}"
-          },
           "x-onyxia": {
             "overwriteDefaultWith": "{{s3.AWS_SECRET_ACCESS_KEY}}"
           },
@@ -593,9 +546,6 @@
           "description": "AWS S3 session Token",
           "type": "string",
           "render": "password",
-          "x-form": {
-            "value": "{{s3.AWS_SESSION_TOKEN}}"
-          },
           "x-onyxia": {
             "overwriteDefaultWith": "{{s3.AWS_SESSION_TOKEN}}"
           },
@@ -624,10 +574,6 @@
           "type": "string",
           "form": true,
           "title": "Hostname",
-          "x-form": {
-            "hidden": true,
-            "value": "{{project.id}}-{{k8s.randomSubdomain}}-0.{{k8s.domain}}"
-          },
           "x-onyxia": {
             "hidden": true,
             "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-0.{{k8s.domain}}"
@@ -637,10 +583,6 @@
           "type": "string",
           "form": true,
           "title": "Hostname",
-          "x-form": {
-            "hidden": true,
-            "value": "{{project.id}}-{{k8s.randomSubdomain}}-spark.{{k8s.domain}}"
-          },
           "x-onyxia": {
             "hidden": true,
             "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-spark.{{k8s.domain}}"
@@ -650,10 +592,6 @@
           "type": "string",
           "form": true,
           "title": "Hostname",
-          "x-form": {
-            "hidden": true,
-            "value": "{{project.id}}-{{k8s.randomSubdomain}}-user.{{k8s.domain}}"
-          },
           "x-onyxia": {
             "hidden": true,
             "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-user.{{k8s.domain}}"
@@ -664,10 +602,6 @@
           "form": true,
           "title": "ingressClassName",
           "default": "",
-          "x-form": {
-            "hidden": true,
-            "value": "{{k8s.ingressClassName}}"
-          },
           "x-onyxia": {
             "hidden": true,
             "overwriteDefaultWith": "{{k8s.ingressClassName}}"
@@ -702,10 +636,6 @@
           "type": "string",
           "form": true,
           "title": "Hostname",
-          "x-form": {
-            "hidden": true,
-            "value": "{{project.id}}-{{k8s.randomSubdomain}}-spark.{{k8s.domain}}"
-          },
           "x-onyxia": {
             "hidden": true,
             "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-spark.{{k8s.domain}}"
@@ -759,10 +689,6 @@
           "type": "string",
           "description": "region initialization script",
           "default": "",
-          "x-form": {
-            "hidden": true,
-            "value": "{{k8s.initScriptUrl}}"
-          },
           "x-onyxia": {
             "hidden": true,
             "overwriteDefaultWith": "{{k8s.initScriptUrl}}"
@@ -841,52 +767,40 @@
       "type": "object",
       "description": "Start up probe",
       "default": {},
-      "x-form": {
-          "hidden": true,
-          "value": "{{region.startupProbe}}"
-      },
       "x-onyxia": {
-          "hidden": true,
-          "overwriteDefaultWith": "region.startupProbe"
+        "hidden": true,
+        "overwriteDefaultWith": "region.startupProbe"
       }
     },
     "tolerations": {
       "type": "array",
       "description": "Array of tolerations",
       "default": [],
-      "x-form": {
-          "hidden": true,
-          "value": "{{region.tolerations}}"
-      },
       "x-onyxia": {
-          "hidden": true,
-          "overwriteDefaultWith": "region.tolerations"
+        "hidden": true,
+        "overwriteDefaultWith": "region.tolerations"
       }
     },
     "nodeSelector": {
       "type": "object",
       "description": "NodeSelector",
       "default": {},
-      "x-form": {
-          "hidden": true,
-          "value": "{{region.nodeSelector}}"
-      },
       "x-onyxia": {
-          "hidden": true,
-          "overwriteDefaultWith": "region.nodeSelector"
+        "hidden": true,
+        "overwriteDefaultWith": "region.nodeSelector"
       }
     },
-    "userPreferences":{
+    "userPreferences": {
       "description": "User Preferences",
       "type": "object",
       "properties": {
         "darkMode": {
           "type": "boolean",
           "description": "dark mode is or is not enabled",
           "default": false,
-        "x-onyxia": {
-          "hidden": true,
-          "overwriteDefaultWith": "user.darkMode"
+          "x-onyxia": {
+            "hidden": true,
+            "overwriteDefaultWith": "user.darkMode"
           }
         },
         "language": {
@@ -901,4 +815,4 @@
       }
     }
   }
-}
+}
diff --git a/charts/jupyter-python-gpu/Chart.yaml b/charts/jupyter-python-gpu/Chart.yaml
@@ -11,7 +11,7 @@ sources:
 - https://github.com/InseeFrLab/images-datascience
 - https://github.com/InseeFrLab/helm-charts-interactive-services
 type: application
-version: 1.13.15
+version: 1.13.16
 dependencies:
 - name: library-chart
   version: 1.5.15