From 0224fce4f9ba4082c94433761ba1f45792ed8253 Mon Sep 17 00:00:00 2001
From: ihiverlet <94982379+ihiverlet@users.noreply.github.com>
Date: Mon, 11 Dec 2023 18:33:26 +0100
Subject: [PATCH] use newer images for spark-thrift-server (#57)

---
 charts/hive-metastore/Chart.yaml              |  2 +-
 charts/spark-thrift-server/values.schema.json | 10 ++++------
 charts/spark-thrift-server/values.yaml        |  4 ++--
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/charts/hive-metastore/Chart.yaml b/charts/hive-metastore/Chart.yaml
index b40d326d..e782f5a0 100644
--- a/charts/hive-metastore/Chart.yaml
+++ b/charts/hive-metastore/Chart.yaml
@@ -25,7 +25,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: 0.3.0
+version: 0.3.1
 
 # 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
diff --git a/charts/spark-thrift-server/values.schema.json b/charts/spark-thrift-server/values.schema.json
index 49d894f6..01c0de62 100644
--- a/charts/spark-thrift-server/values.schema.json
+++ b/charts/spark-thrift-server/values.schema.json
@@ -20,15 +20,14 @@
               "description": "supported versions",
               "type": "string",
               "enum": [
-                "inseefrlab/jupyter-datascience:py3.9.7-spark3.2.0",
-                "inseefrlab/jupyter-datascience:py3.7.6-spark3.1.1"
+                "inseefrlab/onyxia-jupyter-pyspark:py3.11.6-spark3.5.0",
+                "inseefrlab/onyxia-jupyter-pyspark:py3.10.13-spark3.5.0"
               ],
-              "pattern": "^[a-z0-9-_./]+(:[a-z0-9-_.]+)?$",
               "hidden": {
                 "value": true,
                 "path": "service/image/custom/enabled"
               },
-              "default": "inseefrlab/jupyter-datascience:py3.9.7-spark3.2.0"
+              "default": "inseefrlab/onyxia-jupyter-pyspark:py3.11.6-spark3.5.0"
             },
             "custom": {
               "description": "use a custom jupyter docker image",
@@ -43,8 +42,7 @@
                 "version": {
                   "description": "jupyter unsupported version",
                   "type": "string",
-                  "default": "inseefrlab/jupyter-datascience:py3.9.7-spark3.1.2",
-                  "pattern": "^[a-z0-9-_./]+(:[a-z0-9-_.]+)?$",
+                  "default": "inseefrlab/onyxia-jupyter-pyspark:py3.11.6-spark3.5.0",
                   "hidden": {
                     "value": false,
                     "path": "service/image/custom/enabled"
diff --git a/charts/spark-thrift-server/values.yaml b/charts/spark-thrift-server/values.yaml
index 1dd08d2b..0f21a265 100644
--- a/charts/spark-thrift-server/values.yaml
+++ b/charts/spark-thrift-server/values.yaml
@@ -6,11 +6,11 @@ replicaCount: 1
 
 service:
   image:
-    version: "inseefrlab/onyxia-pyspark:py3.11.4-spark3.5.0"
+    version: "inseefrlab/onyxia-pyspark:py3.11.6-spark3.5.0"
     pullPolicy: IfNotPresent
     custom:
       enabled: false
-      version: "inseefrlab/onyxia-pyspark:py3.11.4-spark3.5.0"
+      version: "inseefrlab/onyxia-pyspark:py3.11.6-spark3.5.0"
 
 spark:
   sparkui: true