Merge branch 'main' into new-discoveries-in-ide

Author: Gaspi

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.2.10
+version: 2.3.2
 dependencies:
   - name: library-chart
-    version: 1.6.16
+    version: 1.7.0
     repository: https://inseefrlab.github.io/helm-charts-interactive-services

charts/jupyter-pyspark/README.md

@@ -1,6 +1,6 @@
 # jupyter-pyspark
 
-![Version: 2.2.9](https://img.shields.io/badge/Version-2.2.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 2.3.1](https://img.shields.io/badge/Version-2.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 The JupyterLab IDE with PySpark, an interface to use Apache Spark from Python.
 
@@ -15,7 +15,7 @@ The JupyterLab IDE with PySpark, an interface to use Apache Spark from Python.
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://inseefrlab.github.io/helm-charts-interactive-services | library-chart | 1.6.13 |
+| https://inseefrlab.github.io/helm-charts-interactive-services | library-chart | 1.7.0 |
 
 ## Values
 
@@ -76,6 +76,8 @@ The JupyterLab IDE with PySpark, an interface to use Apache Spark from Python.
 | networking.user.port | int | `5000` |  |
 | networking.user.ports | list | `[]` |  |
 | nodeSelector | object | `{}` |  |
+| openshiftSCC.enabled | bool | `false` |  |
+| openshiftSCC.scc | string | `""` |  |
 | persistence.accessMode | string | `"ReadWriteOnce"` |  |
 | persistence.enabled | bool | `true` |  |
 | persistence.size | string | `"10Gi"` |  |

…upyter-r/templates/role-binding-scc.yaml …-pyspark/templates/role-binding-scc.yamlcharts/jupyter-r/templates/role-binding-scc.yaml renamed to charts/jupyter-pyspark/templates/role-binding-scc.yaml charts/jupyter-r/templates/role-binding-scc.yaml renamed to charts/jupyter-pyspark/templates/role-binding-scc.yaml

@@ -315,23 +315,23 @@ spec:
             - mountPath: /dev/shm
               name: dshm
             {{- if (.Values.s3).enabled }}
-            - mountPath: /opt/hadoop/etc/hadoop/core-site.xml
+            - mountPath: /usr/local/lib/hadoop/etc/hadoop/core-site.xml
               subPath: coresite/core-site.xml
               name: config-files
             {{- end }}
             {{- if (.Values.spark).default }}
             - name: config-files
-              mountPath: /opt/spark/conf/spark-defaults.conf
+              mountPath: /usr/local/lib/spark/conf/spark-defaults.conf
               subPath: spark/spark-defaults.conf
             {{- end }}
             {{- if and (.Values.spark.default) (.Values.repository.mavenRepository) }}
             - name: config-files
-              mountPath: /opt/spark/conf/ivysettings.xml
+              mountPath: /usr/local/lib/spark/conf/ivysettings.xml
               subPath: ivysettings/ivysettings.xml
             {{- end }}
             {{- if (.Values.discovery).hive }}
             - name: config-files
-              mountPath: /opt/hive/conf/hive-site.xml
+              mountPath: /usr/local/lib/hive/conf/hive-site.xml
               subPath: hive/hive-site.xml
             {{- end }}
             {{- if (.Values.discovery).metaflow }}

charts/jupyter-pyspark/templates/statefulset.yaml

@@ -25,7 +25,7 @@
               "type": "string",
               "listEnum": [
                 "inseefrlab/onyxia-jupyter-pyspark:py3.12.9-spark3.5.5",
-                "inseefrlab/onyxia-jupyter-pyspark:py3.11.11-spark3.5.5"
+                "inseefrlab/onyxia-jupyter-pyspark:py3.11.12-spark3.5.5"
               ],
               "render": "list",
               "hidden": {
@@ -723,6 +723,33 @@
         "overwriteSchemaWith": "nodeSelector.json"
       }
     },
+    "openshiftSCC": {
+      "description": "configuration for openshift compatibility",
+      "type": "object",
+      "x-onyxia": {
+        "overwriteSchemaWith": "ide/openshiftSCC.json"
+      },
+      "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": {
       "title": "Ingress Details",
       "type": "object",

charts/jupyter-pyspark/values.schema.json

@@ -262,6 +262,10 @@ userPreferences:
   darkMode: false
   language: "en"
 
+openshiftSCC:
+  enabled: false
+  scc: ""
+
 certificates: {}
   # pathToCaBundle: /usr/local/share/ca-certificates/
   # cacerts: ""

charts/jupyter-pyspark/values.yaml

@@ -11,8 +11,8 @@ sources:
 - https://github.com/InseeFrLab/images-datascience
 - https://github.com/InseeFrLab/helm-charts-interactive-services
 type: application
-version: 2.2.10
+version: 2.3.2
 dependencies:
 - name: library-chart
-  version: 1.6.13
+  version: 1.7.0
   repository: https://inseefrlab.github.io/helm-charts-interactive-services

charts/jupyter-python-gpu/Chart.yaml

@@ -1,6 +1,6 @@
 # jupyter-python-gpu
 
-![Version: 2.2.10](https://img.shields.io/badge/Version-2.2.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 2.3.2](https://img.shields.io/badge/Version-2.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 The JupyterLab IDE with Python, and a collection of standard data science packages, with GPU support.
 
@@ -15,7 +15,7 @@ The JupyterLab IDE with Python, and a collection of standard data science packag
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://inseefrlab.github.io/helm-charts-interactive-services | library-chart | 1.6.13 |
+| https://inseefrlab.github.io/helm-charts-interactive-services | library-chart | 1.7.0 |
 
 ## Values
 

charts/jupyter-python-gpu/README.md

@@ -260,7 +260,7 @@ spec:
               name: dshm
             {{- if (.Values.discovery).hive }}
             - name: config-files
-              mountPath: /opt/hive/conf/hive-site.xml
+              mountPath: /usr/local/lib/hive/conf/hive-site.xml
               subPath: hive/hive-site.xml
             {{- end }}
             {{- if (.Values.discovery).metaflow }}

charts/jupyter-python-gpu/templates/statefulset.yaml

@@ -25,7 +25,7 @@
               "type": "string",
               "listEnum": [
                 "inseefrlab/onyxia-jupyter-python:py3.12.9-gpu",
-                "inseefrlab/onyxia-jupyter-python:py3.11.11-gpu"
+                "inseefrlab/onyxia-jupyter-python:py3.11.12-gpu"
               ],
               "render": "list",
               "hidden": {