Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions charts/api/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@

This chart does not yet follow SemVer.

## 0.36.0
- Populates env var `ELASTICSEARCH_HOST`
- Removes env vars
- `ELASTICSEARCH_CLUSTER_WITHOUT_SHARED_INDEX`
- `ELASTICSEARCH_SHARED_INDEX_HOST`

## 0.35.0
- Remove uses of `PLATFORM_MW_BACKEND_HOST`

## 0.34.0
- Extend permissions for Kubernetes ServiceAccount role to add reading services

Expand Down
2 changes: 1 addition & 1 deletion charts/api/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
appVersion: "1.0"
description: A Helm chart for the WBStack API
name: api
version: 0.35.0
version: 0.36.0
home: https://github.com/wbstack
maintainers:
- name: WBstack
Expand Down
10 changes: 3 additions & 7 deletions charts/api/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -112,18 +112,14 @@ Common lists of environment variables
- name: TRUSTED_PROXY_PROXIES
value: {{ join "," .Values.trustedProxy.proxies | quote }}
{{- end }}
{{- if .Values.app.elasticSearchSharedIndexHost }}
- name: ELASTICSEARCH_SHARED_INDEX_HOST
value: {{ .Values.app.elasticSearchSharedIndexHost | quote }}
{{- if .Values.app.elasticSearchHost }}
- name: ELASTICSEARCH_HOST
value: {{ .Values.app.elasticSearchHost | quote }}
{{- end }}
{{- if .Values.app.elasticSearchSharedIndexPrefix }}
- name: ELASTICSEARCH_SHARED_INDEX_PREFIX
value: {{ .Values.app.elasticSearchSharedIndexPrefix | quote }}
{{- end }}
{{- if .Values.app.elasticSearchClusterWithoutSharedIndex }}
- name: ELASTICSEARCH_CLUSTER_WITHOUT_SHARED_INDEX
value: {{ .Values.app.elasticSearchClusterWithoutSharedIndex | quote }}
{{- end }}
{{- end -}}

{{- define "api.staticStorageEnvVars" -}}
Expand Down
10 changes: 0 additions & 10 deletions charts/api/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -118,21 +118,11 @@ app:
jwtSecretSecretKey: SomeSecretKey
queryServiceHost: someHost:9999
elasticSearchHost: someHost:1234
## @param app.elasticSearchSharedIndexHost
## Example:
## elasticSearchSharedIndexHost: somehost:1234
##
elasticSearchSharedIndexHost: ""
## @param app.elasticSearchSharedIndexPrefix
## Example:
## elasticSearchSharedIndexPrefix: wiki_1
##
elasticSearchSharedIndexPrefix: ""
## @param app.elasticSearchClusterWithoutSharedIndex
## Example:
## elasticSearchClusterWithoutSharedIndex: all
##
elasticSearchClusterWithoutSharedIndex: ""
elasticsearch:
curlTimeout:
indexInit: 500
Expand Down
Loading