ArmstrongLabs
/
argo-helm
forked from argoproj/argo-helm
1
0
Fork 0
Code Pull Requests Packages Activity

fix(argo-cd): fix unmarshal annotaions error (#1379) 

Signed-off-by: Yixing Yan <yixingyan@gmail.com>
main argo-cd-4.9.16
yanyx 2022-07-19 20:47:42 +08:00 committed by GitHub
parent 1bf8dd4fdc
commit 833c877ca5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
charts/argo-cd/Chart.yaml
View File

@ -2,7 +2,7 @@ apiVersion: v2
appVersion: v2.4.7 appVersion: v2.4.7
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd name: argo-cd
version: 4.9.15 version: 4.9.16
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
keywords: keywords:
@ -21,4 +21,4 @@ dependencies:
condition: redis-ha.enabled condition: redis-ha.enabled
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
- "[Changed]: Update to app version 2.4.7" - "[Fixed]: Fix ArgoCD notification metrics unmarshal error"

15
charts/argo-cd/templates/argocd-notifications/service-metrics.yaml
View File

@ -5,18 +5,21 @@ metadata:
name: {{ template "argo-cd.notifications.fullname" . }}-metrics name: {{ template "argo-cd.notifications.fullname" . }}-metrics
labels: labels:
{{- include "argo-cd.labels" (dict "context" . "component" .Values.notifications.name "name" "metrics") | nindent 4 }} {{- include "argo-cd.labels" (dict "context" . "component" .Values.notifications.name "name" "metrics") | nindent 4 }}
{{- with .Values.notifications.metrics.service.labels }} {{- if .Values.notifications.metrics.service.labels }}
{{- toYaml . | nindent 4 }} {{- toYaml .Values.notifications.metrics.service.labels | nindent 4 }}
{{- end }} {{- end }}
{{- with .Values.notifications.metrics.service.annotations }} {{- if .Values.notifications.metrics.service.annotations }}
annotations: annotations:
{{- toYaml . | nindent 4 }} {{- range $key, $value := .Values.notifications.metrics.service.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }} {{- end }}
{{- end }}
spec: spec:
selector: selector:
{{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.notifications.name) | nindent 6 }} {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.notifications.name) | nindent 6 }}
ports: ports:
- name: {{ .Values.notifications.metrics.service.portName }} - name: {{ .Values.notifications.metrics.service.portName }}
protocol: TCP
port: {{ .Values.notifications.metrics.port }} port: {{ .Values.notifications.metrics.port }}
targetPort: {{ .Values.notifications.metrics.port }} targetPort: metrics
{{- end }} {{- end }}