From ca7413e84fa3b417ea6520a5e987d6e3a7b015eb Mon Sep 17 00:00:00 2001 From: "Miguel A. Cabrera Minagorri" Date: Wed, 13 Jan 2021 16:59:17 +0000 Subject: [PATCH] Update spark ingress --- bitnami/spark/Chart.lock | 6 +++--- bitnami/spark/Chart.yaml | 2 +- bitnami/spark/README.md | 4 ++++ bitnami/spark/templates/ingress.yaml | 7 ++++--- bitnami/spark/values.yaml | 9 +++++++++ 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/bitnami/spark/Chart.lock b/bitnami/spark/Chart.lock index fc61d0ff54..2f2b0d1b46 100644 --- a/bitnami/spark/Chart.lock +++ b/bitnami/spark/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common repository: https://charts.bitnami.com/bitnami - version: 1.2.3 -digest: sha256:3fc1fbf3ae204e0121f1e202d6d57f9381f3a45d8821647d1dfe0a475644da0c -generated: "2021-01-03T06:07:43.040023397Z" + version: 1.3.2 +digest: sha256:2561a4fdd0fcd76af4a2b04bf8d67585e8bc3fc3e366ae0a55a12541a85b4551 +generated: "2021-01-13T16:57:53.690811884Z" diff --git a/bitnami/spark/Chart.yaml b/bitnami/spark/Chart.yaml index 608c410728..f51d823d7a 100644 --- a/bitnami/spark/Chart.yaml +++ b/bitnami/spark/Chart.yaml @@ -21,4 +21,4 @@ name: spark sources: - https://github.com/bitnami/bitnami-docker-spark - https://spark.apache.org/ -version: 4.4.1 +version: 4.5.0 diff --git a/bitnami/spark/README.md b/bitnami/spark/README.md index 609fe5f0c5..c1440ebbfe 100644 --- a/bitnami/spark/README.md +++ b/bitnami/spark/README.md @@ -61,6 +61,7 @@ The following tables lists the configurable parameters of the spark chart and th |---------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------| | `nameOverride` | String to partially override common.names.fullname template with a string (will prepend the release name) | `nil` | | `fullnameOverride` | String to fully override common.names.fullname template with a string | `nil` | +| `kubeVersion` | Force target Kubernetes version (using Helm capabilities if not set) | `nil` | ### Spark parameters @@ -185,6 +186,9 @@ The following tables lists the configurable parameters of the spark chart and th | `service.annotations` | Annotations for spark service | {} | | `service.loadBalancerIP` | loadBalancerIP if spark service type is `LoadBalancer` | `nil` | | `ingress.enabled` | Enable the use of the ingress controller to access the web UI | `false` | +| `ingress.apiVersion` | Force Ingress API version (automatically detected if not set) | `` | +| `ingress.path` | Ingress path | `/` | +| `ingress.pathType` | Ingress path type | `ImplementationSpecific` | | `ingress.certManager` | Add annotations for cert-manager | `false` | | `ingress.annotations` | Ingress annotations | `{}` | | `ingress.hosts[0].name` | Hostname to your Spark installation | `spark.local` | diff --git a/bitnami/spark/templates/ingress.yaml b/bitnami/spark/templates/ingress.yaml index 004cfb1e11..350637b435 100644 --- a/bitnami/spark/templates/ingress.yaml +++ b/bitnami/spark/templates/ingress.yaml @@ -19,9 +19,10 @@ spec: http: paths: - path: {{ default "/" .path }} - backend: - serviceName: {{ include "spark.master.service.name" $ }} - servicePort: http + {{- if eq "true" (include "common.ingress.supportsPathType" $) }} + pathType: {{ default "ImplementationSpecific" .pathType }} + {{- end }} + backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }} {{- end }} {{- if .Values.ingress.tls }} tls: diff --git a/bitnami/spark/values.yaml b/bitnami/spark/values.yaml index 06bb5c3d3d..4908c25436 100644 --- a/bitnami/spark/values.yaml +++ b/bitnami/spark/values.yaml @@ -7,6 +7,10 @@ # imagePullSecrets: # - myRegistryKeySecretName +## Force target Kubernetes version (using Helm capabilites if not set) +## +kubeVersion: + ## Bitnami Spark image version ## ref: https://hub.docker.com/r/bitnami/spark/tags/ ## @@ -418,11 +422,16 @@ ingress: hosts: - name: spark.local path: / + pathType: ImplementationSpecific tls: - hosts: - spark.domain.com secretName: spark.local-tls + ## Override API Version (automatically detected if not set) + ## + apiVersion: + ## Metrics configuration ## metrics: