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

simplify using with, thx @pborn-ionos!

Browse source 
Signed-off-by: wim.fournier <wim.fournier@adevinta.com>
This commit is contained in:
wim.fournier 2023-05-23 10:44:57 +02:00
parent 6bab7599a4
commit 7668f57b0c
8 changed files with 26 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
charts/argo-cd/templates/argocd-application-controller/statefulset.yaml
View file

@ -255,10 +255,10 @@ spec:
failureThreshold: {{ .Values.controller.readinessProbe.failureThreshold }} failureThreshold: {{ .Values.controller.readinessProbe.failureThreshold }}
resources: resources:
{{- toYaml .Values.controller.resources | nindent 10 }} {{- toYaml .Values.controller.resources | nindent 10 }}
{{- if .Values.controller.containerSecurityContext.enabled }} {{- with .Values.controller.containerSecurityContext }}
securityContext: securityContext:
{{- omit .Values.controller.containerSecurityContext "enabled" | toYaml | nindent 10 }} {{- toYaml . | nindent 10 }}
{{- end }} {{- end }}
workingDir: /home/argocd workingDir: /home/argocd
volumeMounts: volumeMounts:
{{- with .Values.controller.volumeMounts }} {{- with .Values.controller.volumeMounts }}

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

@ -182,9 +182,9 @@ spec:
{{- end }} {{- end }}
resources: resources:
{{- toYaml .Values.applicationSet.resources | nindent 12 }} {{- toYaml .Values.applicationSet.resources | nindent 12 }}
{{- if .Values.applicationSet.containerSecurityContext.enabled }} {{- with .Values.applicationSet.containerSecurityContext }}
securityContext: securityContext:
{{- omit .Values.applicationSet.containerSecurityContext "enabled" | toYaml | nindent 12 }} {{- toYaml . | nindent 12 }}
{{- end }} {{- end }}
volumeMounts: volumeMounts:
{{- with .Values.applicationSet.extraVolumeMounts }} {{- with .Values.applicationSet.extraVolumeMounts }}

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

@ -80,9 +80,9 @@ spec:
protocol: TCP protocol: TCP
resources: resources:
{{- toYaml .Values.notifications.resources | nindent 12 }} {{- toYaml .Values.notifications.resources | nindent 12 }}
{{- if .Values.notifications.containerSecurityContext.enabled }} {{- with .Values.notifications.containerSecurityContext }}
securityContext: securityContext:
{{- omit .Values.notifications.containerSecurityContext "enabled" | toYaml | nindent 12 }} {{- toYaml . | nindent 12 }}
{{- end }} {{- end }}
workingDir: /app workingDir: /app
volumeMounts: volumeMounts:

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

@ -273,9 +273,9 @@ spec:
failureThreshold: {{ .Values.repoServer.readinessProbe.failureThreshold }} failureThreshold: {{ .Values.repoServer.readinessProbe.failureThreshold }}
resources: resources:
{{- toYaml .Values.repoServer.resources | nindent 10 }} {{- toYaml .Values.repoServer.resources | nindent 10 }}
{{- if .Values.repoServer.containerSecurityContext.enabled }} {{- if .Values.repoServer.containerSecurityContext }}
securityContext: securityContext:
{{- omit .Values.repoServer.containerSecurityContext "enabled" | toYaml | nindent 10 }} {{- toYaml . | nindent 10 }}
{{- end }} {{- end }}
{{- with .Values.repoServer.lifecycle }} {{- with .Values.repoServer.lifecycle }}
lifecycle: lifecycle:
@ -297,11 +297,9 @@ spec:
resources: resources:
{{- toYaml . | nindent 10 }} {{- toYaml . | nindent 10 }}
{{- end }} {{- end }}
{{- if .Values.repoServer.containerSecurityContext.enabled }}
{{- with .Values.repoServer.containerSecurityContext }} {{- with .Values.repoServer.containerSecurityContext }}
securityContext: securityContext:
{{- omit . "enabled" | toYaml | nindent 10 }} {{- toYaml . | nindent 10 }}
{{- end }}
{{- end }} {{- end }}
volumeMounts: volumeMounts:
- mountPath: /var/run/argocd - mountPath: /var/run/argocd

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

