Skip to content

Commit

Permalink
NXBT-3752: Update chart version to benefit from kubernetes object api…
Browse files Browse the repository at this point in the history
… version updates
  • Loading branch information
kevinleturc authored and troger committed Sep 21, 2023
1 parent e06d536 commit 1450f5b
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 2 deletions.
25 changes: 24 additions & 1 deletion ci/helm/helmfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,33 @@ releases:
- name: elasticsearch
chart: elastic/elasticsearch
condition: elasticsearch.enabled
version: 7.9.2
version: 7.17.3
values:
- values/values-elasticsearch.yaml.gotmpl
- values/values-tolerations.yaml.gotmpl
# Suppress some environment variables that can't be removed through values files that crash application startup
strategicMergePatches:
- apiVersion: apps/v1
kind: StatefulSet
metadata:
name: elasticsearch-master
spec:
template:
spec:
containers:
- name: elasticsearch
env:
{{ if eq .Environment.Name "functional-tests-10.10" }}
# The node.remote_cluster_client env var is set since ES 7.10 chart version, not working on ES 6.x application version
- name: node.remote_cluster_client
$patch: delete
{{ end }}
# The cluster.deprecation_indexing.enabled env var is set since ES 7.16 chart version, not working on our application version
- name: cluster.deprecation_indexing.enabled
$patch: delete
# The node.ml env var is set since ES 7.12 chart version, and it is not available in the oss version
- name: node.ml
$patch: delete
- name: opensearch
chart: opensearch/opensearch
condition: opensearch.enabled
Expand Down
2 changes: 1 addition & 1 deletion ci/helm/values/values-elasticsearch.yaml.gotmpl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
image: "docker.elastic.co/elasticsearch/elasticsearch-oss"
imageTag: {{ .Values.elasticsearch.imageTag }}
imageTag: {{ .Values | get "elasticsearch.imageTag" "7.9.2" }}
clusterName: elasticsearch
replicas: 1
minimumMasterNodes: 1
Expand Down

0 comments on commit 1450f5b

Please sign in to comment.