Expose all fields below spec in eck-elasticsearch Helm chart

[thbkrkr]

This exposes the 4 fields image, podDisruptionBudget, serviceAccountName and revisionHistoryLimit in the eck-elasticsearch Helm chart.

Relates to #6451.

[naemono]

I believe there's a slight issue in the templating

  image:
    my.registry.com/elastic/elasticsearch:8.7.0
  podDisruptionBudget:
    spec:
      minAvailable: 2
      selector:
        matchLabels:
          elasticsearch.k8s.elastic.co/cluster-name: quickstart
  serviceAccountName:
    my-serviceaccount
  revisionHistoryLimit:
    2

I think this fixes it

diff --git a/deploy/eck-elasticsearch/templates/elasticsearch.yaml b/deploy/eck-elasticsearch/templates/elasticsearch.yaml
index 43c144753..b99b3edc6 100644
--- a/deploy/eck-elasticsearch/templates/elasticsearch.yaml
+++ b/deploy/eck-elasticsearch/templates/elasticsearch.yaml
@@ -53,18 +53,15 @@ spec:
   nodeSets:
 {{ toYaml .Values.nodeSets | nindent 4 }}
   {{- if .Values.image }}
-  image:
-    {{- toYaml .Values.image | nindent 4 }}
+  image: {{ .Values.image }}
   {{- end }}
   {{- if .Values.podDisruptionBudget }}
   podDisruptionBudget:
     {{- toYaml .Values.podDisruptionBudget | nindent 4 }}
   {{- end }}
   {{- if .Values.serviceAccountName }}
-  serviceAccountName:
-    {{- toYaml .Values.serviceAccountName | nindent 4 }}
+  serviceAccountName: {{ .Values.serviceAccountName }}
   {{- end }}
   {{- if .Values.revisionHistoryLimit }}
-  revisionHistoryLimit:
-    {{- toYaml .Values.revisionHistoryLimit | nindent 4 }}
+  revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
   {{- end }}

After changes:

❯ helm template eck-elasticsearch . --values ~/tmp/test-values.yaml -s templates/elasticsearch.yaml | yq e '.spec' -
version: 8.6.1
nodeSets:
  - config:
      node.store.allow_mmap: false
    count: 1
    name: default
    podTemplate:
      spec:
        containers:
          - name: elasticsearch
            resources:
              limits:
                memory: 2Gi
              requests:
                memory: 2Gi
image: my.registry.com/elastic/elasticsearch:8.7.0
podDisruptionBudget:
  spec:
    minAvailable: 2
    selector:
      matchLabels:
        elasticsearch.k8s.elastic.co/cluster-name: quickstart
serviceAccountName: my-serviceaccount
revisionHistoryLimit: 2

[thbkrkr]

I believe there's a slight issue in the templating

Indeed, thanks. This is what happens when you copy paste stupidly 🤦 .

[naemono]

yep, verified here as well. lgtm