@ -334,9 +334,9 @@ spec:
failureThreshold: {{ .Values.server.readinessProbe.failureThreshold }} failureThreshold: {{ .Values.server.readinessProbe.failureThreshold }}
resources: resources:
{{- toYaml .Values.server.resources | nindent 10 }} {{- toYaml .Values.server.resources | nindent 10 }}
{{- if .Values.server.containerSecurityContext.enabled }} {{- with .Values.server.containerSecurityContext }}
securityContext: securityContext:
{{- omit .Values.server.containerSecurityContext "enabled" | toYaml | nindent 10 }} {{- toYaml . | nindent 10 }}
{{- end }} {{- end }}
{{- with .Values.server.lifecycle }} {{- with .Values.server.lifecycle }}
lifecycle: lifecycle:
@ -348,9 +348,9 @@ spec:
imagePullPolicy: {{ .Values.server.extensions.image.imagePullPolicy }} imagePullPolicy: {{ .Values.server.extensions.image.imagePullPolicy }}
resources: resources:
{{- toYaml .Values.server.extensions.resources | nindent 10 }} {{- toYaml .Values.server.extensions.resources | nindent 10 }}
{{- if .Values.server.extensions.containerSecurityContext.enabled }} {{- with .Values.server.extensions.containerSecurityContext }}
securityContext: securityContext:
{{- omit .Values.server.extensions.containerSecurityContext "enabled" | toYaml | nindent 10 }} {{- toYaml . | nindent 10 }}
{{- end }} {{- end }}
volumeMounts: volumeMounts:
- name: extensions - name: extensions

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

@ -117,10 +117,10 @@ spec:
{{- end }} {{- end }}
resources: resources:
{{- toYaml .Values.dex.resources | nindent 10 }} {{- toYaml .Values.dex.resources | nindent 10 }}
{{- if .Values.dex.containerSecurityContext.enabled }} {{- with .Values.dex.containerSecurityContext }}
securityContext: securityContext:
{{- omit .Values.dex.containerSecurityContext "enabled" | toYaml | nindent 10 }} {{- toYaml . | nindent 10 }}
{{- end }} {{- end }}
volumeMounts: volumeMounts:
{{- with .Values.dex.volumeMounts }} {{- with .Values.dex.volumeMounts }}
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
@ -150,10 +150,10 @@ spec:
name: dexconfig name: dexconfig
resources: resources:
{{- toYaml .Values.dex.resources | nindent 10 }} {{- toYaml .Values.dex.resources | nindent 10 }}
{{- if .Values.dex.containerSecurityContext.enabled }} {{- with .Values.dex.containerSecurityContext }}
securityContext: securityContext:
{{- omit .Values.dex.containerSecurityContext "enabled" | toYaml | nindent 10 }} {{- toYaml . | nindent 10 }}
{{- end}} {{- end}}
{{- with .Values.dex.initContainers }} {{- with .Values.dex.initContainers }}
{{- tpl (toYaml .) $ | nindent 6 }} {{- tpl (toYaml .) $ | nindent 6 }}
{{- end }} {{- end }}

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

@ -41,11 +41,9 @@ spec:
hostAliases: hostAliases:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
{{- if .Values.redis.containerSecurityContext.enabled }}
{{- with .Values.redis.securityContext }} {{- with .Values.redis.securityContext }}
securityContext: securityContext:
{{- omit . "enabled" | toYaml | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }}
{{- end }} {{- end }}
{{- with .Values.redis.priorityClassName | default .Values.global.priorityClassName }} {{- with .Values.redis.priorityClassName | default .Values.global.priorityClassName }}
priorityClassName: {{ . }} priorityClassName: {{ . }}
@ -77,9 +75,9 @@ spec:
protocol: TCP protocol: TCP
resources: resources:
{{- toYaml .Values.redis.resources | nindent 10 }} {{- toYaml .Values.redis.resources | nindent 10 }}
{{- if .Values.redis.containerSecurityContext.enabled }} {{- with .Values.redis.containerSecurityContext }}
securityContext: securityContext:
{{- omit .Values.redis.containerSecurityContext "enabled" | toYaml | nindent 10 }} {{- toYaml . | nindent 10 }}
{{- end }} {{- end }}
{{- with .Values.redis.volumeMounts }} {{- with .Values.redis.volumeMounts }}
volumeMounts: volumeMounts:
@ -103,10 +101,10 @@ spec:
protocol: TCP protocol: TCP
resources: resources:
{{- toYaml .Values.redis.exporter.resources | nindent 10 }} {{- toYaml .Values.redis.exporter.resources | nindent 10 }}
{{- if .Values.redis.exporter.containerSecurityContext.enabled }} {{- with .Values.redis.exporter.containerSecurityContext }}
securityContext: securityContext:
{{- omit .Values.redis.exporter.containerSecurityContext "enabled" | toYaml | nindent 10 }} {{- toYaml . | nindent 10 }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- with .Values.redis.extraContainers }} {{- with .Values.redis.extraContainers }}
{{- tpl (toYaml .) $ | nindent 6 }} {{- tpl (toYaml .) $ | nindent 6 }}

