From 8b86cb931d3b723ff2f87f91bc2f91ecb6bc1afa Mon Sep 17 00:00:00 2001 From: Miguel Ruiz Date: Fri, 10 Mar 2023 10:18:17 +0100 Subject: [PATCH] [bitnami/spark] Add support for service.headless.annotations (#15445) * [bitnami/spark] Add support for service.headless.annotations Signed-off-by: Miguel Ruiz * Update README.md with readme-generator-for-helm Signed-off-by: Bitnami Containers --------- Signed-off-by: Miguel Ruiz Signed-off-by: Bitnami Containers Co-authored-by: Bitnami Containers --- bitnami/spark/Chart.yaml | 2 +- bitnami/spark/README.md | 1 + bitnami/spark/templates/headless-svc.yaml | 10 ++++++++-- bitnami/spark/values.yaml | 6 ++++++ 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/bitnami/spark/Chart.yaml b/bitnami/spark/Chart.yaml index 1fa4016fb6..db811695e5 100644 --- a/bitnami/spark/Chart.yaml +++ b/bitnami/spark/Chart.yaml @@ -22,4 +22,4 @@ name: spark sources: - https://github.com/bitnami/containers/tree/main/bitnami/spark - https://spark.apache.org/ -version: 6.3.18 +version: 6.4.0 diff --git a/bitnami/spark/README.md b/bitnami/spark/README.md index 6e86974c2a..c15ea38043 100644 --- a/bitnami/spark/README.md +++ b/bitnami/spark/README.md @@ -282,6 +282,7 @@ The command removes all the Kubernetes components associated with the chart and | `service.extraPorts` | Extra ports to expose in Spark service (normally used with the `sidecars` value) | `[]` | | `service.sessionAffinity` | Control where client requests go, to the same pod or round-robin | `None` | | `service.sessionAffinityConfig` | Additional settings for the sessionAffinity | `{}` | +| `service.headless.annotations` | Annotations for the headless service. | `{}` | | `ingress.enabled` | Enable ingress controller resource | `false` | | `ingress.pathType` | Ingress path type | `ImplementationSpecific` | | `ingress.apiVersion` | Force Ingress API version (automatically detected if not set) | `""` | diff --git a/bitnami/spark/templates/headless-svc.yaml b/bitnami/spark/templates/headless-svc.yaml index 3f43d445d7..a3164bc408 100644 --- a/bitnami/spark/templates/headless-svc.yaml +++ b/bitnami/spark/templates/headless-svc.yaml @@ -7,8 +7,14 @@ metadata: {{- if .Values.commonLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- end }} - {{- if .Values.commonAnnotations }} - annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- if or .Values.service.headless.annotations .Values.commonAnnotations }} + annotations: + {{- if .Values.service.headless.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.service.headless.annotations "context" $) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} {{- end }} spec: type: ClusterIP diff --git a/bitnami/spark/values.yaml b/bitnami/spark/values.yaml index 371a07561b..f987b61fbd 100644 --- a/bitnami/spark/values.yaml +++ b/bitnami/spark/values.yaml @@ -811,6 +811,12 @@ service: ## timeoutSeconds: 300 ## sessionAffinityConfig: {} + ## Headless service properties + ## + headless: + ## @param service.headless.annotations Annotations for the headless service. + ## + annotations: {} ## Configure the ingress resource that allows you to access the ## Spark installation. Set up the URL ## ref: https://kubernetes.io/docs/user-guide/ingress/