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

Merge pull request #10125 from tom-tschiller/bugfix/emqx-helm-fix-service-annotations 

fix(helm-charts): fix for multiple service annotations
This commit is contained in:
Zaiming (Stone) Shi 2023-03-14 06:19:06 +01:00 committed by GitHub
parent 823128dfc7 75ce870cbe
commit 102f427aac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deploy/charts/emqx-enterprise/templates/service-monitor.yaml
View File

@ -11,7 +11,7 @@ metadata:
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- if .Values.service.annotations }} {{- if .Values.service.annotations }}
annotations: annotations:
{{ toYaml .Values.service.annotations | indent 4 }} {{- toYaml .Values.service.annotations | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
endpoints: endpoints:

2
deploy/charts/emqx-enterprise/templates/service.yaml
View File

@ -10,7 +10,7 @@ metadata:
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- if .Values.service.annotations }} {{- if .Values.service.annotations }}
annotations: annotations:
{{ toYaml .Values.service.annotations | indent 4 }} {{- toYaml .Values.service.annotations | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
type: {{ .Values.service.type }} type: {{ .Values.service.type }}

2
deploy/charts/emqx/templates/service-monitor.yaml
View File

@ -11,7 +11,7 @@ metadata:
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- if .Values.service.annotations }} {{- if .Values.service.annotations }}
annotations: annotations:
{{ toYaml .Values.service.annotations | indent 4 }} {{- toYaml .Values.service.annotations | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
endpoints: endpoints:

2
deploy/charts/emqx/templates/service.yaml
View File

@ -10,7 +10,7 @@ metadata:
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- if .Values.service.annotations }} {{- if .Values.service.annotations }}
annotations: annotations:
{{ toYaml .Values.service.annotations | indent 4 }} {{- toYaml .Values.service.annotations | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
type: {{ .Values.service.type }} type: {{ .Values.service.type }}