9
charts/argo-cd/values.yaml
View file

@ -699,7 +699,6 @@ controller:
# -- Application controller container-level security context # -- Application controller container-level security context
# @default -- See [values.yaml] # @default -- See [values.yaml]
containerSecurityContext: containerSecurityContext:
enabled: true
runAsNonRoot: true runAsNonRoot: true
readOnlyRootFilesystem: true readOnlyRootFilesystem: true
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
@ -1018,7 +1017,6 @@ dex:
# -- Dex container-level security context # -- Dex container-level security context
# @default -- See [values.yaml] # @default -- See [values.yaml]
containerSecurityContext: containerSecurityContext:
enabled: true
runAsNonRoot: true runAsNonRoot: true
readOnlyRootFilesystem: true readOnlyRootFilesystem: true
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
@ -1170,7 +1168,6 @@ redis:
# -- Redis exporter security context # -- Redis exporter security context
# @default -- See [values.yaml] # @default -- See [values.yaml]
containerSecurityContext: containerSecurityContext:
enabled: true
runAsNonRoot: true runAsNonRoot: true
readOnlyRootFilesystem: true readOnlyRootFilesystem: true
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
@ -1264,7 +1261,6 @@ redis:
# -- Redis container-level security context # -- Redis container-level security context
# @default -- See [values.yaml] # @default -- See [values.yaml]
containerSecurityContext: containerSecurityContext:
enabled: true
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
capabilities: capabilities:
drop: drop:
@ -1528,7 +1524,6 @@ server:
# -- Server UI extensions container-level security context # -- Server UI extensions container-level security context
# @default -- See [values.yaml] # @default -- See [values.yaml]
containerSecurityContext: containerSecurityContext:
enabled: true
runAsNonRoot: true runAsNonRoot: true
readOnlyRootFilesystem: true readOnlyRootFilesystem: true
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
@ -1633,7 +1628,6 @@ server:
# -- Server container-level security context # -- Server container-level security context
# @default -- See [values.yaml] # @default -- See [values.yaml]
containerSecurityContext: containerSecurityContext:
enabled: true
runAsNonRoot: true runAsNonRoot: true
readOnlyRootFilesystem: true readOnlyRootFilesystem: true
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
@ -2165,7 +2159,6 @@ repoServer:
# -- Repo server container-level security context # -- Repo server container-level security context
# @default -- See [values.yaml] # @default -- See [values.yaml]
containerSecurityContext: containerSecurityContext:
enabled: true
runAsNonRoot: true runAsNonRoot: true
readOnlyRootFilesystem: true readOnlyRootFilesystem: true
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
@ -2519,7 +2512,6 @@ applicationSet:
# -- ApplicationSet controller container-level security context # -- ApplicationSet controller container-level security context
# @default -- See [values.yaml] # @default -- See [values.yaml]
containerSecurityContext: containerSecurityContext:
enabled: true
runAsNonRoot: true runAsNonRoot: true
readOnlyRootFilesystem: true readOnlyRootFilesystem: true
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
@ -2858,7 +2850,6 @@ notifications:
# -- Notification controller container-level security Context # -- Notification controller container-level security Context
# @default -- See [values.yaml] # @default -- See [values.yaml]
containerSecurityContext: containerSecurityContext:
enabled: true
runAsNonRoot: true runAsNonRoot: true
readOnlyRootFilesystem: true readOnlyRootFilesystem: true
allowPrivilegeEscalation: false allowPrivilegeEscalation: false