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

fix(argo-cd): global podLabels/podAnnotations object unexpected merge (#930)

Browse source 
* fix(argo-cd): global podLabels/podAnnotations object unexpected merge

Signed-off-by: keiSunagawa <keisunagawa.git@icloud.com>

* fix change log typo

Signed-off-by: keiSunagawa <keisunagawa.git@icloud.com>
This commit is contained in:
keiSunagawa 2021-09-15 19:30:54 +09:00 committed by GitHub
parent 44acc3cde7
commit a801d55710
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 12 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: 2.1.2
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd
version: 3.17.6
version: 3.17.7
home: https://github.com/argoproj/argo-helm
icon: https://argoproj.github.io/argo-cd/assets/logo.png
keywords:
@ -21,4 +21,4 @@ dependencies:
condition: redis-ha.enabled
annotations:
artifacthub.io/changes: |
- "[Changed]: Upgrade argocd to 2.1.2"
- "[Fixed]: global podLabels/podAnnotations object unexpected merge"

4
charts/argo-cd/templates/argocd-application-controller/deployment.yaml
View file

@ -17,14 +17,14 @@ spec:
replicas: {{ .Values.controller.replicas }}
template:
metadata:
{{- with (mergeOverwrite .Values.global.podAnnotations .Values.controller.podAnnotations) }}
{{- with (mergeOverwrite (deepCopy .Values.global.podAnnotations) .Values.controller.podAnnotations) }}
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "argo-cd.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 8 }}
app.kubernetes.io/version: {{ default .Values.global.image.tag .Values.controller.image.tag | quote }}
{{- with (mergeOverwrite .Values.global.podLabels .Values.controller.podLabels) }}
{{- with (mergeOverwrite (deepCopy .Values.global.podLabels) .Values.controller.podLabels) }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:

4
charts/argo-cd/templates/argocd-repo-server/deployment.yaml
View file

@ -16,14 +16,14 @@ spec:
{{- end }}
template:
metadata:
{{- with (mergeOverwrite .Values.global.podAnnotations .Values.repoServer.podAnnotations) }}
{{- with (mergeOverwrite (deepCopy .Values.global.podAnnotations) .Values.repoServer.podAnnotations) }}
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "argo-cd.labels" (dict "context" . "component" .Values.repoServer.name "name" .Values.repoServer.name) | nindent 8 }}
app.kubernetes.io/version: {{ default .Values.global.image.tag .Values.repoServer.image.tag | quote }}
{{- with (mergeOverwrite .Values.global.podLabels .Values.repoServer.podLabels) }}
{{- with (mergeOverwrite (deepCopy .Values.global.podLabels) .Values.repoServer.podLabels) }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:

4
charts/argo-cd/templates/argocd-server/deployment.yaml
View file

@ -16,14 +16,14 @@ spec:
{{- end }}
template:
metadata:
{{- with (mergeOverwrite .Values.global.podAnnotations .Values.server.podAnnotations) }}
{{- with (mergeOverwrite (deepCopy .Values.global.podAnnotations) .Values.server.podAnnotations) }}
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 8 }}
app.kubernetes.io/version: {{ default .Values.global.image.tag .Values.server.image.tag | quote }}
{{- with (mergeOverwrite .Values.global.podLabels .Values.server.podLabels) }}
{{- with (mergeOverwrite (deepCopy .Values.global.podLabels) .Values.server.podLabels) }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:

4
charts/argo-cd/templates/dex/deployment.yaml
View file

@ -12,14 +12,14 @@ spec:
{{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.dex.name) | nindent 6 }}
template:
metadata:
{{- with (mergeOverwrite .Values.global.podAnnotations .Values.dex.podAnnotations) }}
{{- with (mergeOverwrite (deepCopy .Values.global.podAnnotations) .Values.dex.podAnnotations) }}
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "argo-cd.labels" (dict "context" . "component" .Values.dex.name "name" .Values.dex.name) | nindent 8 }}
app.kubernetes.io/version: {{ .Values.dex.image.tag | quote }}
{{- with (mergeOverwrite .Values.global.podLabels .Values.dex.podLabels) }}
{{- with (mergeOverwrite (deepCopy .Values.global.podLabels) .Values.dex.podLabels) }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:

4
charts/argo-cd/templates/redis/deployment.yaml
View file

@ -13,14 +13,14 @@ spec:
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.redis.name }}
template:
metadata:
{{- with (mergeOverwrite .Values.global.podAnnotations .Values.redis.podAnnotations) }}
{{- with (mergeOverwrite (deepCopy .Values.global.podAnnotations) .Values.redis.podAnnotations) }}
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "argo-cd.labels" (dict "context" . "component" .Values.redis.name "name" .Values.redis.name) | nindent 8 }}
app.kubernetes.io/version: {{ .Values.redis.image.tag | quote }}
{{- with (mergeOverwrite .Values.global.podLabels .Values.redis.podLabels) }}
{{- with (mergeOverwrite (deepCopy .Values.global.podLabels) .Values.redis.podLabels) }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec: