[bitnami/elasticsearch] Simplify sysctl logic (#5685)

Author: Carlos Rodríguez Hernández

bitnami/elasticsearch/Chart.yaml

@@ -25,4 +25,4 @@ name: elasticsearch
 sources:
   - https://github.com/bitnami/bitnami-docker-elasticsearch
   - https://www.elastic.co/products/elasticsearch
-version: 14.3.1
+version: 14.4.0

bitnami/elasticsearch/templates/configmap-initcontainer.yaml

@@ -62,16 +62,15 @@ spec:
           image: {{ include "elasticsearch.sysctl.image" . }}
           imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
           command:
-            - /scripts/sysctl.sh
+            - /bin/bash
+            - -ec
+            - |
+              sysctl -w vm.max_map_count=262144 && sysctl -w fs.file-max=65536
           securityContext:
             privileged: true
           {{- if .Values.sysctlImage.resources }}
           resources: {{- toYaml .Values.sysctlImage.resources | nindent 12 }}
           {{- end }}
-          volumeMounts:
-            - name: initcontainer-script
-              mountPath: /scripts/sysctl.sh
-              subPath: sysctl.sh
       {{- end }}
       containers:
         - name: elasticsearch
@@ -168,12 +167,6 @@ spec:
               mountPath: /docker-entrypoint-initdb.d/init-scripts-secret
             {{- end }}
       volumes:
-        {{- if .Values.sysctlImage.enabled }}
-        - name: initcontainer-script
-          configMap:
-            name: {{ include "elasticsearch.fullname" . }}-initcontainer
-            defaultMode: 0755
-        {{- end }}
         {{- if .Values.config }}
         - name: config
           configMap:

bitnami/elasticsearch/templates/coordinating-deploy.yaml

@@ -68,16 +68,15 @@ spec:
           image: {{ include "elasticsearch.sysctl.image" . }}
           imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
           command:
-            - /scripts/sysctl.sh
+            - /bin/bash
+            - -ec
+            - |
+              sysctl -w vm.max_map_count=262144 && sysctl -w fs.file-max=65536
           securityContext:
             privileged: true
           {{- if .Values.sysctlImage.resources }}
           resources: {{- toYaml .Values.sysctlImage.resources | nindent 12 }}
           {{- end }}
-          volumeMounts:
-            - name: initcontainer-script
-              mountPath: /scripts/sysctl.sh
-              subPath: sysctl.sh
         {{- end }}
         {{- if and .Values.volumePermissions.enabled .Values.data.persistence.enabled }}
         - name: volume-permissions
@@ -197,12 +196,6 @@ spec:
               mountPath: /docker-entrypoint-initdb.d/init-scripts-secret
             {{- end }}
       volumes:
-        {{- if .Values.sysctlImage.enabled }}
-        - name: initcontainer-script
-          configMap:
-            name: {{ include "elasticsearch.fullname" . }}-initcontainer
-            defaultMode: 0755
-        {{- end }}
         {{- if .Values.config }}
         - name: "config"
           configMap:

bitnami/elasticsearch/templates/data-statefulset.yaml

@@ -57,13 +57,15 @@ spec:
           image: {{ include "elasticsearch.sysctl.image" . }}
           imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
           command:
-            - /scripts/sysctl.sh
+            - /bin/bash
+            - -ec
+            - |
+              sysctl -w vm.max_map_count=262144 && sysctl -w fs.file-max=65536
           securityContext:
             privileged: true
-          volumeMounts:
-            - name: initcontainer-script
-              mountPath: /scripts/sysctl.sh
-              subPath: sysctl.sh
+          {{- if .Values.sysctlImage.resources }}
+          resources: {{- toYaml .Values.sysctlImage.resources | nindent 12 }}
+          {{- end }}
       {{- end }}
       containers:
         - name: elasticsearch
@@ -160,12 +162,6 @@ spec:
               mountPath: /docker-entrypoint-initdb.d/init-scripts-secret
             {{- end }}
       volumes:
-        {{- if .Values.sysctlImage.enabled }}
-        - name: initcontainer-script
-          configMap:
-            name: {{ include "elasticsearch.fullname" . }}-initcontainer
-            defaultMode: 0755
-        {{- end }}
         {{- if .Values.config }}
         - name: config
           configMap:

bitnami/elasticsearch/templates/ingest-deploy.yaml

@@ -65,16 +65,15 @@ spec:
           image: {{ include "elasticsearch.sysctl.image" . }}
           imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
           command:
-            - /scripts/sysctl.sh
+            - /bin/bash
+            - -ec
+            - |
+              sysctl -w vm.max_map_count=262144 && sysctl -w fs.file-max=65536
           securityContext:
             privileged: true
           {{- if .Values.sysctlImage.resources }}
           resources: {{- toYaml .Values.sysctlImage.resources | nindent 12 }}
           {{- end }}
-          volumeMounts:
-            - name: initcontainer-script
-              mountPath: /scripts/sysctl.sh
-              subPath: sysctl.sh
         {{- end }}
         {{- if and .Values.volumePermissions.enabled .Values.master.persistence.enabled }}
         - name: volume-permissions
@@ -200,12 +199,6 @@ spec:
               mountPath: /docker-entrypoint-initdb.d/init-scripts-secret
             {{- end }}
       volumes:
-        {{- if .Values.sysctlImage.enabled }}
-        - name: initcontainer-script
-          configMap:
-            name: {{ include "elasticsearch.fullname" . }}-initcontainer
-            defaultMode: 0755
-        {{- end }}
         {{- if .Values.config }}
         - name: config
           configMap: