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

fix(argo-cd): global.securityContext merging (#1255)

Browse source 
* fix(argo-cd): global.securityContext merging

merge global.securityContext into local (applicationset, notifications) values

Signed-off-by: Höhl, Lukas <lukas.hoehl@accso.de>

* chore(argo-cd): bump version and add artifacthub changes

Signed-off-by: Höhl, Lukas <lukas.hoehl@accso.de>

* fix(argo-cd): wrong value for applicationSet podSecurityContext

Signed-off-by: Höhl, Lukas <lukas.hoehl@accso.de>

* fix(argo-cd): rerun helm-docs

Signed-off-by: Höhl, Lukas <lukas.hoehl@accso.de>

* chore(argo-cd): bump version

Signed-off-by: Höhl, Lukas <lukas.hoehl@accso.de>

Co-authored-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
This commit is contained in:
Lukas 2022-05-09 21:18:11 +02:00 committed by GitHub
parent 021a5a0c1f
commit ef70ad9edd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 9 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.3.3
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd
version: 4.5.11
version: 4.5.12
home: https://github.com/argoproj/argo-helm
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
keywords:
@ -21,4 +21,4 @@ dependencies:
condition: redis-ha.enabled
annotations:
artifacthub.io/changes: |
- "[Fixed]: Use global imagePullSecret value for notfications deployment"
- "[Fixed]: Consider global securityContext for notifications and applicationset deployment"

2
charts/argo-cd/templates/argocd-applicationset/deployment.yaml
View file

@ -30,7 +30,7 @@ spec:
{{- end }}
serviceAccountName: {{ include "argo-cd.applicationSetServiceAccountName" . }}
securityContext:
{{- toYaml .Values.applicationSet.podSecurityContext | nindent 8 }}
{{- toYaml (mergeOverwrite (deepCopy .Values.global.securityContext) .Values.applicationSet.podSecurityContext) | nindent 8 }}
containers:
- name: {{ .Values.applicationSet.name }}
securityContext:

4
charts/argo-cd/templates/argocd-notifications/bots/slack/deployment.yaml
View file

@ -21,9 +21,7 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
serviceAccountName: {{ template "argo-cd.notificationsBotsSlackServiceAccountName" . }}
{{- with .Values.notifications.bots.slack.securityContext }}
securityContext: {{- toYaml . | nindent 8 }}
{{- end }}
securityContext: {{- toYaml (mergeOverwrite (deepCopy .Values.global.securityContext) .Values.notifications.securityContext) | nindent 8 }}
containers:
- name: {{ template "argo-cd.notifications.fullname" . }}-bot
image: {{ default .Values.global.image.repository .Values.notifications.bots.slack.image.repository }}:{{ default (include "argo-cd.defaultTag" .) .Values.notifications.bots.slack.image.tag }}

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

@ -32,9 +32,7 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "argo-cd.notificationsServiceAccountName" . }}
{{- if .Values.notifications.securityContext }}
securityContext: {{- toYaml .Values.notifications.securityContext | nindent 8 }}
{{- end }}
securityContext: {{- toYaml (mergeOverwrite (deepCopy .Values.global.securityContext) .Values.notifications.securityContext) | nindent 8 }}
containers:
- name: {{ .Values.notifications.name }}
image: {{ default .Values.global.image.repository .Values.notifications.image.repository }}:{{ default (include "argo-cd.defaultTag" .) .Values.notifications.image.tag }}