Merge branch 'main' into BGD-4773-fix-spark-watcher-deployment-template

spotinst · Mar 27, 2024 · 30fe557 · 30fe557
2 parents 55a9ed4 + 79c9fe2
commit 30fe557
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/charts/bigdata-operator/Chart.yaml b/charts/bigdata-operator/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: bigdata-operator
 description: Spot Ocean BigData Operator
 type: application
-version: 0.4.9
-appVersion: 0.4.7
+version: 0.4.10
+appVersion: 0.4.9
 home: https://github.com/spotinst/charts
 icon: https://docs.spot.io/_media/images/spot_mark.png
 sources:

diff --git a/charts/bigdata-operator/values.yaml b/charts/bigdata-operator/values.yaml
@@ -11,7 +11,7 @@ image:
   repository: public.ecr.aws/f4k1p1n4/bigdata-operator
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: 0.4.7-5cf3b94b
+  tag: 0.4.9-237820e1
 
 imagePullSecrets: []
 

diff --git a/charts/bigdata-proxy/Chart.yaml b/charts/bigdata-proxy/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: bigdata-proxy
 description: A Helm chart for the Spot Big Data Proxy
 type: application
-version: 0.4.5
+version: 0.4.6
 appVersion: 0.5.3
 home: https://github.com/spotinst/charts
 icon: https://docs.spot.io/_media/images/spot_mark.png

diff --git a/charts/bigdata-proxy/templates/ingress.yaml b/charts/bigdata-proxy/templates/ingress.yaml
@@ -13,6 +13,8 @@ metadata:
     nginx.ingress.kubernetes.io/auth-tls-secret: {{ printf "%s/%s" .Values.ingress.secretNamespace .Values.ingress.secretName }}
     # Override proxy timeout to give time for possible cluster scale up
     nginx.ingress.kubernetes.io/proxy-read-timeout: {{ .Values.ingress.readTimeout | quote }}
+    # Override body size to allow file uploads from JupyterLab(workspace)
+    nginx.ingress.kubernetes.io/proxy-body-size: {{ .Values.ingress.bodySize }}
 spec:
   ingressClassName: {{ .Values.ingress.ingressClassName }}
   rules:  

diff --git a/charts/bigdata-proxy/values.yaml b/charts/bigdata-proxy/values.yaml
@@ -28,6 +28,7 @@ ingress:
   host: ""  # Overridden at deploy time
   secretNamespace: ""  # Overridden at deploy time
   secretName: ""  # Overridden at deploy time
+  bodySize: "2M"
 
 nameOverride: ""
 fullnameOverride: ""