Use new jupyter-pyspark image (#180)

statisticsnorway · Nov 21, 2024 · 8152c25 · 8152c25
1 parent 9bc8a5e
commit 8152c25
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git 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: 0.0.17
+version: 0.0.18
 
 
 dependencies:

diff --git a/charts/jupyter-pyspark/templates/statefulset.yaml b/charts/jupyter-pyspark/templates/statefulset.yaml
@@ -106,17 +106,20 @@ spec:
             - name: SPARK_DRIVER_MEMORY
               value: |
                 {{- $requestedmem := .Values.ressurser.requests.memory | trimSuffix "Gi" | int }}
-                {{- $allocatedMem := mulf $requestedmem 0.5 | int }}
+                {{- $adjustedMem := mulf $requestedmem 0.5 | int }}
+                {{- $allocatedMem := min $requestedmem $adjustedMem }}
                 {{ $allocatedMem | toString }}g
             - name: SPARK_EXECUTOR_MEMORY
               value: |
                 {{- $requestedmem := .Values.ressurser.requests.memory | trimSuffix "Gi" | int }}
-                {{- $allocatedExecutorMem := mulf $requestedmem 0.9 | int }}
+                {{- $adjustedMem := mulf $requestedmem 0.9 | int }}
+                {{- $allocatedExecutorMem := min $requestedmem $adjustedMem }}
                 {{ $allocatedExecutorMem | toString }}g
             - name: SPARK_DRIVER_MAX_RESULT_SIZE
               value: |
                 {{- $requestedmem := .Values.ressurser.requests.memory | trimSuffix "Gi" | int }}
-                {{- $allocatedMaxResultSize := mulf $requestedmem 0.9 | int }}
+                {{- $adjustedMem := mulf $requestedmem 0.9 | int }}
+                {{- $allocatedMaxResultSize := min $requestedmem $adjustedMem }}
                 {{ $allocatedMaxResultSize | toString }}g
             - name: ROOT_PROJECT_DIRECTORY
               value: /home/{{ .Values.environment.user }}/work

diff --git a/charts/jupyter-pyspark/values.schema.json b/charts/jupyter-pyspark/values.schema.json
@@ -119,10 +119,10 @@
               "title": "Versjon",
               "description": "Velg hvilken versjon av R og Python du ønsker å starte tjenesten med",
               "type": "string",
-              "default": "py311-spark3.5.3-v2-2024.11.20",
+              "default": "py311-spark3.5.3-v3-2024.11.21",
               "listEnum": [
-                "py312-spark3.5.3-v3-2024.11.20",
-                "py311-spark3.5.3-v2-2024.11.20"
+                "py312-spark3.5.3-v4-2024.11.21",
+                "py311-spark3.5.3-v3-2024.11.21"
               ],
               "render": "list",
               "pattern": "^[a-z0-9-_./]+(:[a-z0-9-_.]+)?$"

diff --git a/charts/jupyter-pyspark/values.yaml b/charts/jupyter-pyspark/values.yaml
@@ -2,7 +2,7 @@ global:
   suspend: false
 tjeneste:
   image:
-    version: "py311-spark3.5.3-v2-2024.11.20"
+    version: "py311-spark3.5.3-v3-2024.11.21"
     pullPolicy: IfNotPresent
 
 security: