Skip to content

Commit fc2af15

Browse files
ihiverletihiverlet
authored
[Spark] Breaking change - Unify ide ingress (#272)
1 parent 177465c commit fc2af15

File tree

9 files changed

+48
-67
lines changed

9 files changed

+48
-67
lines changed

‎charts/jupyter-pyspark/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ type: application
2424
# This is the chart version. This version number should be incremented each time you make changes
2525
# to the chart and its templates, including the app version.
2626
# Versions are expected to follow Semantic Versioning (https://semver.org/)
27-
version: 2.3.28
27+
version: 3.0.0
2828
dependencies:
2929
- name: library-chart
30-
version: 1.7.14
30+
version: 2.0.2
3131
repository: https://inseefrlab.github.io/helm-charts-interactive-services

‎charts/jupyter-pyspark/values.schema.json‎

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,20 @@
6969
"overwriteSchemaWith": "spark.json"
7070
},
7171
"properties": {
72-
"sparkui": {
72+
"ui": {
7373
"title": "Enable monitoring interface",
7474
"type": "boolean",
7575
"default": true
7676
},
77+
"hostname": {
78+
"type": "string",
79+
"form": true,
80+
"title": "Hostname",
81+
"x-onyxia": {
82+
"hidden": true,
83+
"overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-spark.{{k8s.domain}}"
84+
}
85+
},
7786
"default": {
7887
"title": "Create a Spark configuration",
7988
"type": "boolean",
@@ -755,7 +764,7 @@
755764
"type": "object",
756765
"form": true,
757766
"x-onyxia": {
758-
"overwriteSchemaWith": "ide/ingress-spark.json"
767+
"overwriteSchemaWith": "ide/ingress.json"
759768
},
760769
"properties": {
761770
"enabled": {
@@ -776,15 +785,6 @@
776785
"overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-0.{{k8s.domain}}"
777786
}
778787
},
779-
"sparkHostname": {
780-
"type": "string",
781-
"form": true,
782-
"title": "Hostname",
783-
"x-onyxia": {
784-
"hidden": true,
785-
"overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-spark.{{k8s.domain}}"
786-
}
787-
},
788788
"userHostname": {
789789
"type": "string",
790790
"form": true,
@@ -863,15 +863,6 @@
863863
"overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-0.{{k8s.domain}}"
864864
}
865865
},
866-
"sparkHostname": {
867-
"type": "string",
868-
"form": true,
869-
"title": "Hostname",
870-
"x-onyxia": {
871-
"hidden": true,
872-
"overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-spark.{{k8s.domain}}"
873-
}
874-
},
875866
"userHostname": {
876867
"type": "string",
877868
"form": true,

‎charts/jupyter-pyspark/values.yaml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ service:
1414
version: "inseefrlab/onyxia-jupyter-pyspark:py3.13.8-spark4.0.1"
1515

1616
spark:
17-
sparkui: false
17+
ui: false
18+
hostname: chart-example-spark.local
19+
path: /
1820
secretName: ""
1921
default: true
2022
disabledCertChecking: false
@@ -198,10 +200,8 @@ ingress:
198200
# kubernetes.io/tls-acme: "true"
199201
hostname: chart-example.local
200202
userHostname: chart-example-user.local
201-
sparkHostname: chart-example-spark.local
202203
path: /
203204
userPath: /
204-
sparkPath: /
205205
# - secretName: chart-example-tls
206206
# hosts:
207207
# - chart-example.local
@@ -216,7 +216,6 @@ route:
216216
# route.openshift.io/termination: "reencrypt"
217217
hostname: chart-example.local
218218
userHostname: chart-example-user.local
219-
sparkHostname: chart-example-spark.local
220219
tls:
221220
termination: edge
222221
# key:

‎charts/rstudio-sparkr/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ type: application
2323
# This is the chart version. This version number should be incremented each time you make changes
2424
# to the chart and its templates, including the app version.
2525
# Versions are expected to follow Semantic Versioning (https://semver.org/)
26-
version: 2.3.18
26+
version: 3.0.0
2727
dependencies:
2828
- name: library-chart
29-
version: 1.7.14
29+
version: 2.0.2
3030
repository: https://inseefrlab.github.io/helm-charts-interactive-services

‎charts/rstudio-sparkr/values.schema.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,20 @@
6969
"overwriteSchemaWith": "spark.json"
7070
},
7171
"properties": {
72-
"sparkui": {
72+
"ui": {
7373
"title": "Enable monitoring interface",
7474
"type": "boolean",
7575
"default": true
7676
},
77+
"hostname": {
78+
"type": "string",
79+
"form": true,
80+
"title": "Hostname",
81+
"x-onyxia": {
82+
"hidden": true,
83+
"overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-spark.{{k8s.domain}}"
84+
}
85+
},
7786
"default": {
7887
"title": "Create a Spark configuration",
7988
"type": "boolean",
@@ -713,7 +722,7 @@
713722
"type": "object",
714723
"form": true,
715724
"x-onyxia": {
716-
"overwriteSchemaWith": "ide/ingress-spark.json"
725+
"overwriteSchemaWith": "ide/ingress.json"
717726
},
718727
"properties": {
719728
"enabled": {
@@ -734,15 +743,6 @@
734743
"overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-0.{{k8s.domain}}"
735744
}
736745
},
737-
"sparkHostname": {
738-
"type": "string",
739-
"form": true,
740-
"title": "Hostname",
741-
"x-onyxia": {
742-
"hidden": true,
743-
"overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-spark.{{k8s.domain}}"
744-
}
745-
},
746746
"userHostname": {
747747
"type": "string",
748748
"form": true,

‎charts/rstudio-sparkr/values.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ service:
1414
version: "inseefrlab/onyxia-rstudio-sparkr:r4.5.2-spark4.0.1"
1515

1616
spark:
17-
sparkui: false
17+
ui: false
18+
hostname: chart-example-spark.local
19+
path: /
1820
secretName: ""
1921
default: true
2022
disabledCertChecking: false
@@ -175,10 +177,8 @@ ingress:
175177
# kubernetes.io/tls-acme: "true"
176178
hostname: chart-example.local
177179
userHostname: chart-example-user.local
178-
sparkHostname: chart-example-spark.local
179180
path: /
180181
userPath: /
181-
sparkPath: /
182182
# - secretName: chart-example-tls
183183
# hosts:
184184
# - chart-example.local

‎charts/vscode-pyspark/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ type: application
2424
# This is the chart version. This version number should be incremented each time you make changes
2525
# to the chart and its templates, including the app version.
2626
# Versions are expected to follow Semantic Versioning (https://semver.org/)
27-
version: 2.4.1
27+
version: 3.0.0
2828
dependencies:
2929
- name: library-chart
30-
version: 1.7.14
30+
version: 2.0.2
3131
repository: https://inseefrlab.github.io/helm-charts-interactive-services

‎charts/vscode-pyspark/values.schema.json‎

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,20 @@
6969
"overwriteSchemaWith": "spark.json"
7070
},
7171
"properties": {
72-
"sparkui": {
72+
"ui": {
7373
"title": "Enable monitoring interface",
7474
"type": "boolean",
7575
"default": true
7676
},
77+
"hostname": {
78+
"type": "string",
79+
"form": true,
80+
"title": "Hostname",
81+
"x-onyxia": {
82+
"hidden": true,
83+
"overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-spark.{{k8s.domain}}"
84+
}
85+
},
7786
"default": {
7887
"title": "Create a Spark configuration",
7988
"type": "boolean",
@@ -748,7 +757,7 @@
748757
"type": "object",
749758
"form": true,
750759
"x-onyxia": {
751-
"overwriteSchemaWith": "ide/ingress-spark.json"
760+
"overwriteSchemaWith": "ide/ingress.json"
752761
},
753762
"properties": {
754763
"enabled": {
@@ -769,15 +778,6 @@
769778
"overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-0.{{k8s.domain}}"
770779
}
771780
},
772-
"sparkHostname": {
773-
"type": "string",
774-
"form": true,
775-
"title": "Hostname",
776-
"x-onyxia": {
777-
"hidden": true,
778-
"overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-spark.{{k8s.domain}}"
779-
}
780-
},
781781
"userHostname": {
782782
"type": "string",
783783
"form": true,
@@ -856,15 +856,6 @@
856856
"overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-0.{{k8s.domain}}"
857857
}
858858
},
859-
"sparkHostname": {
860-
"type": "string",
861-
"form": true,
862-
"title": "Hostname",
863-
"x-onyxia": {
864-
"hidden": true,
865-
"overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-spark.{{k8s.domain}}"
866-
}
867-
},
868859
"userHostname": {
869860
"type": "string",
870861
"form": true,

‎charts/vscode-pyspark/values.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ service:
1414
version: "inseefrlab/onyxia-vscode-pyspark:py3.13.8-spark4.0.1"
1515

1616
spark:
17-
sparkui: false
17+
ui: false
18+
hostname: chart-example-spark.local
19+
path: /
1820
secretName: ""
1921
default: true
2022
disabledCertChecking: false
@@ -199,10 +201,8 @@ ingress:
199201
# kubernetes.io/tls-acme: "true"
200202
hostname: chart-example.local
201203
userHostname: chart-example-user.local
202-
sparkHostname: chart-example-spark.local
203204
path: /
204205
userPath: /
205-
sparkPath: /
206206
# - secretName: chart-example-tls
207207
# hosts:
208208
# - chart-example.local

0 commit comments

Comments
 (0)