diff --git a/charts/jupyter-pyspark/Chart.yaml b/charts/jupyter-pyspark/Chart.yaml index 9a3b3a75a..207befa60 100644 --- a/charts/jupyter-pyspark/Chart.yaml +++ b/charts/jupyter-pyspark/Chart.yaml @@ -24,8 +24,8 @@ 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.3.28 +version: 3.0.0 dependencies: - name: library-chart - version: 1.7.14 + version: 2.0.2 repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/jupyter-pyspark/values.schema.json b/charts/jupyter-pyspark/values.schema.json index 79fc53e7d..be5a4606d 100644 --- a/charts/jupyter-pyspark/values.schema.json +++ b/charts/jupyter-pyspark/values.schema.json @@ -69,11 +69,20 @@ "overwriteSchemaWith": "spark.json" }, "properties": { - "sparkui": { + "ui": { "title": "Enable monitoring interface", "type": "boolean", "default": true }, + "hostname": { + "type": "string", + "form": true, + "title": "Hostname", + "x-onyxia": { + "hidden": true, + "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-spark.{{k8s.domain}}" + } + }, "default": { "title": "Create a Spark configuration", "type": "boolean", @@ -755,7 +764,7 @@ "type": "object", "form": true, "x-onyxia": { - "overwriteSchemaWith": "ide/ingress-spark.json" + "overwriteSchemaWith": "ide/ingress.json" }, "properties": { "enabled": { @@ -776,15 +785,6 @@ "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-0.{{k8s.domain}}" } }, - "sparkHostname": { - "type": "string", - "form": true, - "title": "Hostname", - "x-onyxia": { - "hidden": true, - "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-spark.{{k8s.domain}}" - } - }, "userHostname": { "type": "string", "form": true, @@ -863,15 +863,6 @@ "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-0.{{k8s.domain}}" } }, - "sparkHostname": { - "type": "string", - "form": true, - "title": "Hostname", - "x-onyxia": { - "hidden": true, - "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-spark.{{k8s.domain}}" - } - }, "userHostname": { "type": "string", "form": true, diff --git a/charts/jupyter-pyspark/values.yaml b/charts/jupyter-pyspark/values.yaml index 6085277ca..689f96ce8 100644 --- a/charts/jupyter-pyspark/values.yaml +++ b/charts/jupyter-pyspark/values.yaml @@ -14,7 +14,9 @@ service: version: "inseefrlab/onyxia-jupyter-pyspark:py3.13.8-spark4.0.1" spark: - sparkui: false + ui: false + hostname: chart-example-spark.local + path: / secretName: "" default: true disabledCertChecking: false @@ -198,10 +200,8 @@ ingress: # kubernetes.io/tls-acme: "true" hostname: chart-example.local userHostname: chart-example-user.local - sparkHostname: chart-example-spark.local path: / userPath: / - sparkPath: / # - secretName: chart-example-tls # hosts: # - chart-example.local @@ -216,7 +216,6 @@ route: # route.openshift.io/termination: "reencrypt" hostname: chart-example.local userHostname: chart-example-user.local - sparkHostname: chart-example-spark.local tls: termination: edge # key: diff --git a/charts/rstudio-sparkr/Chart.yaml b/charts/rstudio-sparkr/Chart.yaml index 1bb71e680..4febc8728 100644 --- a/charts/rstudio-sparkr/Chart.yaml +++ b/charts/rstudio-sparkr/Chart.yaml @@ -23,8 +23,8 @@ 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.3.18 +version: 3.0.0 dependencies: - name: library-chart - version: 1.7.14 + version: 2.0.2 repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/rstudio-sparkr/values.schema.json b/charts/rstudio-sparkr/values.schema.json index 5cb9d1893..de9113dbf 100644 --- a/charts/rstudio-sparkr/values.schema.json +++ b/charts/rstudio-sparkr/values.schema.json @@ -69,11 +69,20 @@ "overwriteSchemaWith": "spark.json" }, "properties": { - "sparkui": { + "ui": { "title": "Enable monitoring interface", "type": "boolean", "default": true }, + "hostname": { + "type": "string", + "form": true, + "title": "Hostname", + "x-onyxia": { + "hidden": true, + "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-spark.{{k8s.domain}}" + } + }, "default": { "title": "Create a Spark configuration", "type": "boolean", @@ -713,7 +722,7 @@ "type": "object", "form": true, "x-onyxia": { - "overwriteSchemaWith": "ide/ingress-spark.json" + "overwriteSchemaWith": "ide/ingress.json" }, "properties": { "enabled": { @@ -734,15 +743,6 @@ "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-0.{{k8s.domain}}" } }, - "sparkHostname": { - "type": "string", - "form": true, - "title": "Hostname", - "x-onyxia": { - "hidden": true, - "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-spark.{{k8s.domain}}" - } - }, "userHostname": { "type": "string", "form": true, diff --git a/charts/rstudio-sparkr/values.yaml b/charts/rstudio-sparkr/values.yaml index 7a10304af..d215cdb36 100644 --- a/charts/rstudio-sparkr/values.yaml +++ b/charts/rstudio-sparkr/values.yaml @@ -14,7 +14,9 @@ service: version: "inseefrlab/onyxia-rstudio-sparkr:r4.5.2-spark4.0.1" spark: - sparkui: false + ui: false + hostname: chart-example-spark.local + path: / secretName: "" default: true disabledCertChecking: false @@ -175,10 +177,8 @@ ingress: # kubernetes.io/tls-acme: "true" hostname: chart-example.local userHostname: chart-example-user.local - sparkHostname: chart-example-spark.local path: / userPath: / - sparkPath: / # - secretName: chart-example-tls # hosts: # - chart-example.local diff --git a/charts/vscode-pyspark/Chart.yaml b/charts/vscode-pyspark/Chart.yaml index 8f467b668..9c3986c7b 100644 --- a/charts/vscode-pyspark/Chart.yaml +++ b/charts/vscode-pyspark/Chart.yaml @@ -24,8 +24,8 @@ 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.4.1 +version: 3.0.0 dependencies: - name: library-chart - version: 1.7.14 + version: 2.0.2 repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/vscode-pyspark/values.schema.json b/charts/vscode-pyspark/values.schema.json index 818ca28a6..e4e775d64 100644 --- a/charts/vscode-pyspark/values.schema.json +++ b/charts/vscode-pyspark/values.schema.json @@ -69,11 +69,20 @@ "overwriteSchemaWith": "spark.json" }, "properties": { - "sparkui": { + "ui": { "title": "Enable monitoring interface", "type": "boolean", "default": true }, + "hostname": { + "type": "string", + "form": true, + "title": "Hostname", + "x-onyxia": { + "hidden": true, + "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-spark.{{k8s.domain}}" + } + }, "default": { "title": "Create a Spark configuration", "type": "boolean", @@ -748,7 +757,7 @@ "type": "object", "form": true, "x-onyxia": { - "overwriteSchemaWith": "ide/ingress-spark.json" + "overwriteSchemaWith": "ide/ingress.json" }, "properties": { "enabled": { @@ -769,15 +778,6 @@ "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-0.{{k8s.domain}}" } }, - "sparkHostname": { - "type": "string", - "form": true, - "title": "Hostname", - "x-onyxia": { - "hidden": true, - "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-spark.{{k8s.domain}}" - } - }, "userHostname": { "type": "string", "form": true, @@ -856,15 +856,6 @@ "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-0.{{k8s.domain}}" } }, - "sparkHostname": { - "type": "string", - "form": true, - "title": "Hostname", - "x-onyxia": { - "hidden": true, - "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-spark.{{k8s.domain}}" - } - }, "userHostname": { "type": "string", "form": true, diff --git a/charts/vscode-pyspark/values.yaml b/charts/vscode-pyspark/values.yaml index deda28a85..f1946deb9 100644 --- a/charts/vscode-pyspark/values.yaml +++ b/charts/vscode-pyspark/values.yaml @@ -14,7 +14,9 @@ service: version: "inseefrlab/onyxia-vscode-pyspark:py3.13.8-spark4.0.1" spark: - sparkui: false + ui: false + hostname: chart-example-spark.local + path: / secretName: "" default: true disabledCertChecking: false @@ -199,10 +201,8 @@ ingress: # kubernetes.io/tls-acme: "true" hostname: chart-example.local userHostname: chart-example-user.local - sparkHostname: chart-example-spark.local path: / userPath: / - sparkPath: / # - secretName: chart-example-tls # hosts: # - chart-example.local