From 83e9e19e2da4819f1d522c8ce943fe1d47eed3d0 Mon Sep 17 00:00:00 2001 From: Roman Date: Thu, 1 Oct 2020 06:37:26 +0300 Subject: [PATCH 1/3] fix: default argocd version in documentation (#456) * Fix default argocd version in documentation * Bump chart version --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 87cfab70..75fc9ae3 100644 --- a/charts/argo-cd/Chart.yaml +++ b/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.7.5 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 813e08e1..b58434e2 100644 --- a/charts/argo-cd/README.md +++ b/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 | `[]` | From 50a66fd7ab21e625fb8a0065e0c2294615076217 Mon Sep 17 00:00:00 2001 From: Yann Soubeyrand Date: Fri, 2 Oct 2020 05:09:25 +0200 Subject: [PATCH 2/3] chore: update certificate apiVersion (#458) * chore: update certificate apiVersion * chore: bump chart version --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/templates/argocd-server/certificate.yaml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 75fc9ae3..c8e9ca39 100644 --- a/charts/argo-cd/Chart.yaml +++ b/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.5 +version: 2.7.6 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: diff --git a/charts/argo-cd/templates/argocd-server/certificate.yaml b/charts/argo-cd/templates/argocd-server/certificate.yaml index be778be8..b2f227b5 100644 --- a/charts/argo-cd/templates/argocd-server/certificate.yaml +++ b/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 From 41ddad4aba2f57865b3e0aa0f42e02ff0ca7a662 Mon Sep 17 00:00:00 2001 From: Mike Bryant Date: Fri, 2 Oct 2020 04:12:35 +0100 Subject: [PATCH 3/3] feat: Allow setting the log format to json for Argo CD (#463) --- charts/argo-cd/Chart.yaml | 2 +- .../templates/argocd-application-controller/deployment.yaml | 2 ++ charts/argo-cd/templates/argocd-repo-server/deployment.yaml | 2 ++ charts/argo-cd/templates/argocd-server/deployment.yaml | 2 ++ charts/argo-cd/values.yaml | 6 ++++++ 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index c8e9ca39..2da7db6a 100644 --- a/charts/argo-cd/Chart.yaml +++ b/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.6 +version: 2.8.0 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: diff --git a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml index c9f45142..3067e969 100755 --- a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml +++ b/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) }} diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml index 846b542d..de6c21a3 100755 --- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml +++ b/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 }} diff --git a/charts/argo-cd/templates/argocd-server/deployment.yaml b/charts/argo-cd/templates/argocd-server/deployment.yaml index ca7c9ba4..b54b947f 100755 --- a/charts/argo-cd/templates/argocd-server/deployment.yaml +++ b/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) }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 5500f01d..c87d0c79 100755 --- a/charts/argo-cd/values.yaml +++ b/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