yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6625 from Rory-Z/chore/fix-spelling-errors-for-4.4 

chore(helm): fix spell errors
This commit is contained in:
Rory Z 2022-01-05 10:38:41 +08:00 committed by GitHub
parent c672d8e7a4 93abd69db1
commit 6f74a6431c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
deploy/charts/emqx/templates/StatefulSet.yaml
View File

@ -82,7 +82,12 @@ spec:
claimName: {{ tpl . $ }} claimName: {{ tpl . $ }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- if .Values.emqxLicneseSecretName }} {{- if .Values.emqxLicenseSecretName }}
- name: emqx-license
secret:
secretName: {{ .Values.emqxLicenseSecretName }}
## Compatible with previous misspellings
{{- else if .Values.emqxLicneseSecretName }}
- name: emqx-license - name: emqx-license
secret: secret:
secretName: {{ .Values.emqxLicneseSecretName }} secretName: {{ .Values.emqxLicneseSecretName }}
@ -150,7 +155,13 @@ spec:
- name: emqx-loaded-modules - name: emqx-loaded-modules
mountPath: "/opt/emqx/data/loaded_modules" mountPath: "/opt/emqx/data/loaded_modules"
subPath: "loaded_modules" subPath: "loaded_modules"
{{ if .Values.emqxLicneseSecretName }} {{ if .Values.emqxLicenseSecretName }}
- name: emqx-license
mountPath: "/opt/emqx/etc/emqx.lic"
subPath: "emqx.lic"
readOnly: true
## Compatible with previous misspellings
{{ else if .Values.emqxLicneseSecretName }}
- name: emqx-license - name: emqx-license
mountPath: "/opt/emqx/etc/emqx.lic" mountPath: "/opt/emqx/etc/emqx.lic"
subPath: "emqx.lic" subPath: "emqx.lic"

4
deploy/charts/emqx/values.yaml
View File

@ -114,10 +114,10 @@ emqxLoadedModules: >
{emqx_mod_subscription, false}. {emqx_mod_subscription, false}.
{emqx_mod_topic_metrics, false}. {emqx_mod_topic_metrics, false}.
## EMQX Enterprise Edition requires manual creation of a Secret containing the licensed content. Write the name of Secret to the value of "emqxLicneseSecretName" ## EMQX Enterprise Edition requires manual creation of a Secret containing the licensed content. Write the name of Secret to the value of "emqxLicenseSecretName"
## Example: ## Example:
## kubectl create secret generic emqx-license-secret-name --from-file=/path/to/emqx.lic ## kubectl create secret generic emqx-license-secret-name --from-file=/path/to/emqx.lic
emqxLicneseSecretName: emqxLicenseSecretName:
service: service:
## Service type ## Service type