From 4bc80094d3718d326103caf85a4c53ebfed66efa Mon Sep 17 00:00:00 2001 From: Ognjen Stanisavljevic Date: Wed, 28 Jun 2023 12:33:04 +0200 Subject: [PATCH] [bitnami/spark] Add extraVolumeClaimTemplates in master and worker StatefulSets (#17353) * [bitnami/spark] Add extraVolumeClaimTemplates for master and worker nodes Signed-off-by: Stanisavljevic Ognjen * Move to new version - bump version in chart.yaml Signed-off-by: Stanisavljevic Ognjen --------- Signed-off-by: Stanisavljevic Ognjen --- bitnami/spark/Chart.yaml | 2 +- bitnami/spark/README.md | 2 ++ bitnami/spark/templates/statefulset-master.yaml | 3 +++ bitnami/spark/templates/statefulset-worker.yaml | 3 +++ bitnami/spark/values.yaml | 6 ++++++ 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/bitnami/spark/Chart.yaml b/bitnami/spark/Chart.yaml index 0d1f8d67c2..229ea27102 100644 --- a/bitnami/spark/Chart.yaml +++ b/bitnami/spark/Chart.yaml @@ -24,4 +24,4 @@ maintainers: name: spark sources: - https://github.com/bitnami/charts/tree/main/bitnami/spark -version: 7.0.2 +version: 7.1.0 diff --git a/bitnami/spark/README.md b/bitnami/spark/README.md index 602ebf7711..7a976943cb 100644 --- a/bitnami/spark/README.md +++ b/bitnami/spark/README.md @@ -137,6 +137,7 @@ The command removes all the Kubernetes components associated with the chart and | `master.lifecycleHooks` | for the master container(s) to automate configuration before or after startup | `{}` | | `master.extraVolumes` | Optionally specify extra list of additional volumes for the master pod(s) | `[]` | | `master.extraVolumeMounts` | Optionally specify extra list of additional volumeMounts for the master container(s) | `[]` | +| `master.extraVolumeClaimTemplates` | Optionally specify extra list of volumesClaimTemplates for the master statefulset | `[]` | | `master.resources.limits` | The resources limits for the container | `{}` | | `master.resources.requests` | The requested resources for the container | `{}` | | `master.livenessProbe.enabled` | Enable livenessProbe | `true` | @@ -213,6 +214,7 @@ The command removes all the Kubernetes components associated with the chart and | `worker.lifecycleHooks` | for the worker container(s) to automate configuration before or after startup | `{}` | | `worker.extraVolumes` | Optionally specify extra list of additional volumes for the worker pod(s) | `[]` | | `worker.extraVolumeMounts` | Optionally specify extra list of additional volumeMounts for the master container(s) | `[]` | +| `worker.extraVolumeClaimTemplates` | Optionally specify extra list of volumesClaimTemplates for the worker statefulset | `[]` | | `worker.resources.limits` | The resources limits for the container | `{}` | | `worker.resources.requests` | The requested resources for the container | `{}` | | `worker.livenessProbe.enabled` | Enable livenessProbe | `true` | diff --git a/bitnami/spark/templates/statefulset-master.yaml b/bitnami/spark/templates/statefulset-master.yaml index bd57da3334..8ae40e9879 100644 --- a/bitnami/spark/templates/statefulset-master.yaml +++ b/bitnami/spark/templates/statefulset-master.yaml @@ -349,3 +349,6 @@ spec: secretName: {{ template ".Values.initScriptsSecret" . }} defaultMode: 0755 {{- end }} + {{- if .Values.master.extraVolumeClaimTemplates }} + volumeClaimTemplates: {{- include "common.tplvalues.render" (dict "value" .Values.master.extraVolumeClaimTemplates "context" $) | nindent 8 }} + {{- end }} diff --git a/bitnami/spark/templates/statefulset-worker.yaml b/bitnami/spark/templates/statefulset-worker.yaml index 49800f0b25..a0331f881c 100644 --- a/bitnami/spark/templates/statefulset-worker.yaml +++ b/bitnami/spark/templates/statefulset-worker.yaml @@ -373,3 +373,6 @@ spec: secretName: {{ template ".Values.initScriptsSecret" . }} defaultMode: 0755 {{- end }} + {{- if .Values.worker.extraVolumeClaimTemplates }} + volumeClaimTemplates: {{- include "common.tplvalues.render" (dict "value" .Values.worker.extraVolumeClaimTemplates "context" $) | nindent 8 }} + {{- end }} diff --git a/bitnami/spark/values.yaml b/bitnami/spark/values.yaml index 327302e115..c1ad31e55c 100644 --- a/bitnami/spark/values.yaml +++ b/bitnami/spark/values.yaml @@ -280,6 +280,9 @@ master: ## @param master.extraVolumeMounts Optionally specify extra list of additional volumeMounts for the master container(s) ## extraVolumeMounts: [] + ## @param master.extraVolumeClaimTemplates Optionally specify extra list of volumesClaimTemplates for the master statefulset + ## + extraVolumeClaimTemplates: [] ## Container resource requests and limits ## ref: https://kubernetes.io/docs/user-guide/compute-resources/ ## We usually recommend not to specify default resources and to leave this as a conscious @@ -561,6 +564,9 @@ worker: ## @param worker.extraVolumeMounts Optionally specify extra list of additional volumeMounts for the master container(s) ## extraVolumeMounts: [] + ## @param worker.extraVolumeClaimTemplates Optionally specify extra list of volumesClaimTemplates for the worker statefulset + ## + extraVolumeClaimTemplates: [] ## Container resource requests and limits ## ref: https://kubernetes.io/docs/user-guide/compute-resources/ ## We usually recommend not to specify default resources and to leave this as a conscious