feat: Allow setting the log format to json for Argo CD (#463)
This commit is contained in:
parent
50a66fd7ab
commit
41ddad4aba
5 changed files with 13 additions and 1 deletions
|
@ -2,7 +2,7 @@ apiVersion: v1
|
||||||
appVersion: 1.7.6
|
appVersion: 1.7.6
|
||||||
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.7.6
|
version: 2.8.0
|
||||||
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:
|
||||||
|
|
|
@ -56,6 +56,8 @@ spec:
|
||||||
- {{ .Values.controller.args.appResyncPeriod | quote }}
|
- {{ .Values.controller.args.appResyncPeriod | quote }}
|
||||||
- --repo-server
|
- --repo-server
|
||||||
- {{ template "argo-cd.repoServer.fullname" . }}:{{ .Values.repoServer.service.port }}
|
- {{ template "argo-cd.repoServer.fullname" . }}:{{ .Values.repoServer.service.port }}
|
||||||
|
- --logformat
|
||||||
|
- {{ .Values.controller.logFormat }}
|
||||||
- --loglevel
|
- --loglevel
|
||||||
- {{ .Values.controller.logLevel }}
|
- {{ .Values.controller.logLevel }}
|
||||||
{{- if or (and .Values.redis.enabled (not $redisHa.enabled)) (and $redisHa.enabled $redisHa.haproxy.enabled) }}
|
{{- if or (and .Values.redis.enabled (not $redisHa.enabled)) (and $redisHa.enabled $redisHa.haproxy.enabled) }}
|
||||||
|
|
|
@ -60,6 +60,8 @@ spec:
|
||||||
- --redis
|
- --redis
|
||||||
- {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }}
|
- {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
- --logformat
|
||||||
|
- {{ .Values.repoServer.logFormat }}
|
||||||
- --loglevel
|
- --loglevel
|
||||||
- {{ .Values.repoServer.logLevel }}
|
- {{ .Values.repoServer.logLevel }}
|
||||||
{{- with .Values.repoServer.extraArgs }}
|
{{- with .Values.repoServer.extraArgs }}
|
||||||
|
|
|
@ -61,6 +61,8 @@ spec:
|
||||||
- --dex-server
|
- --dex-server
|
||||||
- http://{{ template "argo-cd.dex.fullname" . }}:{{ .Values.dex.servicePortHttp }}
|
- http://{{ template "argo-cd.dex.fullname" . }}:{{ .Values.dex.servicePortHttp }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
- --logformat
|
||||||
|
- {{ .Values.server.logFormat }}
|
||||||
- --loglevel
|
- --loglevel
|
||||||
- {{ .Values.server.logLevel }}
|
- {{ .Values.server.logLevel }}
|
||||||
{{- if or (and .Values.redis.enabled (not $redisHa.enabled)) (and $redisHa.enabled $redisHa.haproxy.enabled) }}
|
{{- if or (and .Values.redis.enabled (not $redisHa.enabled)) (and $redisHa.enabled $redisHa.haproxy.enabled) }}
|
||||||
|
|
|
@ -37,6 +37,8 @@ controller:
|
||||||
operationProcessors: "10"
|
operationProcessors: "10"
|
||||||
appResyncPeriod: "180"
|
appResyncPeriod: "180"
|
||||||
|
|
||||||
|
## Argo controller log format: text|json
|
||||||
|
logFormat: text
|
||||||
## Argo controller log level
|
## Argo controller log level
|
||||||
logLevel: info
|
logLevel: info
|
||||||
|
|
||||||
|
@ -352,6 +354,8 @@ server:
|
||||||
##
|
##
|
||||||
env: []
|
env: []
|
||||||
|
|
||||||
|
## Argo server log format: text|json
|
||||||
|
logFormat: text
|
||||||
## Argo server log level
|
## Argo server log level
|
||||||
logLevel: info
|
logLevel: info
|
||||||
|
|
||||||
|
@ -675,6 +679,8 @@ repoServer:
|
||||||
##
|
##
|
||||||
env: []
|
env: []
|
||||||
|
|
||||||
|
## Argo repoServer log format: text|json
|
||||||
|
logFormat: text
|
||||||
## Argo repoServer log level
|
## Argo repoServer log level
|
||||||
logLevel: info
|
logLevel: info
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue