From 5e761839017f37d6e4e7be71672dfccc9635483b Mon Sep 17 00:00:00 2001 From: Rory Z Date: Tue, 13 Dec 2022 09:32:32 +0800 Subject: [PATCH] fix(helm): chart using incorrect secret values with custom credentials --- changes/v5.0.12-en.md | 2 ++ changes/v5.0.12-zh.md | 2 ++ deploy/charts/emqx-enterprise/templates/secret.yaml | 12 ++---------- deploy/charts/emqx/templates/secret.yaml | 12 ++---------- 4 files changed, 8 insertions(+), 20 deletions(-) diff --git a/changes/v5.0.12-en.md b/changes/v5.0.12-en.md index 88d967835..541159554 100644 --- a/changes/v5.0.12-en.md +++ b/changes/v5.0.12-en.md @@ -64,3 +64,5 @@ Please note, the request body of `/bridges` API to configure MQTT brdige is chan - `POST /traces` to return `409` in case of duplicate [#9494](https://github.com/emqx/emqx/pull/9494). - Fix bridging function, when both ingress and egress bridges are configured, egress bridge does not work [#9523](https://github.com/emqx/emqx/pull/9523). + +- Fix EMQX Helm Chart using incorrect secret values when custom credentials are provided [#9536](https://github.com/emqx/emqx/pull/9536). diff --git a/changes/v5.0.12-zh.md b/changes/v5.0.12-zh.md index 4de6776ad..1f85a0a5f 100644 --- a/changes/v5.0.12-zh.md +++ b/changes/v5.0.12-zh.md @@ -62,3 +62,5 @@ v5.0.11 或更早版本创建的配置文件，在新版本中会被自动转换 - 当重复调用 `POST /traces` 时，将会返回 `409` ，而不再是 `400` [#9494](https://github.com/emqx/emqx/pull/9494)。 - 桥接功能修复，当同时配置了2个桥，方向为入桥和出桥时，出桥不工作的问题。[#9523](https://github.com/emqx/emqx/pull/9523). + +- 修复了 EMQX Helm Chart 中当用户使用自定义的用户名和密码时，创建的 Secret 资源不正确问题 [#9536](https://github.com/emqx/emqx/pull/9536)。 diff --git a/deploy/charts/emqx-enterprise/templates/secret.yaml b/deploy/charts/emqx-enterprise/templates/secret.yaml index 447326769..440f50d30 100644 --- a/deploy/charts/emqx-enterprise/templates/secret.yaml +++ b/deploy/charts/emqx-enterprise/templates/secret.yaml @@ -6,14 +6,6 @@ metadata: namespace: {{ .Release.Namespace }} type: kubernetes.io/basic-auth stringData: - {{- if not (empty .Values.emqxConfig.EMQX_DASHBOARD__DEFAULT_USERNAME) }} - username: admin - {{- else }} - username: {{ .Values.emqxConfig.EMQX_DASHBOARD__DEFAULT_USERNAME }} - {{- end }} - {{- if not (empty .Values.emqxConfig.EMQX_DASHBOARD__DEFAULT_PASSWORD) }} - password: public - {{- else }} - password: {{ .Values.emqxConfig.EMQX_DASHBOARD__DEFAULT_PASSWORD}} - {{- end }} + username: {{ .Values.emqxConfig.EMQX_DASHBOARD__DEFAULT_USERNAME | default "admin" }} + password: {{ .Values.emqxConfig.EMQX_DASHBOARD__DEFAULT_PASSWORD | default "public" }} {{- end }} diff --git a/deploy/charts/emqx/templates/secret.yaml b/deploy/charts/emqx/templates/secret.yaml index 447326769..440f50d30 100644 --- a/deploy/charts/emqx/templates/secret.yaml +++ b/deploy/charts/emqx/templates/secret.yaml @@ -6,14 +6,6 @@ metadata: namespace: {{ .Release.Namespace }} type: kubernetes.io/basic-auth stringData: - {{- if not (empty .Values.emqxConfig.EMQX_DASHBOARD__DEFAULT_USERNAME) }} - username: admin - {{- else }} - username: {{ .Values.emqxConfig.EMQX_DASHBOARD__DEFAULT_USERNAME }} - {{- end }} - {{- if not (empty .Values.emqxConfig.EMQX_DASHBOARD__DEFAULT_PASSWORD) }} - password: public - {{- else }} - password: {{ .Values.emqxConfig.EMQX_DASHBOARD__DEFAULT_PASSWORD}} - {{- end }} + username: {{ .Values.emqxConfig.EMQX_DASHBOARD__DEFAULT_USERNAME | default "admin" }} + password: {{ .Values.emqxConfig.EMQX_DASHBOARD__DEFAULT_PASSWORD | default "public" }} {{- end }}