Merge pull request #9317 from Gala-R/fix-ssl-existingName-invalid

fix(helm): fix existingName does not take effect

changes/v5.0.10-en.md

@@ -40,6 +40,9 @@
 
 - Fix bad HTTP response status code for `/gateways` API, when Gateway name is unknown, it should return `404` instead of `400` [#9268](https://github.com/emqx/emqx/pull/9268).
 
+
+- Fix `ssl.existingName` option of  helm chart not working [#9307](https://github.com/emqx/emqx/issues/9307).
+
 - Fix incorrect topic authorize checking of delayed messages [#9290](https://github.com/emqx/emqx/pull/9290).
   Now will determine the actual topic of the delayed messages, e.g. `$delayed/1/t/foo` will be treated as `t/foo` in authorize checks.
 
@@ -50,4 +53,3 @@
 - Fix query string parameter 'node' to `/configs` resource being ignored, return 404 if node does not exist [#9310](https://github.com/emqx/emqx/pull/9310/).
 
 - Avoid re-dispatching shared-subscription session messages when a session is kicked or taken-over (to a new session) [#9123](https://github.com/emqx/emqx/pull/9123).
-

changes/v5.0.10-zh.md

@@ -38,6 +38,9 @@
 
 - 修复 HTTP API `/gateways` 的返回状态码，未知 Gateway 名字应返回 `404` 而不是 `400` [#9268](https://github.com/emqx/emqx/pull/9268)。
 
+
+- 修复 helm chart 的 `ssl.existingName` 选项不起作用 [#9307](https://github.com/emqx/emqx/issues/9307)。
+
 - 修复延迟消息的主题授权判断不正确的问题 [#9290](https://github.com/emqx/emqx/pull/9290)。
   现在将会对延迟消息中的真实主题进行授权判断，比如，`$delayed/1/t/foo` 会被当作 `t/foo` 进行判断。
 

deploy/charts/emqx-enterprise/templates/StatefulSet.yaml

@@ -56,7 +56,7 @@ spec:
       {{- if .Values.ssl.enabled }}
       - name: ssl-cert
         secret:
-          secretName: {{ include "emqx.fullname" . }}-tls
+          secretName: {{ include "emqx.ssl.secretName" . }}
       {{- end }}
       {{- if not .Values.persistence.enabled }}
       - name: emqx-data

deploy/charts/emqx-enterprise/templates/_helpers.tpl

@@ -30,3 +30,15 @@ Create chart name and version as used by the chart label.
 {{- define "emqx.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+
+{{/*
+Get ssl secret name .
+*/}}
+{{- define "emqx.ssl.secretName" -}}
+{{- if and .Values.ssl.useExisting .Values.ssl.existingName -}}
+    {{ .Values.ssl.existingName }}
+{{- else -}}
+    {{ include "emqx.fullname" . }}-tls
+{{- end -}}
+{{- end -}}

deploy/charts/emqx/templates/StatefulSet.yaml

@@ -56,7 +56,7 @@ spec:
       {{- if .Values.ssl.enabled }}
       - name: ssl-cert
         secret:
-          secretName: {{ include "emqx.fullname" . }}-tls
+          secretName: {{ include "emqx.ssl.secretName" . }}
       {{- end }}
       {{- if not .Values.persistence.enabled }}
       - name: emqx-data

deploy/charts/emqx/templates/_helpers.tpl

@@ -30,3 +30,15 @@ Create chart name and version as used by the chart label.
 {{- define "emqx.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+
+{{/*
+Get ssl secret name .
+*/}}
+{{- define "emqx.ssl.secretName" -}}
+{{- if and .Values.ssl.useExisting .Values.ssl.existingName -}}
+    {{ .Values.ssl.existingName }}
+{{- else -}}
+    {{ include "emqx.fullname" . }}-tls
+{{- end -}}
+{{- end -}}