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

feat(argo-cd): Add global logging options (#1422)

Browse source 
Signed-off-by: Petr Drastil <petr.drastil@gmail.com>
This commit is contained in:
Petr Drastil 2022-08-25 12:41:43 +02:00 • committed by GitHub
parent 3930788628
commit 31e0156992
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 59 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -51,9 +51,9 @@ spec:
- --repo-server-timeout-seconds
- {{ .Values.controller.args.repoServerTimeoutSeconds | quote }}
- --logformat
- {{ .Values.controller.logFormat }}
- {{ default .Values.global.logging.format .Values.controller.logFormat }}
- --loglevel
- {{ .Values.controller.logLevel }}
- {{ default .Values.global.logging.level .Values.controller.logLevel }}
{{- if .Values.controller.metrics.applicationLabels.enabled }}
{{- range .Values.controller.metrics.applicationLabels.labels }}
- --metrics-application-labels

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

@ -40,6 +40,10 @@ spec:
command:
- entrypoint.sh
- argocd-applicationset-controller
- --logformat
- {{ default .Values.global.logging.format .Values.applicationSet.logFormat }}
- --loglevel
- {{ default .Values.global.logging.level .Values.applicationSet.logLevel }}
- --metrics-addr={{ .Values.applicationSet.args.metricsAddr }}
- --probe-addr={{ .Values.applicationSet.args.probeBindAddr }}
{{- if or (gt ( .Values.applicationSet.replicaCount | int64) 1) .Values.applicationSet.args.enableLeaderElection }}

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

@ -41,8 +41,8 @@ spec:
{{- toYaml .Values.notifications.resources | nindent 12 }}
command:
- argocd-notifications
- --loglevel={{ .Values.notifications.logLevel }}
- --logformat={{ .Values.notifications.logFormat }}
- --loglevel={{ default .Values.global.logging.level .Values.notifications.logLevel }}
- --logformat={{ default .Values.global.logging.format .Values.notifications.logFormat }}
{{- if .Values.notifications.metrics.enabled }}
- --metrics-port={{ .Values.notifications.metrics.port }}
{{- end }}

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

@ -52,9 +52,9 @@ spec:
- {{ .Values.externalRedis.host }}:{{ .Values.externalRedis.port }}
{{- end }}
- --logformat
- {{ .Values.repoServer.logFormat }}
- {{ default .Values.global.logging.format .Values.repoServer.logFormat }}
- --loglevel
- {{ .Values.repoServer.logLevel }}
- {{ default .Values.global.logging.level .Values.repoServer.logLevel }}
{{- with .Values.repoServer.extraArgs }}
{{- . | toYaml | nindent 8 }}
{{- end }}

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

@ -53,9 +53,9 @@ spec:
- http://{{ template "argo-cd.dex.fullname" . }}:{{ .Values.dex.servicePortHttp }}
{{- end }}
- --logformat
- {{ .Values.server.logFormat }}
- {{default .Values.global.logging.format .Values.server.logFormat }}
- --loglevel
- {{ .Values.server.logLevel }}
- {{ default .Values.global.logging.level .Values.server.logLevel }}
{{- if or (and .Values.redis.enabled (not $redisHa.enabled)) (and $redisHa.enabled $redisHa.haproxy.enabled) }}
- --redis
- {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }}