diff --git a/charts/jupyter-pyspark/Chart.yaml b/charts/jupyter-pyspark/Chart.yaml index c874b524..d94dc59d 100644 --- 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.33.22 +version: 1.33.23 dependencies: - name: library-chart diff --git a/charts/jupyter-pyspark/values.schema.json b/charts/jupyter-pyspark/values.schema.json index e2256e20..5bc40c3d 100644 --- a/charts/jupyter-pyspark/values.schema.json +++ b/charts/jupyter-pyspark/values.schema.json @@ -103,30 +103,6 @@ } } }, - "discovery": { - "description": "configure your service to autodetect some ressources.", - "type": "object", - "properties": { - "hive": { - "type": "boolean", - "title": "Enable hive metastore discovery", - "description": "discover your hive metastore service", - "default": true - }, - "mlflow": { - "type": "boolean", - "title": "Enable mlflow discovery", - "description": "discover your mlflow service", - "default": true - }, - "metaflow": { - "type": "boolean", - "title": "Enable metaflow discovery", - "description": "discover your metaflow service", - "default": true - } - } - }, "resources": { "description": "Your service will have at least the requested resources and never more than its limits. No limit for a resource and you can consume everything left on the host machine.", "type": "object", @@ -248,69 +224,28 @@ } } }, - "security": { - "description": "security specific configuration", + "init": { + "description": "Init parameters", "type": "object", "properties": { - "password": { + "regionInit": { "type": "string", - "description": "Password", - "default": "changeme", - "render": "password", + "description": "region initialization script", + "default": "", "x-onyxia": { - "overwriteDefaultWith": "{{service.oneTimePassword}}" + "hidden": true, + "overwriteDefaultWith": "{{k8s.initScriptUrl}}" } }, - "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-onyxia": { - "overwriteDefaultWith": "region.defaultIpProtection" - } - }, - "ip": { - "type": "string", - "description": "the white list of IP is whitespace", - "title": "Whitelist of IP", - "x-onyxia": { - "overwriteDefaultWith": "{{user.ip}}" - }, - "hidden": { - "value": false, - "path": "security/allowlist/enabled" - } - } - } + "personalInit": { + "type": "string", + "description": "user initialization script", + "default": "" }, - "networkPolicy": { - "type": "object", - "description": "Define access policy to the service", - "properties": { - "enabled": { - "type": "boolean", - "title": "Enable network policy", - "description": "Only pod from the same namespace will be allowed", - "default": true, - "x-onyxia": { - "overwriteDefaultWith": "region.defaultNetworkPolicy" - } - }, - "from": { - "type": "array", - "description": "Array of source allowed to have network access to your service", - "default": [], - "x-onyxia": { - "hidden": true, - "overwriteDefaultWith": "region.from" - } - } - } + "personalInitArgs": { + "type": "string", + "description": "args for user initialization script", + "default": "" } } }, @@ -339,87 +274,6 @@ } } }, - "git": { - "description": "Git user configuration", - "type": "object", - "properties": { - "enabled": { - "type": "boolean", - "description": "Add git config inside your environment", - "default": true - }, - "name": { - "type": "string", - "description": "user name for git", - "default": "", - "x-onyxia": { - "overwriteDefaultWith": "{{git.name}}" - }, - "hidden": { - "value": false, - "path": "git/enabled" - } - }, - "email": { - "type": "string", - "description": "user email for git", - "default": "", - "x-onyxia": { - "overwriteDefaultWith": "{{git.email}}" - }, - "hidden": { - "value": false, - "path": "git/enabled" - } - }, - "cache": { - "type": "string", - "description": "duration in seconds of the credentials cache duration", - "default": "", - "x-onyxia": { - "overwriteDefaultWith": "{{git.credentials_cache_duration}}" - }, - "hidden": { - "value": false, - "path": "git/enabled" - } - }, - "token": { - "type": "string", - "description": "personal access token", - "default": "", - "render": "password", - "x-onyxia": { - "overwriteDefaultWith": "{{git.token}}" - }, - "hidden": { - "value": false, - "path": "git/enabled" - } - }, - "repository": { - "type": "string", - "description": "Repository url", - "default": "", - "x-onyxia": { - "overwriteDefaultWith": "{{git.project}}" - }, - "hidden": { - "value": false, - "path": "git/enabled" - } - }, - "branch": { - "type": "string", - "description": "Branch automatically checked out", - "default": "", - "hidden": { - "value": "", - "path": "git/repository" - } - } - } - }, "vault": { "description": "Configuration of vault client", "type": "object", @@ -553,6 +407,215 @@ } } }, + "git": { + "description": "Git user configuration", + "type": "object", + "properties": { + "enabled": { + "type": "boolean", + "description": "Add git config inside your environment", + "default": true + }, + "name": { + "type": "string", + "description": "user name for git", + "default": "", + "x-onyxia": { + "overwriteDefaultWith": "{{git.name}}" + }, + "hidden": { + "value": false, + "path": "git/enabled" + } + }, + "email": { + "type": "string", + "description": "user email for git", + "default": "", + "x-onyxia": { + "overwriteDefaultWith": "{{git.email}}" + }, + "hidden": { + "value": false, + "path": "git/enabled" + } + }, + "cache": { + "type": "string", + "description": "duration in seconds of the credentials cache duration", + "default": "", + "x-onyxia": { + "overwriteDefaultWith": "{{git.credentials_cache_duration}}" + }, + "hidden": { + "value": false, + "path": "git/enabled" + } + }, + "token": { + "type": "string", + "description": "personal access token", + "default": "", + "render": "password", + "x-onyxia": { + "overwriteDefaultWith": "{{git.token}}" + }, + "hidden": { + "value": false, + "path": "git/enabled" + } + }, + "repository": { + "type": "string", + "description": "Repository url", + "default": "", + "x-onyxia": { + "overwriteDefaultWith": "{{git.project}}" + }, + "hidden": { + "value": false, + "path": "git/enabled" + } + }, + "branch": { + "type": "string", + "description": "Branch automatically checked out", + "default": "", + "hidden": { + "value": "", + "path": "git/repository" + } + } + } + }, + "networking": { + "type": "object", + "form": true, + "title": "Networking detail", + "properties": { + "user": { + "type": "object", + "description": "user defined port", + "properties": { + "enabled": { + "type": "boolean", + "title": "Enable a custom service port", + "description": "Enable a custom service port", + "default": false + }, + "port": { + "type": "integer", + "description": "port of the custom service", + "title": "Custom service port", + "hidden": { + "value": false, + "path": "networking/user/enabled" + }, + "default": 5000 + } + } + } + } + }, + "discovery": { + "description": "configure your service to autodetect some ressources.", + "type": "object", + "properties": { + "hive": { + "type": "boolean", + "title": "Enable hive metastore discovery", + "description": "discover your hive metastore service", + "default": true + }, + "mlflow": { + "type": "boolean", + "title": "Enable mlflow discovery", + "description": "discover your mlflow service", + "default": true + }, + "metaflow": { + "type": "boolean", + "title": "Enable metaflow discovery", + "description": "discover your metaflow service", + "default": true + } + } + }, + "security": { + "description": "security specific configuration", + "type": "object", + "properties": { + "password": { + "type": "string", + "description": "Password", + "default": "changeme", + "render": "password", + "x-onyxia": { + "overwriteDefaultWith": "{{service.oneTimePassword}}" + } + }, + "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-onyxia": { + "overwriteDefaultWith": "region.defaultIpProtection" + } + }, + "ip": { + "type": "string", + "description": "the white list of IP is whitespace", + "title": "Whitelist of IP", + "x-onyxia": { + "overwriteDefaultWith": "{{user.ip}}" + }, + "hidden": { + "value": false, + "path": "security/allowlist/enabled" + } + } + } + }, + "networkPolicy": { + "type": "object", + "description": "Define access policy to the service", + "properties": { + "enabled": { + "type": "boolean", + "title": "Enable network policy", + "description": "Only pod from the same namespace will be allowed", + "default": true, + "x-onyxia": { + "overwriteDefaultWith": "region.defaultNetworkPolicy" + } + }, + "from": { + "type": "array", + "description": "Array of source allowed to have network access to your service", + "default": [], + "x-onyxia": { + "hidden": true, + "overwriteDefaultWith": "region.from" + } + } + } + } + } + }, + "nodeSelector": { + "type": "object", + "description": "NodeSelector", + "default": {}, + "x-onyxia": { + "hidden": true, + "overwriteDefaultWith": "region.nodeSelector" + } + }, "ingress": { "type": "object", "form": true, @@ -613,7 +676,7 @@ "overwriteDefaultWith": "k8s.useCertManager" } }, - "certManagerClusterIssuer":{ + "certManagerClusterIssuer": { "type": "string", "description": "certManager cluster issuer", "title": "CertManager Cluster Issuer", @@ -668,80 +731,40 @@ } } }, - "networking": { - "type": "object", - "form": true, - "title": "Networking detail", - "properties": { - "user": { - "type": "object", - "description": "user defined port", - "properties": { - "enabled": { - "type": "boolean", - "title": "Enable a custom service port", - "description": "Enable a custom service port", - "default": false - }, - "port": { - "type": "integer", - "description": "port of the custom service", - "title": "Custom service port", - "hidden": { - "value": false, - "path": "networking/user/enabled" - }, - "default": 5000 - } - } - } - } - }, - "init": { - "description": "Init parameters", + "userPreferences": { + "description": "User Preferences", "type": "object", "properties": { - "regionInit": { - "type": "string", - "description": "region initialization script", - "default": "", + "darkMode": { + "type": "boolean", + "description": "dark mode is or is not enabled", + "default": false, "x-onyxia": { "hidden": true, - "overwriteDefaultWith": "{{k8s.initScriptUrl}}" + "overwriteDefaultWith": "user.darkMode" } }, - "personalInit": { - "type": "string", - "description": "user initialization script", - "default": "" - }, - "personalInitArgs": { + "language": { "type": "string", - "description": "args for user initialization script", - "default": "" + "description": "Preferred language", + "default": "en", + "x-onyxia": { + "hidden": true, + "overwriteDefaultWith": "user.lang" + } } } }, - "repository": { - "description": "python repositories for pip and conda", + "global": { + "description": "Suspend", "type": "object", "properties": { - "pipRepository": { - "type": "string", - "description": "python repository for pip", - "default": "", - "x-onyxia": { - "hidden": true, - "overwriteDefaultWith": "{{packageRepositoryInjection.pypiProxyUrl}}" - } - }, - "condaRepository": { - "type": "string", - "description": "python repository for pip", - "default": "", + "suspend": { + "type": "boolean", + "description": "Suspend this service", + "default": false, "x-onyxia": { - "hidden": true, - "overwriteDefaultWith": "{{packageRepositoryInjection.condaProxyUrl}}" + "hidden": true } } } @@ -797,49 +820,26 @@ "overwriteDefaultWith": "region.tolerations" } }, - "nodeSelector": { - "type": "object", - "description": "NodeSelector", - "default": {}, - "x-onyxia": { - "hidden": true, - "overwriteDefaultWith": "region.nodeSelector" - } - }, - "userPreferences": { - "description": "User Preferences", + "repository": { + "description": "python repositories for pip and conda", "type": "object", "properties": { - "darkMode": { - "type": "boolean", - "description": "dark mode is or is not enabled", - "default": false, + "pipRepository": { + "type": "string", + "description": "python repository for pip", + "default": "", "x-onyxia": { "hidden": true, - "overwriteDefaultWith": "user.darkMode" + "overwriteDefaultWith": "{{packageRepositoryInjection.pypiProxyUrl}}" } }, - "language": { + "condaRepository": { "type": "string", - "description": "Preferred language", - "default": "en", + "description": "python repository for pip", + "default": "", "x-onyxia": { "hidden": true, - "overwriteDefaultWith": "user.lang" - } - } - } - }, - "global": { - "description": "Suspend", - "type": "object", - "properties": { - "suspend": { - "type": "boolean", - "description": "Suspend this service", - "default": false, - "x-onyxia": { - "hidden": true + "overwriteDefaultWith": "{{packageRepositoryInjection.condaProxyUrl}}" } } } diff --git a/charts/jupyter-python/Chart.yaml b/charts/jupyter-python/Chart.yaml index dfe39e66..a03d9d7b 100644 --- a/charts/jupyter-python/Chart.yaml +++ b/charts/jupyter-python/Chart.yaml @@ -23,7 +23,7 @@ type: application # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.13.43 +version: 1.13.44 dependencies: - name: library-chart diff --git a/charts/jupyter-python/values.schema.json b/charts/jupyter-python/values.schema.json index ec7e08f2..e78e6789 100644 --- a/charts/jupyter-python/values.schema.json +++ b/charts/jupyter-python/values.schema.json @@ -59,30 +59,6 @@ } } }, - "discovery": { - "description": "configure your service to autodetect some ressources.", - "type": "object", - "properties": { - "hive": { - "type": "boolean", - "title": "Enable hive metastore discovery", - "description": "discover your hive metastore service", - "default": true - }, - "mlflow": { - "type": "boolean", - "title": "Enable mlflow discovery", - "description": "discover your mlflow service", - "default": true - }, - "metaflow": { - "type": "boolean", - "title": "Enable metaflow discovery", - "description": "discover your metaflow service", - "default": true - } - } - }, "resources": { "description": "Your service will have at least the requested resources and never more than its limits. No limit for a resource and you can consume everything left on the host machine.", "type": "object", @@ -204,69 +180,28 @@ } } }, - "security": { - "description": "security specific configuration", + "init": { + "description": "Init parameters", "type": "object", "properties": { - "password": { + "regionInit": { "type": "string", - "description": "Password", - "default": "changeme", - "render": "password", + "description": "region initialization script", + "default": "", "x-onyxia": { - "overwriteDefaultWith": "{{service.oneTimePassword}}" + "hidden": true, + "overwriteDefaultWith": "{{k8s.initScriptUrl}}" } }, - "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-onyxia": { - "overwriteDefaultWith": "region.defaultIpProtection" - } - }, - "ip": { - "type": "string", - "description": "the white list of IP is whitespace", - "title": "Whitelist of IP", - "x-onyxia": { - "overwriteDefaultWith": "{{user.ip}}" - }, - "hidden": { - "value": false, - "path": "security/allowlist/enabled" - } - } - } + "personalInit": { + "type": "string", + "description": "user initialization script", + "default": "" }, - "networkPolicy": { - "type": "object", - "description": "Define access policy to the service", - "properties": { - "enabled": { - "type": "boolean", - "title": "Enable network policy", - "description": "Only pod from the same namespace will be allowed", - "default": true, - "x-onyxia": { - "overwriteDefaultWith": "region.defaultNetworkPolicy" - } - }, - "from": { - "type": "array", - "description": "Array of source allowed to have network access to your service", - "default": [], - "x-onyxia": { - "hidden": true, - "overwriteDefaultWith": "region.from" - } - } - } + "personalInitArgs": { + "type": "string", + "description": "args for user initialization script", + "default": "" } } }, @@ -295,111 +230,6 @@ } } }, - "openshiftSCC": { - "description": "configuration for openshift compatibility", - "type": "object", - "properties": { - "enabled": { - "description": "enable rolebinding with openshift scc", - "type": "boolean", - "default": false, - "x-onyxia": { - "hidden": true, - "overwriteDefaultWith": "region.openshiftSCC.enabled" - } - }, - "scc": { - "type": "string", - "description": "name of scc for rolebinding", - "default": "anyuid", - "x-onyxia": { - "hidden": true, - "overwriteDefaultWith": "region.openshiftSCC.scc" - } - } - } - }, - "git": { - "description": "Git user configuration", - "type": "object", - "properties": { - "enabled": { - "type": "boolean", - "description": "Add git config inside your environment", - "default": true - }, - "name": { - "type": "string", - "description": "user name for git", - "default": "", - "x-onyxia": { - "overwriteDefaultWith": "{{git.name}}" - }, - "hidden": { - "value": false, - "path": "git/enabled" - } - }, - "email": { - "type": "string", - "description": "user email for git", - "default": "", - "x-onyxia": { - "overwriteDefaultWith": "{{git.email}}" - }, - "hidden": { - "value": false, - "path": "git/enabled" - } - }, - "cache": { - "type": "string", - "description": "duration in seconds of the credentials cache duration", - "default": "", - "x-onyxia": { - "overwriteDefaultWith": "{{git.credentials_cache_duration}}" - }, - "hidden": { - "value": false, - "path": "git/enabled" - } - }, - "token": { - "type": "string", - "description": "personal access token", - "default": "", - "render": "password", - "x-onyxia": { - "overwriteDefaultWith": "{{git.token}}" - }, - "hidden": { - "value": false, - "path": "git/enabled" - } - }, - "repository": { - "type": "string", - "description": "Repository url", - "default": "", - "x-onyxia": { - "overwriteDefaultWith": "{{git.project}}" - }, - "hidden": { - "value": false, - "path": "git/enabled" - } - }, - "branch": { - "type": "string", - "description": "Branch automatically checked out", - "default": "", - "hidden": { - "value": "", - "path": "git/repository" - } - } - } - }, "vault": { "description": "Configuration of vault client", "type": "object", @@ -533,6 +363,239 @@ } } }, + "git": { + "description": "Git user configuration", + "type": "object", + "properties": { + "enabled": { + "type": "boolean", + "description": "Add git config inside your environment", + "default": true + }, + "name": { + "type": "string", + "description": "user name for git", + "default": "", + "x-onyxia": { + "overwriteDefaultWith": "{{git.name}}" + }, + "hidden": { + "value": false, + "path": "git/enabled" + } + }, + "email": { + "type": "string", + "description": "user email for git", + "default": "", + "x-onyxia": { + "overwriteDefaultWith": "{{git.email}}" + }, + "hidden": { + "value": false, + "path": "git/enabled" + } + }, + "cache": { + "type": "string", + "description": "duration in seconds of the credentials cache duration", + "default": "", + "x-onyxia": { + "overwriteDefaultWith": "{{git.credentials_cache_duration}}" + }, + "hidden": { + "value": false, + "path": "git/enabled" + } + }, + "token": { + "type": "string", + "description": "personal access token", + "default": "", + "render": "password", + "x-onyxia": { + "overwriteDefaultWith": "{{git.token}}" + }, + "hidden": { + "value": false, + "path": "git/enabled" + } + }, + "repository": { + "type": "string", + "description": "Repository url", + "default": "", + "x-onyxia": { + "overwriteDefaultWith": "{{git.project}}" + }, + "hidden": { + "value": false, + "path": "git/enabled" + } + }, + "branch": { + "type": "string", + "description": "Branch automatically checked out", + "default": "", + "hidden": { + "value": "", + "path": "git/repository" + } + } + } + }, + "networking": { + "type": "object", + "form": true, + "title": "Networking detail", + "properties": { + "user": { + "type": "object", + "description": "user defined port", + "properties": { + "enabled": { + "type": "boolean", + "title": "Enable a custom service port", + "description": "Enable a custom service port", + "default": false + }, + "port": { + "type": "integer", + "description": "port of the custom service", + "title": "Custom service port", + "hidden": { + "value": false, + "path": "networking/user/enabled" + }, + "default": 5000 + } + } + } + } + }, + "discovery": { + "description": "configure your service to autodetect some ressources.", + "type": "object", + "properties": { + "hive": { + "type": "boolean", + "title": "Enable hive metastore discovery", + "description": "discover your hive metastore service", + "default": true + }, + "mlflow": { + "type": "boolean", + "title": "Enable mlflow discovery", + "description": "discover your mlflow service", + "default": true + }, + "metaflow": { + "type": "boolean", + "title": "Enable metaflow discovery", + "description": "discover your metaflow service", + "default": true + } + } + }, + "security": { + "description": "security specific configuration", + "type": "object", + "properties": { + "password": { + "type": "string", + "description": "Password", + "default": "changeme", + "render": "password", + "x-onyxia": { + "overwriteDefaultWith": "{{service.oneTimePassword}}" + } + }, + "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-onyxia": { + "overwriteDefaultWith": "region.defaultIpProtection" + } + }, + "ip": { + "type": "string", + "description": "the white list of IP is whitespace", + "title": "Whitelist of IP", + "x-onyxia": { + "overwriteDefaultWith": "{{user.ip}}" + }, + "hidden": { + "value": false, + "path": "security/allowlist/enabled" + } + } + } + }, + "networkPolicy": { + "type": "object", + "description": "Define access policy to the service", + "properties": { + "enabled": { + "type": "boolean", + "title": "Enable network policy", + "description": "Only pod from the same namespace will be allowed", + "default": true, + "x-onyxia": { + "overwriteDefaultWith": "region.defaultNetworkPolicy" + } + }, + "from": { + "type": "array", + "description": "Array of source allowed to have network access to your service", + "default": [], + "x-onyxia": { + "hidden": true, + "overwriteDefaultWith": "region.from" + } + } + } + } + } + }, + "nodeSelector": { + "type": "object", + "description": "NodeSelector", + "default": {}, + "x-onyxia": { + "hidden": false, + "overwriteDefaultWith": "region.nodeSelector" + } + }, + "openshiftSCC": { + "description": "configuration for openshift compatibility", + "type": "object", + "properties": { + "enabled": { + "description": "enable rolebinding with openshift scc", + "type": "boolean", + "default": false, + "x-onyxia": { + "hidden": true, + "overwriteDefaultWith": "region.openshiftSCC.enabled" + } + }, + "scc": { + "type": "string", + "description": "name of scc for rolebinding", + "default": "anyuid", + "x-onyxia": { + "hidden": true, + "overwriteDefaultWith": "region.openshiftSCC.scc" + } + } + } + }, "ingress": { "type": "object", "form": true, @@ -630,60 +693,6 @@ } } }, - "networking": { - "type": "object", - "form": true, - "title": "Networking detail", - "properties": { - "user": { - "type": "object", - "description": "user defined port", - "properties": { - "enabled": { - "type": "boolean", - "title": "Enable a custom service port", - "description": "Enable a custom service port", - "default": false - }, - "port": { - "type": "integer", - "description": "port of the custom service", - "title": "Custom service port", - "hidden": { - "value": false, - "path": "networking/user/enabled" - }, - "default": 5000 - } - } - } - } - }, - "init": { - "description": "Init parameters", - "type": "object", - "properties": { - "regionInit": { - "type": "string", - "description": "region initialization script", - "default": "", - "x-onyxia": { - "hidden": true, - "overwriteDefaultWith": "{{k8s.initScriptUrl}}" - } - }, - "personalInit": { - "type": "string", - "description": "user initialization script", - "default": "" - }, - "personalInitArgs": { - "type": "string", - "description": "args for user initialization script", - "default": "" - } - } - }, "repository": { "description": "python repositories for pip and conda", "type": "object", @@ -726,15 +735,6 @@ "overwriteDefaultWith": "region.tolerations" } }, - "nodeSelector": { - "type": "object", - "description": "NodeSelector", - "default": {}, - "x-onyxia": { - "hidden": false, - "overwriteDefaultWith": "region.nodeSelector" - } - }, "userPreferences": { "description": "User Preferences", "type": "object",