diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml index d8692ab6a..d16552c0d 100644 --- a/elasticsearch/Chart.yaml +++ b/elasticsearch/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v7.6.2 description: OpenStack-Helm ElasticSearch name: elasticsearch -version: 0.2.22 +version: 0.2.23 home: https://www.elastic.co/ sources: - https://github.com/elastic/elasticsearch diff --git a/elasticsearch/templates/deployment-client.yaml b/elasticsearch/templates/deployment-client.yaml index ed66fd926..1f5b0a3d7 100644 --- a/elasticsearch/templates/deployment-client.yaml +++ b/elasticsearch/templates/deployment-client.yaml @@ -12,7 +12,7 @@ See the License for the specific language governing permissions and limitations under the License. */}} -{{- define "probeTemplate" }} +{{- define "readinessProbeTemplate" }} {{- $probePort := tuple "elasticsearch" "internal" "http" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} {{- $probeUser := .Values.endpoints.elasticsearch.auth.admin.username }} {{- $probePass := .Values.endpoints.elasticsearch.auth.admin.password }} @@ -25,6 +25,11 @@ httpGet: - name: Authorization value: Basic {{ $authHeader }} {{- end }} +{{- define "livenessProbeTemplate" }} +{{- $probePort := tuple "elasticsearch" "internal" "discovery" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} +tcpSocket: + port: {{ $probePort }} +{{- end }} {{- if .Values.manifests.deployment_client }} {{- $envAll := . }} @@ -143,12 +148,8 @@ spec: ports: - name: transport containerPort: {{ tuple "elasticsearch" "internal" "discovery" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} - livenessProbe: - tcpSocket: - port: {{ tuple "elasticsearch" "internal" "discovery" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} - initialDelaySeconds: 20 - periodSeconds: 10 -{{ dict "envAll" . "component" "elasticsearch" "container" "elasticsearch-client" "type" "readiness" "probeTemplate" (include "probeTemplate" . | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | indent 10 }} +{{ dict "envAll" . "component" "elasticsearch" "container" "elasticsearch-client" "type" "liveness" "probeTemplate" (include "livenessProbeTemplate" . | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | indent 10 }} +{{ dict "envAll" . "component" "elasticsearch" "container" "elasticsearch-client" "type" "readiness" "probeTemplate" (include "readinessProbeTemplate" . | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | indent 10 }} env: - name: NAMESPACE valueFrom: diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml index 0e8136acc..93e747541 100644 --- a/elasticsearch/values.yaml +++ b/elasticsearch/values.yaml @@ -297,6 +297,11 @@ pod: params: initialDelaySeconds: 30 timeoutSeconds: 30 + liveness: + enabled: true + params: + initialDelaySeconds: 30 + periodSeconds: 10 mounts: elasticsearch: elasticsearch: diff --git a/releasenotes/notes/elasticsearch.yaml b/releasenotes/notes/elasticsearch.yaml index 10c51ce16..af9c6f272 100644 --- a/releasenotes/notes/elasticsearch.yaml +++ b/releasenotes/notes/elasticsearch.yaml @@ -32,4 +32,5 @@ elasticsearch: - 0.2.20 Set default python for helm test - 0.2.21 Added OCI registry authentication - 0.2.22 Update all Ceph images to Focal + - 0.2.23 Add configurable liveness probe for elasticsearch client ...