@leverege/build-tools 2.50.2 → 2.50.4

package/src/helm-charts/elasticsearch-helm-gke1.25/helm/templates/ingress.yaml

@@ -1,64 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "elasticsearch.uname" . -}}
-{{- $httpPort := .Values.httpPort -}}
-{{- $pathtype := .Values.ingress.pathtype -}}
-{{- $ingressPath := .Values.ingress.path -}}
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    app: {{ .Chart.Name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-{{- with .Values.ingress.annotations }}
-  annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
-spec:
-  {{- if .Values.ingress.className }}
-  ingressClassName: {{ .Values.ingress.className | quote }}
-  {{- end }}
-{{- if .Values.ingress.tls }}
-  tls:
-  {{- if .ingressPath }}
-  {{- range  .Values.ingress.tls }}
-  - hosts:
-    {{- range  .hosts }}
-      - {{ . }}
-    {{- end }}
-    secretName: {{ .secretName }}
-  {{- end }}
-{{- else }}
-{{ toYaml .Values.ingress.tls | indent 4 }}
-  {{- end }}
-{{- end}}
-  rules:
-  {{- range .Values.ingress.hosts }}
-    {{- if $ingressPath }}
-  - host: {{ . }}
-    http:
-      paths:
-      - path: {{ $ingressPath }}
-        pathType: {{ $pathtype }}
-        backend:
-          service:
-            name: {{ $fullName }}
-            port:
-              number: {{ $httpPort }}
-  {{- else }}
-  - host: {{ .host }}
-    http:
-      paths:
-      {{- range .paths }}
-      - path: {{ .path }}
-        pathType: {{ $pathtype }}
-        backend:
-          service:
-            name: {{ $fullName }}
-            port:
-              number: {{ .servicePort | default $httpPort }}
-      {{- end }}
-  {{- end }}
- {{- end }}
- {{- end }}

package/src/helm-charts/elasticsearch-helm-gke1.25/helm/templates/networkpolicy.yaml

@@ -1,61 +0,0 @@
-{{- if (or .Values.networkPolicy.http.enabled .Values.networkPolicy.transport.enabled) }}
-kind: NetworkPolicy
-apiVersion: networking.k8s.io/v1
-metadata:
-  name: {{ template "elasticsearch.uname" . }}
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
-    chart: "{{ .Chart.Name }}"
-    app: "{{ template "elasticsearch.uname" . }}"
-spec:
-  podSelector:
-    matchLabels:
-      app: "{{ template "elasticsearch.uname" . }}"
-  ingress:  # Allow inbound connections
-
-{{- if .Values.networkPolicy.http.enabled }}
-    # For HTTP access
-    - ports:
-      - port: {{ .Values.httpPort }}
-      from:
-        # From authorized Pods (having the correct label)
-        - podSelector:
-            matchLabels:
-              {{ template "elasticsearch.uname" . }}-http-client: "true"
-{{- with .Values.networkPolicy.http.explicitNamespacesSelector }}
-          # From authorized namespaces
-          namespaceSelector:
-{{ toYaml . | indent 12 }}
-{{- end }}
-{{- with .Values.networkPolicy.http.additionalRules }}
-            # Or from custom additional rules
-{{ toYaml . | indent 8 }}
-{{- end }}
-{{- end }}
-
-{{- if .Values.networkPolicy.transport.enabled }}
-    # For transport access
-    - ports:
-        - port: {{ .Values.transportPort }}
-      from:
-        # From authorized Pods (having the correct label)
-        - podSelector:
-            matchLabels:
-              {{ template "elasticsearch.uname" . }}-transport-client: "true"
-{{- with .Values.networkPolicy.transport.explicitNamespacesSelector }}
-          # From authorized namespaces
-          namespaceSelector:
-{{ toYaml . | indent 12 }}
-{{- end }}
-{{- with .Values.networkPolicy.transport.additionalRules }}
-        # Or from custom additional rules
-{{ toYaml . | indent 8 }}
-{{- end }}
-        # Or from other ElasticSearch Pods
-        - podSelector:
-            matchLabels:
-              app: "{{ template "elasticsearch.uname" . }}"
-{{- end }}
-
-{{- end }}

package/src/helm-charts/elasticsearch-helm-gke1.25/helm/templates/poddisruptionbudget.yaml

@@ -1,12 +0,0 @@
----
-{{- if .Values.maxUnavailable }}
-apiVersion: policy/v1
-kind: PodDisruptionBudget
-metadata:
-  name: "{{ template "elasticsearch.uname" . }}-pdb"
-spec:
-  maxUnavailable: {{ .Values.maxUnavailable }}
-  selector:
-    matchLabels:
-      app: "{{ template "elasticsearch.uname" . }}"
-{{- end }}

package/src/helm-charts/elasticsearch-helm-gke1.25/helm/templates/podsecuritypolicy.yaml

@@ -1,14 +0,0 @@
-{{- if .Values.podSecurityPolicy.create -}}
-{{- $fullName := include "elasticsearch.uname" . -}}
-apiVersion: policy/v1beta1
-kind: PodSecurityPolicy
-metadata:
-  name: {{ default $fullName .Values.podSecurityPolicy.name | quote }}
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    app: {{ $fullName | quote }}
-spec:
-{{ toYaml .Values.podSecurityPolicy.spec | indent 2 }}
-{{- end -}}

package/src/helm-charts/elasticsearch-helm-gke1.25/helm/templates/role.yaml

@@ -1,25 +0,0 @@
-{{- if .Values.rbac.create -}}
-{{- $fullName := include "elasticsearch.uname" . -}}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ $fullName | quote }}
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    app: {{ $fullName | quote }}
-rules:
-  - apiGroups:
-      - extensions
-    resources:
-      - podsecuritypolicies
-    resourceNames:
-      {{- if eq .Values.podSecurityPolicy.name "" }}
-      - {{ $fullName | quote }}
-      {{- else }}
-      - {{ .Values.podSecurityPolicy.name | quote }}
-      {{- end }}
-    verbs:
-      - use
-{{- end -}}

