Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

[stable/elasticsearch] Elasticsearch v7.1.1 #14535

Closed
wants to merge 6 commits into from
Closed

[stable/elasticsearch] Elasticsearch v7.1.1 #14535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0134acc
add support for elasticsearch v7
Jun 5, 2019
efdd02f
fix range for cluster.initial_master_nodes; fix documentation
Jun 5, 2019
713768d
[stable/elasticsearch] add readme for upgrading to es 7; bump to vers…
Jun 6, 2019
fa5d396
[stable/elasticsearch] resolve conflict
Jun 6, 2019
42bde95
merge and resolve conflicts
Jun 7, 2019
d82baf2
fix version and image.tag in readme
Jun 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions stable/elasticsearch/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
name: elasticsearch
home: https://www.elastic.co/products/elasticsearch
version: 1.28.2
appVersion: 6.7.0
version: 1.29.0
Copy link
Contributor

@t-d-d t-d-d Jun 6, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that you can't do a rolling update from 6.7 to 7.* . So should this be a major version bump? I'm not sure. But at least there should be some documentation in the readme. https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-upgrade.html

Copy link
Contributor Author

@tetianakravchenko tetianakravchenko Jun 6, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@t-d-d thank you for pointing it out! I've added readme and bumped version to 6.8, as I mentioned it in the readme as a version supported to perform update (6.8 to 7.1) 713768d

appVersion: 6.8.0
description: Flexible and powerful open source, distributed real-time search and analytics
engine.
icon: https://static-www.elastic.co/assets/blteb1c97719574938d/logo-elastic-elasticsearch-lt.svg
Expand Down
7 changes: 5 additions & 2 deletions stable/elasticsearch/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ If you are currently using an earlier version of this Chart you will need to red
If you are upgrading to Elasticsearch 6 from the 5.5 version used in this chart before, please note that your cluster needs to do a full cluster restart.
The simplest way to do that is to delete the installation (keep the PVs) and install this chart again with the new version.
If you want to avoid doing that upgrade to Elasticsearch 5.6 first before moving on to Elasticsearch 6.0.
If you are upgrading to Elasticsearch 7 from the versions previous to 6.8 version, please note that your cluster needs to do a full cluster restart.
The simplest way to do that is to delete the installation (keep the PVs) and install this chart again with the new version.
If you want to avoid doing that upgrade to Elasticsearch 6.8 first before moving on to Elasticsearch 7.1.

## Prerequisites Details

Expand Down Expand Up @@ -61,9 +64,9 @@ The following table lists the configurable parameters of the elasticsearch chart

| Parameter | Description | Default |
| ------------------------------------ | ------------------------------------------------------------------- | --------------------------------------------------- |
| `appVersion` | Application Version (Elasticsearch) | `6.7.0` |
| `appVersion` | Application Version (Elasticsearch) | `6.8.0` |
| `image.repository` | Container image name | `docker.elastic.co/elasticsearch/elasticsearch-oss` |
| `image.tag` | Container image tag | `6.7.0` |
| `image.tag` | Container image tag | `6.8.0` |
| `image.pullPolicy` | Container pull policy | `IfNotPresent` |
| `initImage.repository` | Init container image name | `busybox` |
| `initImage.tag` | Init container image tag | `latest` |
Expand Down
4 changes: 2 additions & 2 deletions stable/elasticsearch/templates/client-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ spec:
env:
- name: NODE_DATA
value: "false"
{{- if hasPrefix "5." .Values.appVersion }}
{{- if or (hasPrefix "5." .Values.appVersion) (hasPrefix "6." .Values.appVersion) (hasPrefix "7." .Values.appVersion) }}
- name: NODE_INGEST
value: "false"
{{- end }}
Expand Down Expand Up @@ -144,7 +144,7 @@ spec:
name: config
subPath: logging.yml
{{- end }}
{{- if hasPrefix "5." .Values.appVersion }}
{{- if or (hasPrefix "5." .Values.appVersion) (hasPrefix "6." .Values.appVersion) (hasPrefix "7." .Values.appVersion) }}
- mountPath: /usr/share/elasticsearch/config/log4j2.properties
name: config
subPath: log4j2.properties
Expand Down
26 changes: 23 additions & 3 deletions stable/elasticsearch/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ data:

