From d4c9011e17df2f30744658a9cb705d4c0dc0d369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Juan=20G=C3=B3mez=20Pe=C3=B1alver?= Date: Wed, 19 Feb 2020 21:36:15 +0000 Subject: [PATCH] feat: extraArgs allows same flag multiple times MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Carlos Juan Gómez Peñalver --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/README.md | 2 +- charts/argo-cd/templates/argocd-repo-server/deployment.yaml | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 04a5fb87..0b013dfa 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "1.4.2" description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 1.8.7 +version: 2.0.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/README.md b/charts/argo-cd/README.md index a2a5d751..afdc25bd 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -15,7 +15,7 @@ This chart currently installs the non-HA version of ArgoCD. ### 1.8.0 to 2.0.0 -`controller.extraArgs`, `repoServer.extraArgs` and `server.extraArgs` are now arrays of strings intead of a map +`controller.extraArgs`, `repoServer.extraArgs` and `server.extraArgs` are not arrays of strings intead of a map What was ``` diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml index ff6d796c..561a7580 100755 --- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml @@ -58,8 +58,13 @@ spec: {{- end }} - --loglevel - {{ .Values.repoServer.logLevel }} +<<<<<<< HEAD {{- with .Values.repoServer.extraArgs }} {{- . | toYaml | nindent 8 }} +======= + {{- with .Values.controller.extraArgs }} + {{ . | toYaml | nindent 8 }} +>>>>>>> feat: extraArgs allows same flag multiple times {{- end }} {{- if .Values.repoServer.containerSecurityContext }} securityContext: {{- toYaml .Values.repoServer.containerSecurityContext | nindent 10 }}