package/src/helm-charts/elasticsearch-helm-gke1.25/helm/templates/rolebinding.yaml

@@ -1,24 +0,0 @@
-{{- if .Values.rbac.create -}}
-{{- $fullName := include "elasticsearch.uname" . -}}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ $fullName | quote }}
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    app: {{ $fullName | quote }}
-subjects:
-  - kind: ServiceAccount
-    {{- if eq .Values.rbac.serviceAccountName "" }}
-    name: {{ $fullName | quote }}
-    {{- else }}
-    name: {{ .Values.rbac.serviceAccountName | quote }}
-    {{- end }}
-    namespace: {{ .Release.Namespace | quote }}
-roleRef:
-  kind: Role
-  name: {{ $fullName | quote }}
-  apiGroup: rbac.authorization.k8s.io
-{{- end -}}

package/src/helm-charts/elasticsearch-helm-gke1.25/helm/templates/service.yaml

@@ -1,76 +0,0 @@
-{{- if .Values.service.enabled -}}
-kind: Service
-apiVersion: v1
-metadata:
-{{- if eq .Values.nodeGroup "master" }}
-  name: {{ template "elasticsearch.masterService" . }}
-{{- else }}
-  name: {{ template "elasticsearch.uname" . }}
-{{- end }}
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
-    chart: "{{ .Chart.Name }}"
-    app: "{{ template "elasticsearch.uname" . }}"
-{{- if .Values.service.labels }}
-{{ toYaml .Values.service.labels | indent 4}}
-{{- end }}
-  annotations:
-{{ toYaml .Values.service.annotations | indent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  selector:
-    release: {{ .Release.Name | quote }}
-    chart: "{{ .Chart.Name }}"
-    app: "{{ template "elasticsearch.uname" . }}"
-  ports:
-  - name: {{ .Values.service.httpPortName | default "http" }}
-    protocol: TCP
-    port: {{ .Values.httpPort }}
-{{- if .Values.service.nodePort }}
-    nodePort: {{ .Values.service.nodePort }}
-{{- end }}
-  - name: {{ .Values.service.transportPortName | default "transport" }}
-    protocol: TCP
-    port: {{ .Values.transportPort }}
-{{- if .Values.service.loadBalancerIP }}
-  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
-{{- end }}
-{{- with .Values.service.loadBalancerSourceRanges }}
-  loadBalancerSourceRanges:
-{{ toYaml . | indent 4 }}
-{{- end }}
-{{- if .Values.service.externalTrafficPolicy }}
-  externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
-{{- end }}
-{{- end }}
----
-kind: Service
-apiVersion: v1
-metadata:
-{{- if eq .Values.nodeGroup "master" }}
-  name: {{ template "elasticsearch.masterService" . }}-headless
-{{- else }}
-  name: {{ template "elasticsearch.uname" . }}-headless
-{{- end }}
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
-    chart: "{{ .Chart.Name }}"
-    app: "{{ template "elasticsearch.uname" . }}"
-{{- if .Values.service.labelsHeadless }}
-{{ toYaml .Values.service.labelsHeadless | indent 4 }}
-{{- end }}
-  annotations:
-    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
-spec:
-  clusterIP: None # This is needed for statefulset hostnames like elasticsearch-0 to resolve
-  # Create endpoints also if the related pod isn't ready
-  publishNotReadyAddresses: true
-  selector:
-    app: "{{ template "elasticsearch.uname" . }}"
-  ports:
-  - name: {{ .Values.service.httpPortName | default "http" }}
-    port: {{ .Values.httpPort }}
-  - name: {{ .Values.service.transportPortName | default "transport" }}
-    port: {{ .Values.transportPort }}

package/src/helm-charts/elasticsearch-helm-gke1.25/helm/templates/serviceaccount.yaml

@@ -1,20 +0,0 @@
-{{- if .Values.rbac.create -}}
-{{- $fullName := include "elasticsearch.uname" . -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  {{- if eq .Values.rbac.serviceAccountName "" }}
-  name: {{ $fullName | quote }}
-  {{- else }}
-  name: {{ .Values.rbac.serviceAccountName | quote }}
-  {{- end }}
-  annotations:
-    {{- with .Values.rbac.serviceAccountAnnotations }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    app: {{ $fullName | quote }}
-{{- end -}}

package/src/helm-charts/elasticsearch-helm-gke1.25/helm/templates/statefulset.yaml

@@ -1,390 +0,0 @@
----
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: {{ template "elasticsearch.uname" . }}
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
-    chart: "{{ .Chart.Name }}"
-    app: "{{ template "elasticsearch.uname" . }}"
-    {{- range $key, $value := .Values.labels }}
-    {{ $key }}: {{ $value | quote }}
-    {{- end }}
-  annotations:
-    esMajorVersion: "{{ include "elasticsearch.esMajorVersion" . }}"
-spec:
-  serviceName: {{ template "elasticsearch.uname" . }}-headless
-  selector:
-    matchLabels:
-      app: "{{ template "elasticsearch.uname" . }}"
-  replicas: {{ .Values.replicas }}
-  podManagementPolicy: {{ .Values.podManagementPolicy }}
-  updateStrategy:
-    type: {{ .Values.updateStrategy }}
-  {{- if .Values.persistence.enabled }}
-  volumeClaimTemplates:
-  - metadata:
-      name: {{ template "elasticsearch.uname" . }}
-    {{- if .Values.persistence.labels.enabled }}
-      labels:
-        release: {{ .Release.Name | quote }}
-        chart: "{{ .Chart.Name }}"
-        app: "{{ template "elasticsearch.uname" . }}"
-        {{- range $key, $value := .Values.labels }}
-        {{ $key }}: {{ $value | quote }}
-        {{- end }}
-    {{- end }}
-    {{- with .Values.persistence.annotations  }}
-      annotations:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    spec:
-{{ toYaml .Values.volumeClaimTemplate | indent 6 }}
-  {{- end }}
-  template:
-    metadata:
-      name: "{{ template "elasticsearch.uname" . }}"
-      labels:
-        release: {{ .Release.Name | quote }}
-        chart: "{{ .Chart.Name }}"
-        app: "{{ template "elasticsearch.uname" . }}"
-        {{- range $key, $value := .Values.labels }}
-        {{ $key }}: {{ $value | quote }}
-        {{- end }}
-      annotations:
-        {{- range $key, $value := .Values.podAnnotations }}
-        {{ $key }}: {{ $value | quote }}
-        {{- end }}
-        {{/* This forces a restart if the configmap has changed */}}
-        {{- if or .Values.esConfig .Values.esJvmOptions }}
-        configchecksum: {{ include (print .Template.BasePath "/configmap.yaml") . | sha256sum | trunc 63 }}
-        {{- end }}
-    spec:
-      {{- if .Values.schedulerName }}
-      schedulerName: "{{ .Values.schedulerName }}"
-      {{- end }}
-      securityContext:
-{{ toYaml .Values.podSecurityContext | indent 8 }}
-        {{- if .Values.fsGroup }}
-        fsGroup: {{ .Values.fsGroup }} # Deprecated value, please use .Values.podSecurityContext.fsGroup
-        {{- end }}
-      {{- if .Values.rbac.create }}
-      serviceAccountName: "{{ template "elasticsearch.uname" . }}"
-      {{- else if not (eq .Values.rbac.serviceAccountName "") }}
-      serviceAccountName: {{ .Values.rbac.serviceAccountName | quote }}
-      {{- end }}
-      automountServiceAccountToken: {{ .Values.rbac.automountToken }}
-      {{- with .Values.tolerations }}
-      tolerations:
-{{ toYaml . | indent 6 }}
-      {{- end }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
-      {{- end }}
-      {{- if or (eq .Values.antiAffinity "hard") (eq .Values.antiAffinity "soft") .Values.nodeAffinity }}
-      {{- if .Values.priorityClassName }}
-      priorityClassName: {{ .Values.priorityClassName }}
-      {{- end }}
-      affinity:
-      {{- end }}
-      {{- if eq .Values.antiAffinity "hard" }}
-        podAntiAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-          - labelSelector:
-              matchExpressions:
-              - key: app
-                operator: In
-                values:
-                - "{{ template "elasticsearch.uname" .}}"
-            topologyKey: {{ .Values.antiAffinityTopologyKey }}
-      {{- else if eq .Values.antiAffinity "soft" }}
-        podAntiAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 1
-            podAffinityTerm:
-              topologyKey: {{ .Values.antiAffinityTopologyKey }}
-              labelSelector:
-                matchExpressions:
-                - key: app
-                  operator: In
-                  values:
-                  - "{{ template "elasticsearch.uname" . }}"
-      {{- end }}
-      {{- with .Values.nodeAffinity }}
-        nodeAffinity:
-{{ toYaml . | indent 10 }}
-      {{- end }}
-      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriod }}
-      volumes:
-        {{- range .Values.secretMounts }}
-        - name: {{ .name }}
-          secret:
-            secretName: {{ .secretName }}
-            {{- if .defaultMode }}
-            defaultMode: {{ .defaultMode }}
-            {{- end }}
-        {{- end }}
-        {{- if .Values.esConfig }}
-        - name: esconfig
-          configMap:
-            name: {{ template "elasticsearch.uname" . }}-config
-        {{- end }}
-        {{- if .Values.esJvmOptions }}
-        - name: esjvmoptions
-          configMap:
-            name: {{ template "elasticsearch.uname" . }}-jvm-options
-        {{- end }}
-{{- if .Values.keystore }}
-        - name: keystore
-          emptyDir: {}
-        {{- range .Values.keystore }}
-        - name: keystore-{{ .secretName }}
-          secret: {{ toYaml . | nindent 12 }}
-        {{- end }}
-{{ end }}
-      {{- if .Values.extraVolumes }}
-      # Currently some extra blocks accept strings
-      # to continue with backwards compatibility this is being kept
-      # whilst also allowing for yaml to be specified too.
-      {{- if eq "string" (printf "%T" .Values.extraVolumes) }}
-{{ tpl .Values.extraVolumes . | indent 8 }}
-      {{- else }}
-{{ toYaml .Values.extraVolumes | indent 8 }}
-      {{- end }}
-      {{- end }}
-      {{- if .Values.imagePullSecrets }}
-      imagePullSecrets:
-{{ toYaml .Values.imagePullSecrets | indent 8 }}
-      {{- end }}
-      enableServiceLinks: {{ .Values.enableServiceLinks }}
-      {{- if .Values.hostAliases }}
-      hostAliases: {{ toYaml .Values.hostAliases | nindent 8 }}
-      {{- end }}
-      {{- if or (.Values.extraInitContainers) (.Values.sysctlInitContainer.enabled) (.Values.keystore)  }}
-      initContainers:
-      {{- if .Values.sysctlInitContainer.enabled }}
-      - name: configure-sysctl
-        securityContext:
-          runAsUser: 0
-          privileged: true
-        image: "{{ .Values.image }}:{{ .Values.imageTag }}"
-        imagePullPolicy: "{{ .Values.imagePullPolicy }}"
-        command: ["sysctl", "-w", "vm.max_map_count={{ .Values.sysctlVmMaxMapCount}}"]
-        resources:
-{{ toYaml .Values.initResources | indent 10 }}
-      {{- end }}
-{{ if .Values.keystore }}
-      - name: keystore
-        image: "{{ .Values.image }}:{{ .Values.imageTag }}"
-        imagePullPolicy: "{{ .Values.imagePullPolicy }}"
-        command:
-        - bash
-        - -c
-        - |
-          set -euo pipefail
-
-          elasticsearch-keystore create
-
-          for i in /tmp/keystoreSecrets/*/*; do
-            key=$(basename $i)
-            echo "Adding file $i to keystore key $key"
-            elasticsearch-keystore add-file "$key" "$i"
-          done
-
-          # Add the bootstrap password since otherwise the Elasticsearch entrypoint tries to do this on startup
-          if [ ! -z ${ELASTIC_PASSWORD+x} ]; then
-            echo 'Adding env $ELASTIC_PASSWORD to keystore as key bootstrap.password'
-            echo "$ELASTIC_PASSWORD" | elasticsearch-keystore add -x bootstrap.password
-          fi
-
-          cp -a /usr/share/elasticsearch/config/elasticsearch.keystore /tmp/keystore/
-        env: {{ toYaml .Values.extraEnvs | nindent 10 }}
-        envFrom: {{ toYaml .Values.envFrom | nindent 10 }}
-        resources: {{ toYaml .Values.initResources | nindent 10 }}
-        volumeMounts:
-          - name: keystore
-            mountPath: /tmp/keystore
-          {{- range .Values.keystore }}
-          - name: keystore-{{ .secretName }}
-            mountPath: /tmp/keystoreSecrets/{{ .secretName }}
-          {{- end }}
-{{ end }}
-      {{- if .Values.extraInitContainers }}
-      # Currently some extra blocks accept strings
-      # to continue with backwards compatibility this is being kept
-      # whilst also allowing for yaml to be specified too.
-      {{- if eq "string" (printf "%T" .Values.extraInitContainers) }}
-{{ tpl .Values.extraInitContainers . | indent 6 }}
-      {{- else }}
-{{ toYaml .Values.extraInitContainers | indent 6 }}
-      {{- end }}
-      {{- end }}
-      {{- end }}
-      containers:
-      - name: "{{ template "elasticsearch.name" . }}"
-        securityContext:
-{{ toYaml .Values.securityContext | indent 10 }}
-        image: "{{ .Values.image }}:{{ .Values.imageTag }}"
-        imagePullPolicy: "{{ .Values.imagePullPolicy }}"
-        readinessProbe:
-          exec:
-            command:
-              - bash
-              - -c
-              - |
-                set -e
-                # If the node is starting up wait for the cluster to be ready (request params: "{{ .Values.clusterHealthCheckParams }}" )
-                # Once it has started only check that the node itself is responding
-                START_FILE=/tmp/.es_start_file
-
-                # Disable nss cache to avoid filling dentry cache when calling curl
-                # This is required with Elasticsearch Docker using nss < 3.52
-                export NSS_SDB_USE_CACHE=no
-
-                http () {
-                  local path="${1}"
-                  local args="${2}"
-                  set -- -XGET -s
-
-                  if [ "$args" != "" ]; then
-                    set -- "$@" $args
-                  fi
-
-                  if [ -n "${ELASTIC_PASSWORD}" ]; then
-                    set -- "$@" -u "elastic:${ELASTIC_PASSWORD}"
-                  fi
-
-                  curl --output /dev/null -k "$@" "{{ .Values.protocol }}://127.0.0.1:{{ .Values.httpPort }}${path}"
-                }
-
-                if [ -f "${START_FILE}" ]; then
-                  echo 'Elasticsearch is already running, lets check the node is healthy'
-                  HTTP_CODE=$(http "/" "-w %{http_code}")
-                  RC=$?
-                  if [[ ${RC} -ne 0 ]]; then
-                    echo "curl --output /dev/null -k -XGET -s -w '%{http_code}' \${BASIC_AUTH} {{ .Values.protocol }}://127.0.0.1:{{ .Values.httpPort }}/ failed with RC ${RC}"
-                    exit ${RC}
-                  fi
-                  # ready if HTTP code 200, 503 is tolerable if ES version is 6.x
-                  if [[ ${HTTP_CODE} == "200" ]]; then
-                    exit 0
-                  elif [[ ${HTTP_CODE} == "503" && "{{ include "elasticsearch.esMajorVersion" . }}" == "6" ]]; then
-                    exit 0
-                  else
-                    echo "curl --output /dev/null -k -XGET -s -w '%{http_code}' \${BASIC_AUTH} {{ .Values.protocol }}://127.0.0.1:{{ .Values.httpPort }}/ failed with HTTP code ${HTTP_CODE}"
-                    exit 1
-                  fi
-
-                else
-                  echo 'Waiting for elasticsearch cluster to become ready (request params: "{{ .Values.clusterHealthCheckParams }}" )'
-                  if http "/_cluster/health?{{ .Values.clusterHealthCheckParams }}" "--fail" ; then
-                    touch ${START_FILE}
-                    exit 0
-                  else
-                    echo 'Cluster is not yet ready (request params: "{{ .Values.clusterHealthCheckParams }}" )'
-                    exit 1
-                  fi
-                fi
-{{ toYaml .Values.readinessProbe | indent 10 }}
-        ports:
-        - name: http
-          containerPort: {{ .Values.httpPort }}
-        - name: transport
-          containerPort: {{ .Values.transportPort }}
-        resources:
-{{ toYaml .Values.resources | indent 10 }}
-        env:
-          - name: node.name
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.name
-          {{- if eq .Values.roles.master "true" }}
-          {{- if ge (int (include "elasticsearch.esMajorVersion" .)) 7 }}
-          - name: cluster.initial_master_nodes
-            value: "{{ template "elasticsearch.endpoints" . }}"
-          {{- else }}
-          - name: discovery.zen.minimum_master_nodes
-            value: "{{ .Values.minimumMasterNodes }}"
-          {{- end }}
-          {{- end }}
-          {{- if lt (int (include "elasticsearch.esMajorVersion" .)) 7 }}
-          - name: discovery.zen.ping.unicast.hosts
-            value: "{{ template "elasticsearch.masterService" . }}-headless"
-          {{- else }}
-          - name: discovery.seed_hosts
-            value: "{{ template "elasticsearch.masterService" . }}-headless"
-          {{- end }}
-          - name: cluster.name
-            value: "{{ .Values.clusterName }}"
-          - name: network.host
-            value: "{{ .Values.networkHost }}"
-          - name: cluster.deprecation_indexing.enabled
-            value: "{{ .Values.clusterDeprecationIndexing }}"
-          {{- if .Values.esJavaOpts  }}
-          - name: ES_JAVA_OPTS
-            value: "{{ .Values.esJavaOpts }}"
-          {{- end }}
-          {{- range $role, $enabled := .Values.roles }}
-          - name: node.{{ $role }}
-            value: "{{ $enabled }}"
-          {{- end }}
-{{- if .Values.extraEnvs }}
-{{ toYaml .Values.extraEnvs | indent 10 }}
-{{- end }}
-{{- if .Values.envFrom }}
-        envFrom:
-{{ toYaml .Values.envFrom | indent 10 }}
-{{- end }}
-        volumeMounts:
-          {{- if .Values.persistence.enabled }}
-          - name: "{{ template "elasticsearch.uname" . }}"
-            mountPath: /usr/share/elasticsearch/data
-          {{- end }}
-{{ if .Values.keystore }}
-          - name: keystore
-            mountPath: /usr/share/elasticsearch/config/elasticsearch.keystore
-            subPath: elasticsearch.keystore
-{{ end }}
-          {{- range .Values.secretMounts }}
-          - name: {{ .name }}
-            mountPath: {{ .path }}
-            {{- if .subPath }}
-            subPath: {{ .subPath }}
-            {{- end }}
-          {{- end }}
-          {{- range $path, $config := .Values.esConfig }}
-          - name: esconfig
-            mountPath: /usr/share/elasticsearch/config/{{ $path }}
-            subPath: {{ $path }}
-          {{- end -}}
-          {{- range $path, $config := .Values.esJvmOptions }}
-          - name: esjvmoptions
-            mountPath: /usr/share/elasticsearch/config/jvm.options.d/{{ $path }}
-            subPath: {{ $path }}
-          {{- end -}}
-        {{- if .Values.extraVolumeMounts }}
-        # Currently some extra blocks accept strings
-        # to continue with backwards compatibility this is being kept
-        # whilst also allowing for yaml to be specified too.
-        {{- if eq "string" (printf "%T" .Values.extraVolumeMounts) }}
-{{ tpl .Values.extraVolumeMounts . | indent 10 }}
-        {{- else }}
-{{ toYaml .Values.extraVolumeMounts | indent 10 }}
-        {{- end }}
-        {{- end }}
-{{- if .Values.lifecycle }}
-        lifecycle:
-{{ toYaml .Values.lifecycle | indent 10 }}
-{{- end }}
-      {{- if .Values.extraContainers }}
-      # Currently some extra blocks accept strings
-      # to continue with backwards compatibility this is being kept
-      # whilst also allowing for yaml to be specified too.
-      {{- if eq "string" (printf "%T" .Values.extraContainers) }}
-{{ tpl .Values.extraContainers . | indent 6 }}
-      {{- else }}
-{{ toYaml .Values.extraContainers | indent 6 }}
-      {{- end }}
-      {{- end }}