DevFW-CICD/argocd-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(argo-cd): One occurrence of label templating was missing (#630)

Browse source 
This relates to #627.

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
This commit is contained in:
Marco Kilchhofer 2021-03-23 13:28:23 +01:00 committed by GitHub
parent 3b0ebdda66
commit eedcf15a9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
charts/argo-cd/Chart.yaml
View file

@ -2,7 +2,7 @@ apiVersion: v1
appVersion: 1.8.4 appVersion: 1.8.4
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd name: argo-cd
version: 2.17.3 version: 2.17.4
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
keywords: keywords:

2
charts/argo-cd/templates/_helpers.tpl
View file

@ -133,7 +133,7 @@ Selector labels
{{- define "argo-cd.selectorLabels" -}} {{- define "argo-cd.selectorLabels" -}}
{{- if .name -}} {{- if .name -}}
app.kubernetes.io/name: {{ include "argo-cd.name" .context }}-{{ .name }} app.kubernetes.io/name: {{ include "argo-cd.name" .context }}-{{ .name }}
{{- end }} {{ end -}}
app.kubernetes.io/instance: {{ .context.Release.Name }} app.kubernetes.io/instance: {{ .context.Release.Name }}
{{- if .component }} {{- if .component }}
app.kubernetes.io/component: {{ .component }} app.kubernetes.io/component: {{ .component }}

2
charts/argo-cd/templates/redis/service.yaml
View file

@ -11,5 +11,5 @@ spec:
- port: {{ .Values.redis.servicePort }} - port: {{ .Values.redis.servicePort }}
targetPort: {{ .Values.redis.servicePort }} targetPort: {{ .Values.redis.servicePort }}
selector: selector:
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.redis.name }} {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.redis.name) | nindent 4 }}
{{- end }} {{- end }}