Skip to content

Commit 86a13a9

Browse files
Rade333Rade333
committed
Drupal: Added support for Elasticsearch 8.
1 parent bb2d62f commit 86a13a9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+1332
-852
lines changed

‎drupal/Chart.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ dependencies:
1616
version: 5.1.0
1717
- name: elasticsearch
1818
repository: file://../elasticsearch
19-
version: 7.8.1
19+
version: 8.5.1
2020
- name: silta-release
2121
repository: file://../silta-release
2222
version: 0.1.1
23-
digest: sha256:c3512a904de793d2705c98da4735d5ea3d58243442111dfcdf7c7f18b640d7b6
24-
generated: "2023-01-26T16:58:38.528197461+02:00"
23+
digest: sha256:4f55be5e808ff9f3cd1ed3b64640173c9633b8fd6bda08c2494ecfb687b3f9b6
24+
generated: "2023-08-03T14:00:03.435795069+03:00"

‎drupal/Chart.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ dependencies:
2323
repository: https://codecentric.github.io/helm-charts
2424
condition: mailhog.enabled
2525
- name: elasticsearch
26-
version: 7.8.x
27-
# repository: https://helm.elastic.co
26+
version: 8.5.x
27+
# repository: https://helm.elastic.co
28+
# Forked at https://github.com/elastic/helm-charts/commit/2fd64d0af65f14df7aa01da591919460dabac4b3
2829
repository: file://../elasticsearch
2930
condition: elasticsearch.enabled
3031
- name: silta-release

‎drupal/templates/_helpers.tpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ mysql -u $DB_USER -p$DB_PASS -h $DB_HOST -e "CREATE DATABASE IF NOT EXISTS $DB_N
331331
{{- define "drupal.wait-for-elasticsearch-command" }}
332332
TIME_WAITING=0
333333
echo -n "Waiting for Elasticsearch.";
334-
until curl --silent --connect-timeout 2 "$ELASTICSEARCH_HOST:9200" ; do
334+
until curl --silent --connect-timeout 2 "{{ .Values.elasticsearch.protocol }}://${ELASTICSEARCH_HOST}:9200" -k ; do
335335
echo -n "."
336336
sleep 5
337337
TIME_WAITING=$((TIME_WAITING+5))

‎drupal/templates/_overrides.tpl

+12
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,18 @@ we make it compatible by overriding the following templates.
1818
{{ .Release.Name }}-es-0
1919
{{- end -}}
2020

