From f33a521d319ce0bdb8613ea1d35aa75b913114bc Mon Sep 17 00:00:00 2001 From: dena Date: Thu, 5 Feb 2026 15:44:48 +0100 Subject: [PATCH 1/2] update chart --- charts/api/CHANGELOG.md | 9 +++++++++ charts/api/Chart.yaml | 2 +- charts/api/templates/_helpers.tpl | 10 +++------- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/charts/api/CHANGELOG.md b/charts/api/CHANGELOG.md index 7f9fd65..0c9066a 100644 --- a/charts/api/CHANGELOG.md +++ b/charts/api/CHANGELOG.md @@ -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 diff --git a/charts/api/Chart.yaml b/charts/api/Chart.yaml index 0ac0be8..24dc13f 100644 --- a/charts/api/Chart.yaml +++ b/charts/api/Chart.yaml @@ -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 diff --git a/charts/api/templates/_helpers.tpl b/charts/api/templates/_helpers.tpl index 7a1fb09..ce76db0 100644 --- a/charts/api/templates/_helpers.tpl +++ b/charts/api/templates/_helpers.tpl @@ -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" -}} From b3f247e66636bdefc5cbe7437ec5bb5ce3db9f2f Mon Sep 17 00:00:00 2001 From: dena Date: Thu, 5 Feb 2026 16:16:01 +0100 Subject: [PATCH 2/2] remove from values.yaml --- charts/api/values.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/charts/api/values.yaml b/charts/api/values.yaml index 7366319..4fa36dd 100644 --- a/charts/api/values.yaml +++ b/charts/api/values.yaml @@ -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