Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(elasticsearch): use 7.10.2 cluster for local and staging #1192

Merged
merged 2 commits into from
Oct 16, 2023
Merged

feat(elasticsearch): use 7.10.2 cluster for local and staging #1192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3027f19
feat(elasticsearch): use 7.10.2 cluster for local and staging
AndrewKostka Oct 13, 2023
203c3d3
chore(elasticsearch): access cluster via generic endpoint
AndrewKostka Oct 16, 2023
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
1 change: 1 addition & 0 deletions k8s/helmfile/env/local/api.values.yaml.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ app:
serviceAccountSecret: null
stackdriver:
enabled: false
elasticSearchHost: elasticsearch-1.default.svc.cluster.local:9200

replicaCount:
web: 1
Expand Down
4 changes: 4 additions & 0 deletions k8s/helmfile/env/local/mediawiki-139.values.yaml.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ mw:
sitekeySecretKey: site_key
secretkeySecretName: {{ .Values.external.recaptcha2.secretName }}
secretkeySecretKey: secret_key
elasticsearch:
host: elasticsearch-1.default.svc.cluster.local
port: 9200
es6: false

replicaCount:
backend: 1
Expand Down
2 changes: 1 addition & 1 deletion k8s/helmfile/env/production/elasticsearch-1.values.yaml.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
image:
registry: ghcr.io
repository: wbstack/elasticsearch
tag: 7.10.2-20230628-0
tag: 7.10.2-20231013-0

labels:
sidecar.istio.io/inject: "false"
Expand Down
4 changes: 4 additions & 0 deletions k8s/helmfile/env/staging/mediawiki-139.values.yaml.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ mw:
allowedProxyCidr: "10.112.0.0/14"
mail:
domain: "wikibase.dev"
writeOnlyElasticsearch:
host: elasticsearch-1.default.svc.cluster.local
port: 9200
es6: false

resources:
web:
Expand Down
1 change: 1 addition & 0 deletions k8s/helmfile/helmfile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ releases:
namespace: default
chart: wbstack/elasticsearch-legacy
version: 6.8.22-wmde2
installed: {{ ne .Environment.Name "local" | toYaml }}
<<: *default_release

- name: elasticsearch-1
Expand Down