21+
{{/*
22+
We don't use roles for elasticsearch 6 and having them set in later
23+
chart versions, breaks deployment. So we add conditional on it.
24+
*/}}
25+
{{- define "elasticsearch.roles" -}}
26+
{{- if gt (int (include "elasticsearch.esMajorVersion" .)) 6 }}
27+
{{- range $.Values.roles -}}
28+
{{ . }},
29+
{{- end -}}
30+
{{- end -}}
31+
{{- end -}}
32+
2133
{{/*
2234
The mariadb chart switched to an incompatible naming scheme,
2335
we make it compatible by overriding the following templates.

‎drupal/values.yaml

+12-1
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,7 @@ varnish:
577577
.connect_timeout = 10s;
578578
.between_bytes_timeout = 10s;
579579
580+
# https://github.com/elastic/helm-charts/blob/2fd64d0af65f14df7aa01da591919460dabac4b3/elasticsearch/values.yaml
580581
elasticsearch:
581582
enabled: false
582583

@@ -589,6 +590,16 @@ elasticsearch:
589590
maxUnavailable: 0
590591
clusterHealthCheckParams: 'wait_for_status=yellow&timeout=1s'
591592

593+
# Note: "roles" definition is ignored for 6.x images due to subchart compatability reasons.
594+
595+
# Drupal integration module still requires non-ssl connection
596+
# related param: elasticsearch.extraEnvs[xpack.security.enabled]
597+
createCert: false
598+
protocol: http
599+
extraEnvs:
600+
- name: xpack.security.enabled
601+
value: "false"
602+
592603
# Disable service links that cause a slow startup.
593604
enableServiceLinks: false
594605

@@ -603,7 +614,7 @@ elasticsearch:
603614
resources:
604615
requests:
605616
cpu: 200m
606-
memory: 512Mi
617+
memory: 640Mi
607618
limits:
608619
memory: 1Gi
609620

‎elasticsearch/Chart.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apiVersion: v1
2-
description: Official Elastic helm chart for Elasticsearch.
2+
description: Official Elastic helm chart for Elasticsearch
33
home: https://github.com/elastic/helm-charts
44
maintainers:
5-
- email: [email protected]
6-
name: Elastic
5+
- email: [email protected]
6+
name: Elastic
77
name: elasticsearch
8-
version: 7.8.1
9-
appVersion: 7.8.1
8+
version: 8.5.1
9+
appVersion: 8.5.1
1010
sources:
1111
- https://github.com/elastic/elasticsearch
1212
icon: https://helm.elastic.co/icons/elasticsearch.png

‎elasticsearch/README.md

+195-163
Large diffs are not rendered by default.

‎elasticsearch/examples/config/Makefile

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
default: test
2+
23
include ../../../helpers/examples.mk
34

45
RELEASE := helm-es-config
6+
TIMEOUT := 1200s
57

68
install:
7-
helm upgrade --wait --timeout=600 --install $(RELEASE) --values ./values.yaml ../../
9+
helm upgrade --wait --timeout=$(TIMEOUT) --install --values values.yaml $(RELEASE) ../../
810

911
secrets:
1012
kubectl delete secret elastic-config-credentials elastic-config-secret elastic-config-slack elastic-config-custom-path || true
@@ -16,4 +18,4 @@ secrets:
1618
test: secrets install goss
1719

1820
purge:
19-
helm del --purge $(RELEASE)
21+
helm del $(RELEASE)

‎elasticsearch/examples/config/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Config
22

3-
This example deploy a single node Elasticsearch 7.8.1-SNAPSHOT with authentication and
3+
This example deploy a single node Elasticsearch 8.5.1 with authentication and
44
custom [values][].
55

66

@@ -23,5 +23,5 @@ custom [values][].
2323
You can also run [goss integration tests][] using `make test`
2424

2525

26-
[goss integration tests]: https://github.com/elastic/helm-charts/tree/7.8/elasticsearch/examples/config/test/goss.yaml
27-
[values]: https://github.com/elastic/helm-charts/tree/7.8/elasticsearch/examples/config/values.yaml
26+
[goss integration tests]: https://github.com/elastic/helm-charts/tree/main/elasticsearch/examples/config/test/goss.yaml
27+
[values]: https://github.com/elastic/helm-charts/tree/main/elasticsearch/examples/config/values.yaml

‎elasticsearch/examples/config/test/goss.yaml

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
11
http:
2-
http://localhost:9200/_cluster/health:
2+
https://localhost:9200/_cluster/health:
33
status: 200
44
timeout: 2000
5+
allow-insecure: true
6+
username: elastic
7+
password: "{{ .Env.ELASTIC_PASSWORD }}"
58
body:
6-
- 'green'
9+
- "green"
710
- '"number_of_nodes":1'
811
- '"number_of_data_nodes":1'
912

10-
http://localhost:9200:
13+
https://localhost:9200:
1114
status: 200
1215
timeout: 2000
16+
username: elastic
17+
allow-insecure: true
18+
password: "{{ .Env.ELASTIC_PASSWORD }}"
1319
body:
1420
- '"cluster_name" : "config"'
15-
- '"name" : "config-master-0"'
16-
- 'You Know, for Search'
21+
- "You Know, for Search"
1722

1823
command:
1924
"elasticsearch-keystore list":

‎elasticsearch/examples/config/values.yaml

+7-9
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,29 @@
11
---
2-
32
clusterName: "config"
43
replicas: 1
54

65
extraEnvs:
76
- name: ELASTIC_PASSWORD
87
valueFrom:
98
secretKeyRef:
10-
name: elastic-credentials
9+
name: elastic-config-credentials
1110
key: password
12-
- name: ELASTIC_USERNAME
13-
valueFrom:
14-
secretKeyRef:
15-
name: elastic-credentials
16-
key: username
1711

1812
# This is just a dummy file to make sure that
1913
# the keystore can be mounted at the same time
2014
# as a custom elasticsearch.yml
2115
esConfig:
2216
elasticsearch.yml: |
17+
xpack.security.enabled: true
2318
path.data: /usr/share/elasticsearch/data
2419
2520
keystore:
2621
- secretName: elastic-config-secret
2722
- secretName: elastic-config-slack
2823
- secretName: elastic-config-custom-path
2924
items:
30-
- key: slack_url
31-
path: xpack.notification.slack.account.otheraccount.secure_url
25+
- key: slack_url
26+
path: xpack.notification.slack.account.otheraccount.secure_url
27+
28+
secret:
29+
enabled: false

‎elasticsearch/examples/default/Makefile

+3-5
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@ default: test
33
include ../../../helpers/examples.mk
44

55
RELEASE := helm-es-default
6+
TIMEOUT := 1200s
67

78
install:
8-
helm upgrade --wait --timeout=600 --install $(RELEASE) ../../
9-
10-
restart:
11-
helm upgrade --set terminationGracePeriod=121 --wait --timeout=600 --install $(RELEASE) ../../
9+
helm upgrade --wait --timeout=$(TIMEOUT) --install $(RELEASE) ../../
1210

1311
test: install goss
1412

1513
purge:
16-
helm del --purge $(RELEASE)
14+
helm del $(RELEASE)

‎elasticsearch/examples/default/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Default
22

3-
This example deploy a 3 nodes Elasticsearch 7.8.1-SNAPSHOT cluster using
3+
This example deploy a 3 nodes Elasticsearch 8.5.1 cluster using
44
[default values][].
55

66

@@ -21,5 +21,5 @@ This example deploy a 3 nodes Elasticsearch 7.8.1-SNAPSHOT cluster using
2121
You can also run [goss integration tests][] using `make test`
2222

2323

24-
[goss integration tests]: https://github.com/elastic/helm-charts/tree/7.8/elasticsearch/examples/default/test/goss.yaml
25-
[default values]: https://github.com/elastic/helm-charts/tree/7.8/elasticsearch/values.yaml
24+
[goss integration tests]: https://github.com/elastic/helm-charts/tree/main/elasticsearch/examples/default/test/goss.yaml
25+
[default values]: https://github.com/elastic/helm-charts/tree/main/elasticsearch/values.yaml

‎elasticsearch/examples/default/test/goss.yaml

+12-7
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,29 @@
11
kernel-param:
22
vm.max_map_count:
3-
value: '262144'
3+
value: "262144"
44

55
http:
6-
http://elasticsearch-master:9200/_cluster/health:
6+
https://elasticsearch-master:9200/_cluster/health:
77
status: 200
88
timeout: 2000
9+
username: elastic
10+
allow-insecure: true
11+
password: "{{ .Env.ELASTIC_PASSWORD }}"
912
body:
10-
- 'green'
13+
- "green"
1114
- '"number_of_nodes":3'
1215
- '"number_of_data_nodes":3'
1316

14-
http://localhost:9200:
17+
https://localhost:9200:
1518
status: 200
1619
timeout: 2000
20+
allow-insecure: true
21+
username: elastic
22+
password: "{{ .Env.ELASTIC_PASSWORD }}"
1723
body:
18-
- '"number" : "7.8.1-SNAPSHOT"'
24+
- '"number" : "8.5.1"'
1925
- '"cluster_name" : "elasticsearch"'
20-
- '"name" : "elasticsearch-master-0"'
21-
- 'You Know, for Search'
26+
- "You Know, for Search"
2227

2328
file:
2429
/usr/share/elasticsearch/data:

‎elasticsearch/examples/docker-for-mac/Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
default: test
22

33
RELEASE := helm-es-docker-for-mac
4+
TIMEOUT := 1200s
45

56
install:
6-
helm upgrade --wait --timeout=900 --install --values values.yaml $(RELEASE) ../../
7+
helm upgrade --wait --timeout=$(TIMEOUT) --install --values values.yaml $(RELEASE) ../../
78

89
test: install
910
helm test $(RELEASE)
1011

1112
purge:
12-
helm del --purge $(RELEASE)
13+
helm del $(RELEASE)

‎elasticsearch/examples/docker-for-mac/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Docker for Mac
22

3-
This example deploy a 3 nodes Elasticsearch 7.8.1-SNAPSHOT cluster on [Docker for Mac][]
3+
This example deploy a 3 nodes Elasticsearch 8.5.1 cluster on [Docker for Mac][]
44
using [custom values][].
55

66
Note that this configuration should be used for test only and isn't recommended
@@ -19,5 +19,5 @@ for production.
1919
```
2020

2121

22-
[custom values]: https://github.com/elastic/helm-charts/tree/7.8/elasticsearch/examples/docker-for-mac/values.yaml
22+
[custom values]: https://github.com/elastic/helm-charts/tree/main/elasticsearch/examples/docker-for-mac/values.yaml
2323
[docker for mac]: https://docs.docker.com/docker-for-mac/kubernetes/

‎elasticsearch/examples/kubernetes-kind/Makefile

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
default: test
22

33
RELEASE := helm-es-kind
4+
TIMEOUT := 1200s
45

56
install:
6-
helm upgrade --wait --timeout=900 --install --values values.yaml $(RELEASE) ../../
7+
helm upgrade --wait --timeout=$(TIMEOUT) --install --values values.yaml $(RELEASE) ../../
78

89
install-local-path:
910
kubectl apply -f https://raw.githubusercontent.com/rancher/local-path-provisioner/master/deploy/local-path-storage.yaml
10-
helm upgrade --wait --timeout=900 --install --values values-local-path.yaml $(RELEASE) ../../
11+
helm upgrade --wait --timeout=$(TIMEOUT) --install --values values-local-path.yaml $(RELEASE) ../../
1112

1213
test: install
1314
helm test $(RELEASE)
1415

1516
purge:
16-
helm del --purge $(RELEASE)
17+
helm del $(RELEASE)

‎elasticsearch/examples/kubernetes-kind/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# KIND
22

3-
This example deploy a 3 nodes Elasticsearch 7.8.1-SNAPSHOT cluster on [Kind][]
3+
This example deploy a 3 nodes Elasticsearch 8.5.1 cluster on [Kind][]
44
using [custom values][].
55

66
Note that this configuration should be used for test only and isn't recommended
@@ -28,9 +28,9 @@ Elasticsearch volumes (see [Makefile][] instructions).
2828
```
2929

3030

31-
[custom values]: https://github.com/elastic/helm-charts/blob/7.8/elasticsearch/examples/kubernetes-kind/values.yaml
31+
[custom values]: https://github.com/elastic/helm-charts/blob/main/elasticsearch/examples/kubernetes-kind/values.yaml
3232
[kind]: https://kind.sigs.k8s.io/
3333
[kind issue]: https://github.com/kubernetes-sigs/kind/issues/830
3434
[kubernetes-sigs/kind#1157]: https://github.com/kubernetes-sigs/kind/pull/1157
3535
[rancher local path provisioner]: https://github.com/rancher/local-path-provisioner
36-
[Makefile]: https://github.com/elastic/helm-charts/blob/7.8/elasticsearch/examples/kubernetes-kind/Makefile#L5
36+
[Makefile]: https://github.com/elastic/helm-charts/blob/main/elasticsearch/examples/kubernetes-kind/Makefile

‎elasticsearch/examples/microk8s/Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
default: test
22

33
RELEASE := helm-es-microk8s
4+
TIMEOUT := 1200s
45

56
install:
6-
helm upgrade --wait --timeout=900 --install --values values.yaml $(RELEASE) ../../
7+
helm upgrade --wait --timeout=$(TIMEOUT) --install --values values.yaml $(RELEASE) ../../
78

89
test: install
910
helm test $(RELEASE)
1011

1112
purge:
12-
helm del --purge $(RELEASE)
13+
helm del $(RELEASE)

‎elasticsearch/examples/microk8s/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# MicroK8S
22

3-
This example deploy a 3 nodes Elasticsearch 7.8.1-SNAPSHOT cluster on [MicroK8S][]
3+
This example deploy a 3 nodes Elasticsearch 8.5.1 cluster on [MicroK8S][]
44
using [custom values][].
55

66
Note that this configuration should be used for test only and isn't recommended
@@ -28,5 +28,5 @@ The following MicroK8S [addons][] need to be enabled:
2828

2929

3030
[addons]: https://microk8s.io/docs/addons
31-
[custom values]: https://github.com/elastic/helm-charts/tree/7.8/elasticsearch/examples/microk8s/values.yaml
31+
[custom values]: https://github.com/elastic/helm-charts/tree/main/elasticsearch/examples/microk8s/values.yaml
3232
[MicroK8S]: https://microk8s.io

‎elasticsearch/examples/migration/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
PREFIX := helm-es-migration
22

33
data:
4-
helm upgrade --wait --timeout=600 --install --values ./data.yml $(PREFIX)-data ../../
4+
helm upgrade --wait --timeout=$(TIMEOUT) --install --values data.yaml $(PREFIX)-data ../../
55

66
master:
7-
helm upgrade --wait --timeout=600 --install --values ./master.yml $(PREFIX)-master ../../
7+
helm upgrade --wait --timeout=$(TIMEOUT) --install --values master.yaml $(PREFIX)-master ../../
88

99
client:
10-
helm upgrade --wait --timeout=600 --install --values ./client.yml $(PREFIX)-client ../../
10+
helm upgrade --wait --timeout=$(TIMEOUT) --install --values client.yaml $(PREFIX)-client ../../

0 commit comments

Comments
 (0)