Skip to content

Commit 782ed02

Browse files
committed
[bitnami/elasticsearch] Adapt chart to Elasticserch version 7
1 parent 9fa4199 commit 782ed02

File tree

4 files changed

+15
-11
lines changed

4 files changed

+15
-11
lines changed

bitnami/elasticsearch/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
name: elasticsearch
3-
version: 4.7.2
4-
appVersion: 6.7.1
3+
version: 5.0.0
4+
appVersion: 7.0.0
55
description: A highly scalable open-source full-text search and analytics engine
66
keywords:
77
- elasticsearch

bitnami/elasticsearch/templates/master-deploy.yaml renamed to bitnami/elasticsearch/templates/master-statefulset.yaml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
apiVersion: extensions/v1beta1
2-
kind: Deployment
1+
apiVersion: apps/v1beta2
2+
kind: StatefulSet
33
metadata:
44
name: {{ template "elasticsearch.master.fullname" . }}
55
labels:
@@ -12,8 +12,9 @@ spec:
1212
selector:
1313
matchLabels:
1414
app: {{ template "elasticsearch.name" . }}
15-
release: "{{ .Release.Name }}"
15+
release: {{ .Release.Name | quote }}
1616
role: "master"
17+
serviceName: "{{ template "elasticsearch.master.fullname" . }}"
1718
replicas: {{ .Values.master.replicas }}
1819
template:
1920
metadata:
@@ -52,7 +53,6 @@ spec:
5253
{{- if .Values.master.nodeAffinity }}
5354
{{ toYaml .Values.master.nodeAffinity | indent 8 }}
5455
{{- end }}
55-
{{- include "elasticsearch.imagePullSecrets" . | indent 6 }}
5656
{{- if .Values.sysctlImage.enabled }}
5757
## Image that performs the sysctl operation to modify Kernel settings (needed sometimes to avoid boot errors)
5858
initContainers:
@@ -66,16 +66,20 @@ spec:
6666
containers:
6767
- name: "elasticsearch"
6868
image: {{ template "elasticsearch.image" . }}
69+
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
6970
{{- if .Values.securityContext.enabled }}
7071
securityContext:
7172
runAsUser: {{ .Values.securityContext.runAsUser }}
7273
{{- end }}
73-
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
7474
env:
7575
- name: ELASTICSEARCH_CLUSTER_NAME
7676
value: {{ .Values.name | quote }}
7777
- name: ELASTICSEARCH_CLUSTER_HOSTS
7878
value: {{ template "elasticsearch.discovery.fullname" . }}
79+
- name: ELASTICSEARCH_CLUSTER_MASTER_HOSTS
80+
{{- $elasticsearchMasterFullname := include "elasticsearch.master.fullname" . }}
81+
{{- $replicas := int .Values.master.replicas }}
82+
value: {{range $i, $e := until $replicas }}{{ $elasticsearchMasterFullname }}-{{ $e }} {{ end }}
7983
{{- if .Values.plugins }}
8084
- name: ELASTICSEARCH_PLUGINS
8185
value: {{ .Values.plugins | quote }}
@@ -110,7 +114,7 @@ spec:
110114
httpGet:
111115
path: /_cluster/health?local=true
112116
port: 9200
113-
{{- end }}
117+
{{- end }}
114118
resources:
115119
{{ toYaml .Values.master.resources | indent 10 }}
116120
volumeMounts:
@@ -128,4 +132,4 @@ spec:
128132
name: {{ template "elasticsearch.fullname" . }}
129133
{{- end }}
130134
- name: "data"
131-
emptyDir: {}
135+
emptyDir: {}

bitnami/elasticsearch/values-production.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
image:
1414
registry: docker.io
1515
repository: bitnami/elasticsearch
16-
tag: 6.7.1
16+
tag: 7.0.0
1717
## Specify a imagePullPolicy
1818
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
1919
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

bitnami/elasticsearch/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
image:
1414
registry: docker.io
1515
repository: bitnami/elasticsearch
16-
tag: 6.7.1
16+
tag: 7.0.0
1717
## Specify a imagePullPolicy
1818
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
1919
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

0 commit comments

Comments
 (0)