ArmstrongLabs
/
argo-helm
forked from argoproj/argo-helm
1
0
Fork 0
Code Pull Requests Packages Activity

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

Signed-off-by: Petr Drastil <petr.drastil@gmail.com>
main argo-cd-5.3.0
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
charts/argo-cd/Chart.yaml
View File

@ -2,7 +2,7 @@ apiVersion: v2
appVersion: v2.4.11
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd
version: 5.2.2
version: 5.3.0
home: https://github.com/argoproj/argo-helm
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
keywords:
@ -21,5 +21,5 @@ dependencies:
condition: redis-ha.enabled
annotations:
artifacthub.io/changes: |
- "[Changed]: Move notification configs to config folder"
- "[Changed]: Use default names for notification configs"
- "[Added]: Global configuration for logging"
- "[Added]: ApplicationSet configuration for logging"

20
charts/argo-cd/README.md
View File

@ -336,6 +336,8 @@ NAME: my-release
| global.image.repository | string | `"quay.io/argoproj/argocd"` | If defined, a repository applied to all Argo CD deployments |
| global.image.tag | string | `""` | Overrides the global Argo CD image tag whose default is the chart appVersion |
| global.imagePullSecrets | list | `[]` | If defined, uses a Secret to pull an image from a private Docker registry or repository |
| global.logging.format | string | `"text"` | Set the global logging format. Either: `text` or `json` |
| global.logging.level | string | `"info"` | Set the global logging level. One of: `debug`, `info`, `warn` or `error` |
| global.networkPolicy.create | bool | `false` | Create NetworkPolicy objects for all components |
| global.networkPolicy.defaultDenyIngress | bool | `false` | Default deny all ingress traffic |
| global.podAnnotations | object | `{}` | Annotations for the all deployed pods |
@ -402,8 +404,8 @@ NAME: my-release
| controller.livenessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the [probe] |
| controller.livenessProbe.successThreshold | int | `1` | Minimum consecutive successes for the [probe] to be considered successful after having failed |
| controller.livenessProbe.timeoutSeconds | int | `1` | Number of seconds after which the [probe] times out |
| controller.logFormat | string | `"text"` | Application controller log format. Either `text` or `json` |
| controller.logLevel | string | `"info"` | Application controller log level |
| controller.logFormat | string | `""` (defaults to global.logging.format) | Application controller log format. Either `text` or `json` |
| controller.logLevel | string | `""` (defaults to global.logging.level) | Application controller log level. One of: `debug`, `info`, `warn` or `error` |
| controller.metrics.applicationLabels.enabled | bool | `false` | Enables additional labels in argocd_app_labels metric |
| controller.metrics.applicationLabels.labels | list | `[]` | Additional labels |
| controller.metrics.enabled | bool | `false` | Deploy metrics service |
@ -481,8 +483,8 @@ NAME: my-release
| repoServer.livenessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the [probe] |
| repoServer.livenessProbe.successThreshold | int | `1` | Minimum consecutive successes for the [probe] to be considered successful after having failed |
| repoServer.livenessProbe.timeoutSeconds | int | `1` | Number of seconds after which the [probe] times out |
| repoServer.logFormat | string | `"text"` | Repo server log format: Either `text` or `json` |
| repoServer.logLevel | string | `"info"` | Repo server log level |
| repoServer.logFormat | string | `""` (defaults to global.logging.level) | Repo server log format: Either `text` or `json` |
| repoServer.logLevel | string | `""` (defaults to global.logging.format) | Repo server log level. One of: `debug`, `info`, `warn` or `error` |
| repoServer.metrics.enabled | bool | `false` | Deploy metrics service |
| repoServer.metrics.service.annotations | object | `{}` | Metrics service annotations |
| repoServer.metrics.service.labels | object | `{}` | Metrics service labels |
@ -602,8 +604,8 @@ NAME: my-release
| server.livenessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the [probe] |
| server.livenessProbe.successThreshold | int | `1` | Minimum consecutive successes for the [probe] to be considered successful after having failed |
| server.livenessProbe.timeoutSeconds | int | `1` | Number of seconds after which the [probe] times out |
| server.logFormat | string | `"text"` | Argo CD server log format: Either `text` or `json` |
| server.logLevel | string | `"info"` | Argo CD server log level |
| server.logFormat | string | `""` (defaults to global.logging.format) | Argo CD server log format: Either `text` or `json` |
| server.logLevel | string | `""` (defaults to global.logging.level) | Argo CD server log level. One of: `debug`, `info`, `warn` or `error` |
| server.metrics.enabled | bool | `false` | Deploy metrics service |
| server.metrics.service.annotations | object | `{}` | Metrics service annotations |
| server.metrics.service.labels | object | `{}` | Metrics service labels |
@ -861,6 +863,8 @@ If you want to use an existing Redis (eg. a managed service from a cloud provide
| applicationSet.image.repository | string | `""` (defaults to global.image.repository) | Repository to use for the application set controller |
| applicationSet.image.tag | string | `""` (defaults to global.image.tag) | Tag to use for the application set controller |
| applicationSet.imagePullSecrets | list | `[]` | If defined, uses a Secret to pull an image from a private Docker registry or repository. |
| applicationSet.logFormat | string | `""` (defaults to global.logging.format) | ApplicationSet controller log format. Either `text` or `json` |
| applicationSet.logLevel | string | `""` (defaults to global.logging.level) | ApplicationSet controller log level. One of: `debug`, `info`, `warn`, `error` |
| applicationSet.metrics.enabled | bool | `false` | Deploy metrics service |
| applicationSet.metrics.service.annotations | object | `{}` | Metrics service annotations |
| applicationSet.metrics.service.labels | object | `{}` | Metrics service labels |
@ -938,8 +942,8 @@ If you want to use an existing Redis (eg. a managed service from a cloud provide
| notifications.image.repository | string | `""` (defaults to global.image.repository) | Repository to use for the notifications controller |
| notifications.image.tag | string | `""` (defaults to global.image.tag) | Tag to use for the notifications controller |
| notifications.imagePullSecrets | list | `[]` | Secrets with credentials to pull images from a private registry |
| notifications.logFormat | string | `"text"` | Application controller log format. Either `text` or `json` |
| notifications.logLevel | string | `"info"` | Set the logging level. (One of: `debug`, `info`, `warn`, `error`) |
| notifications.logFormat | string | `""` (defaults to global.logging.format) | Application controller log format. Either `text` or `json` |
| notifications.logLevel | string | `""` (defaults to global.logging.level) | Application controller log level. One of: `debug`, `info`, `warn`, `error` |
| notifications.metrics.enabled | bool | `false` | Enables prometheus metrics server |
| notifications.metrics.port | int | `9001` | Metrics port |
| notifications.metrics.service.annotations | object | `{}` | Metrics service annotations |

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 }}

