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

fix(argo-cd): Deprecate logLevel and logFormat values for dex and notifications controller (#3209)

Browse source 
* fix(argo-cd): Deprecate logLevel and logFormat values for dex and notifications controller

These are deprecated in favor of corresponding settings in `config.params`, to match with
the official docs: https://argo-cd.readthedocs.io/en/stable/operator-manual/argocd-cmd-params-cm-yaml/

The same changes were previously done for all other components much earlier in
https://github.com/argoproj/argo-helm/pull/1267
and then these params were removed in https://github.com/argoproj/argo-helm/pull/2407

Signed-off-by: Mikhail Zholobov <legal90@gmail.com>

* chore(argo-cd): Bump argo-cd chart version

Signed-off-by: Mikhail Zholobov <legal90@gmail.com>

---------

Signed-off-by: Mikhail Zholobov <legal90@gmail.com>
This commit is contained in:
Mikhail Zholobov 2025-03-31 22:39:17 +02:00 • committed by GitHub
parent 0ee7597512
commit 54b6a57d3f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 42 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

12
charts/argo-cd/templates/NOTES.txt
View file

@ -1,3 +1,15 @@
{{- if .Values.notifications.logLevel }}
DEPRECATED option notifications.logLevel - Use `configs.params."notificationscontroller.log.level"`
{{- end }}
{{- if .Values.notifications.logFormat }}
DEPRECATED option notifications.logFormat - Use `configs.params."notificationscontroller.log.format"`
{{- end }}
{{- if .Values.dex.logLevel }}
DEPRECATED option dex.logLevel - Use `configs.params."dexserver.log.level"`
{{- end }}
{{- if .Values.dex.logFormat }}
DEPRECATED option dex.logFormat - Use `configs.params."dexserver.log.format"`
{{- end }}
In order to access the server UI you have the following options:
1. kubectl port-forward service/{{ include "argo-cd.fullname" . }}-server -n {{ include "argo-cd.namespace" . }} 8080:443

2
charts/argo-cd/templates/_helpers.tpl
View file

@ -238,7 +238,7 @@ NOTE: Configuration keys must be stored as dict because YAML treats dot as separ
{{- $_ := set $presets "server.dex.server" (include "argo-cd.dex.server" .) -}}
{{- $_ := set $presets "server.dex.server.strict.tls" .Values.dex.certificateSecret.enabled -}}
{{- end -}}
{{- range $component := tuple "applicationsetcontroller" "controller" "server" "reposerver" -}}
{{- range $component := tuple "applicationsetcontroller" "controller" "server" "reposerver" "notificationscontroller" "dexserver" -}}
{{- $_ := set $presets (printf "%s.log.format" $component) $.Values.global.logging.format -}}
{{- $_ := set $presets (printf "%s.log.level" $component) $.Values.global.logging.level -}}
{{- end -}}

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

@ -66,11 +66,15 @@ spec:
args:
- /usr/local/bin/argocd-notifications
- --metrics-port={{ .Values.notifications.containerPorts.metrics }}
- --loglevel={{ default .Values.global.logging.level .Values.notifications.logLevel }}
- --logformat={{ default .Values.global.logging.format .Values.notifications.logFormat }}
- --namespace={{ include "argo-cd.namespace" . }}
- --argocd-repo-server={{ template "argo-cd.repoServer.fullname" . }}:{{ .Values.repoServer.service.port }}
- --secret-name={{ .Values.notifications.secret.name }}
{{- with .Values.notifications.logLevel }}
- --loglevel={{ . | quote }}
{{- end }}
{{- with .Values.notifications.logFormat }}
- --logformat={{ . | quote }}
{{- end }}
{{- range .Values.notifications.extraArgs }}
- {{ . | squote }}
{{- end }}

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

@ -72,8 +72,12 @@ spec:
imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.dex.image.imagePullPolicy }}
command:
- /shared/argocd-dex
- --logformat={{ default .Values.global.logging.format .Values.dex.logFormat }}
- --loglevel={{ default .Values.global.logging.level .Values.dex.logLevel }}
{{- with .Values.dex.logLevel }}
- --loglevel={{ . | quote }}
{{- end }}
{{- with .Values.dex.logFormat }}
- --logformat={{ . | quote }}
{{- end }}
args:
- rundex
{{- with .Values.dex.extraArgs }}