node.data: ${NODE_DATA:true}
node.master: ${NODE_MASTER:true}
{{- if hasPrefix "5." .Values.appVersion }}
node.ingest: ${NODE_INGEST:true}
{{- else if hasPrefix "6." .Values.appVersion }}
{{- if or (hasPrefix "5." .Values.appVersion) (hasPrefix "6." .Values.appVersion) (hasPrefix "7." .Values.appVersion) }}
node.ingest: ${NODE_INGEST:true}
{{- end }}
node.name: ${HOSTNAME}
Expand Down Expand Up @@ -76,6 +74,28 @@ data:
xpack.security.enabled: ${XPACK_SECURITY_ENABLED:false}
xpack.watcher.enabled: ${XPACK_WATCHER_ENABLED:false}
{{- end }}

{{- else if hasPrefix "7." .Values.appVersion }}
# see https://github.com/kubernetes/kubernetes/issues/3595
bootstrap.memory_lock: ${BOOTSTRAP_MEMORY_LOCK:false}

discovery.seed_hosts: ${DISCOVERY_SERVICE:}

cluster.initial_master_nodes:
{{- range $i := until (int .Values.master.replicas) }}
- {{ template "elasticsearch.master.fullname" $ }}-{{ $i }}
{{- end }}

{{- if .Values.cluster.xpackEnable }}
# see https://www.elastic.co/guide/en/x-pack/current/xpack-settings.html
# After 6.3 xpack systems changed and are enabled by default and different configs manage them this enables monitoring
xpack.monitoring.collection.enabled: ${XPACK_MONITORING_ENABLED:false}
xpack.ml.enabled: ${XPACK_ML_ENABLED:false}
xpack.monitoring.enabled: ${XPACK_MONITORING_ENABLED:false}
xpack.security.enabled: ${XPACK_SECURITY_ENABLED:false}
xpack.watcher.enabled: ${XPACK_WATCHER_ENABLED:false}
{{- end }}

{{- end }}

# see https://github.com/elastic/elasticsearch-definitive-guide/pull/679
Expand Down
2 changes: 1 addition & 1 deletion stable/elasticsearch/templates/data-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ spec:
name: config
subPath: logging.yml
{{- end }}
{{- if hasPrefix "5." .Values.appVersion }}
{{- if or (hasPrefix "5." .Values.appVersion) (hasPrefix "6." .Values.appVersion) (hasPrefix "7." .Values.appVersion) }}
- mountPath: /usr/share/elasticsearch/config/log4j2.properties
name: config
subPath: log4j2.properties
Expand Down
4 changes: 2 additions & 2 deletions stable/elasticsearch/templates/master-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ spec:
env:
- name: NODE_DATA
value: "false"
{{- if hasPrefix "5." .Values.appVersion }}
{{- if or (hasPrefix "5." .Values.appVersion) (hasPrefix "6." .Values.appVersion) (hasPrefix "7." .Values.appVersion) }}
- name: NODE_INGEST
value: "false"
{{- end }}
Expand Down Expand Up @@ -169,7 +169,7 @@ spec:
name: config
subPath: logging.yml
{{- end }}
{{- if hasPrefix "5." .Values.appVersion }}
{{- if or (hasPrefix "5." .Values.appVersion) (hasPrefix "6." .Values.appVersion) (hasPrefix "7." .Values.appVersion) }}
- mountPath: /usr/share/elasticsearch/config/log4j2.properties
name: config
subPath: log4j2.properties
Expand Down
4 changes: 2 additions & 2 deletions stable/elasticsearch/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Default values for elasticsearch.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
appVersion: "6.7.0"
appVersion: "6.8.0"

## Define serviceAccount names for components. Defaults to component's fully qualified name.
##
Expand Down Expand Up @@ -42,7 +42,7 @@ securityContext:

image:
repository: "docker.elastic.co/elasticsearch/elasticsearch-oss"
tag: "6.7.0"
tag: "6.8.0"
pullPolicy: "IfNotPresent"
# If specified, use these secrets to access the image
# pullSecrets:
Expand Down