Merge branch 'master' into feat-conditional-server-service-account-creation

charts/argo-cd/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 1.7.6
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 2.7.4
+version: 2.8.0
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:

charts/argo-cd/README.md

@@ -62,7 +62,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
 |-----|------|---------|
 | global.image.imagePullPolicy | If defined, a imagePullPolicy applied to all ArgoCD deployments. | `"IfNotPresent"` |
 | global.image.repository | If defined, a repository applied to all ArgoCD deployments. | `"argoproj/argocd"` |
-| global.image.tag | If defined, a tag applied to all ArgoCD deployments. | `"v1.6.1"` |
+| global.image.tag | If defined, a tag applied to all ArgoCD deployments. | `"v1.7.6"` |
 | global.securityContext | Toggle and define securityContext | See [values.yaml](values.yaml) |
 | global.imagePullSecrets | If defined, uses a Secret to pull an image from a private Docker registry or repository. | `[]` |
 | global.hostAliases | Mapping between IP and hostnames that will be injected as entries in the pod's hosts files | `[]` |

charts/argo-cd/templates/argocd-application-controller/deployment.yaml

@@ -56,6 +56,8 @@ spec:
         - {{ .Values.controller.args.appResyncPeriod | quote }}
         - --repo-server
         - {{ template "argo-cd.repoServer.fullname" . }}:{{ .Values.repoServer.service.port }}
+        - --logformat
+        - {{ .Values.controller.logFormat }}
         - --loglevel
         - {{ .Values.controller.logLevel }}
         {{- if or (and .Values.redis.enabled (not $redisHa.enabled)) (and $redisHa.enabled $redisHa.haproxy.enabled) }}

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

@@ -60,6 +60,8 @@ spec:
         - --redis
         - {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }}
         {{- end }}
+        - --logformat
+        - {{ .Values.repoServer.logFormat }}
         - --loglevel
         - {{ .Values.repoServer.logLevel }}
         {{- with .Values.repoServer.extraArgs }}

charts/argo-cd/templates/argocd-server/certificate.yaml

@@ -1,5 +1,7 @@
 {{- if .Values.server.certificate.enabled -}}
-{{- if .Capabilities.APIVersions.Has "cert-manager.io/v1alpha3" }}
+{{- if .Capabilities.APIVersions.Has "cert-manager.io/v1" }}
+apiVersion: cert-manager.io/v1
+{{- else if .Capabilities.APIVersions.Has "cert-manager.io/v1alpha3" }}
 apiVersion: cert-manager.io/v1alpha3
 {{- else if .Capabilities.APIVersions.Has "cert-manager.io/v1alpha2" }}
 apiVersion: cert-manager.io/v1alpha2

charts/argo-cd/templates/argocd-server/deployment.yaml

@@ -61,6 +61,8 @@ spec:
         - --dex-server
         - http://{{ template "argo-cd.dex.fullname" . }}:{{ .Values.dex.servicePortHttp }}
         {{- end }}
+        - --logformat
+        - {{ .Values.server.logFormat }}
         - --loglevel
         - {{ .Values.server.logLevel }}
         {{- if or (and .Values.redis.enabled (not $redisHa.enabled)) (and $redisHa.enabled $redisHa.haproxy.enabled) }}

charts/argo-cd/values.yaml

@@ -37,6 +37,8 @@ controller:
     operationProcessors: "10"
     appResyncPeriod: "180"
 
+  ## Argo controller log format: text|json
+  logFormat: text
   ## Argo controller log level
   logLevel: info
 
@@ -352,6 +354,8 @@ server:
   ##
   env: []
 
+  ## Argo server log format: text|json
+  logFormat: text
   ## Argo server log level
   logLevel: info
 
@@ -675,6 +679,8 @@ repoServer:
   ##
   env: []
 
+  ## Argo repoServer log format: text|json
+  logFormat: text
   ## Argo repoServer log level
   logLevel: info