45
charts/argo-cd/values.yaml
View File

@ -26,6 +26,11 @@ global:
tag: ""
# -- If defined, a imagePullPolicy applied to all Argo CD deployments
imagePullPolicy: IfNotPresent
logging:
# -- Set the global logging format. Either: `text` or `json`
format: text
# -- Set the global logging level. One of: `debug`, `info`, `warn` or `error`
level: info
# -- Annotations for the all deployed pods
podAnnotations: {}
# -- Labels for the all deployed pods
@ -131,9 +136,11 @@ controller:
repoServerTimeoutSeconds: "60"
# -- Application controller log format. Either `text` or `json`
logFormat: text
# -- Application controller log level
logLevel: info
# @default -- `""` (defaults to global.logging.format)
logFormat: ""
# -- Application controller log level. One of: `debug`, `info`, `warn` or `error`
# @default -- `""` (defaults to global.logging.level)
logLevel: ""
# -- Additional command line arguments to pass to application controller
extraArgs: []
@ -909,9 +916,11 @@ server:
lifecycle: {}
# -- Argo CD server log format: Either `text` or `json`
logFormat: text
# -- Argo CD server log level
logLevel: info
# @default -- `""` (defaults to global.logging.format)
logFormat: ""
# -- Argo CD server log level. One of: `debug`, `info`, `warn` or `error`
# @default -- `""` (defaults to global.logging.level)
logLevel: ""
# -- Annotations to be added to server pods
podAnnotations: {}
@ -1486,9 +1495,11 @@ repoServer:
# name: secret-name
# -- Repo server log format: Either `text` or `json`
logFormat: text
# -- Repo server log level
logLevel: info
# @default -- `""` (defaults to global.logging.level)
logFormat: ""
# -- Repo server log level. One of: `debug`, `info`, `warn` or `error`
# @default -- `""` (defaults to global.logging.format)
logLevel: ""
# -- Annotations to be added to repo server pods
podAnnotations: {}
@ -1950,6 +1961,13 @@ applicationSet:
# -- Enable dry run mode
dryRun: false
# -- ApplicationSet controller log format. Either `text` or `json`
# @default -- `""` (defaults to global.logging.format)
logFormat: ""
# -- ApplicationSet controller log level. One of: `debug`, `info`, `warn`, `error`
# @default -- `""` (defaults to global.logging.level)
logLevel: ""
# -- Additional containers to be added to the applicationset controller pod
extraContainers: []
@ -2067,7 +2085,6 @@ applicationSet:
# -- List of extra cli args to add
extraArgs: []
# - --loglevel=warn
# -- Environment variables to pass to the controller
extraEnv: []
@ -2190,10 +2207,12 @@ notifications:
# email-password:
# For more information: https://argocd-notifications.readthedocs.io/en/stable/services/email/
# -- Set the logging level. (One of: `debug`, `info`, `warn`, `error`)
logLevel: info
# -- Application controller log format. Either `text` or `json`
logFormat: text
# @default -- `""` (defaults to global.logging.format)
logFormat: ""
# -- Application controller log level. One of: `debug`, `info`, `warn`, `error`
# @default -- `""` (defaults to global.logging.level)
logLevel: ""
# -- Extra arguments to provide to the controller
extraArgs: []