Merge branch 'master' into argo-cd-with-redis-ha

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.8
+version: 2.1.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

@@ -11,6 +11,27 @@ The default installation is intended to be similar to the provided ArgoCD [relea
 
 This chart currently installs the non-HA version of ArgoCD.
 
+## Upgrading
+
+### 1.8.7 to 2.0.0
+
+`controller.extraArgs`, `repoServer.extraArgs` and `server.extraArgs`  are not arrays of strings intead of a map
+
+What was
+```
+controller:
+  extraArgs:
+    insecure: ""
+```
+
+is now
+
+```
+controller:
+  extraArgs:
+  - --insecure
+```
+
 ## Prerequisites
 
 - Kubernetes 1.7+
@@ -60,7 +81,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
 | controller.args.statusProcessors | define the controller `--status-processors` | `"20"` |
 | controller.clusterAdminAccess.enabled | Enable RBAC for local cluster deployments. | `true` |
 | controller.containerPort | Controller listening port. | `8082` |
-| controller.extraArgs | Additional arguments for the controller. A list of key:value pairs | `[]` |
+| controller.extraArgs | Additional arguments for the controller. A list of flags | `[]` |
 | controller.env | Environment variables for the controller. | `[]` |
 | controller.image.repository | Repository to use for the controller | `global.image.repository` |
 | controller.image.imagePullPolicy | Image pull policy for the controller | `global.image.imagePullPolicy` |
@@ -108,7 +129,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
 | repoServer.autoscaling.targetCPUUtilizationPercentage | Average CPU utilization percentage for the repo server HPA | `50` |
 | repoServer.autoscaling.targetMemoryUtilizationPercentage | Average memory utilization percentage for the repo server HPA | `50` |
 | repoServer.containerPort | Repo server port | `8081` |
-| repoServer.extraArgs | Additional arguments for the repo server. A  list of key:value pairs. | `[]` |
+| repoServer.extraArgs | Additional arguments for the repo server. A  list of flags. | `[]` |
 | repoServer.env | Environment variables for the repo server. | `[]` |
 | repoServer.image.repository | Repository to use for the repo server | `global.image.repository` |
 | repoServer.image.imagePullPolicy | Image pull policy for the repo server | `global.image.imagePullPolicy` |
@@ -161,7 +182,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
 | server.clusterAdminAccess.enabled | Enable RBAC for local cluster deployments. | `true` |
 | server.config | [General Argo CD configuration](https://argoproj.github.io/argo-cd/operator-manual/declarative-setup/#repositories) | See [values.yaml](values.yaml) |
 | server.containerPort | Server container port. | `8080` |
-| server.extraArgs | Additional arguments for the server. A list of key:value pairs. | `[]` |
+| server.extraArgs | Additional arguments for the server. A list of flags. | `[]` |
 | server.env | Environment variables for the server. | `[]` |
 | server.image.repository | Repository to use for the server | `global.image.repository` |
 | server.image.imagePullPolicy | Image pull policy for the server | `global.image.imagePullPolicy` |

charts/argo-cd/templates/NOTES.txt

@@ -6,7 +6,7 @@ In order to access the server UI you have the following options:
 
 2. enable ingress in the values file `service.ingress.enabled` and either
       - Add the annotation for ssl passthrough: https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/ingress.md#option-1-ssl-passthrough
-      - Add the `insecure: ""` flag to `server.extraArgs` in the values file and terminate SSL at your ingress: https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/ingress.md#option-2-multiple-ingress-objects-and-hosts
+      - Add the `--insecure` flag to `server.extraArgs` in the values file and terminate SSL at your ingress: https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/ingress.md#option-2-multiple-ingress-objects-and-hosts
 
 
 After reaching the UI the first time you can login with username: admin and the password will be the

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

@@ -60,12 +60,8 @@ spec:
         - --redis
         - {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }}
         {{- end }}
-        {{- range $key, $value := .Values.controller.extraArgs }}
+        {{- with .Values.controller.extraArgs }}
-          {{- if $value }}
+        {{- . | toYaml | nindent 8 }}
-        - --{{ $key }}={{ $value }}
-          {{- else }}
-        - --{{ $key }}
-          {{- end }}
         {{- end }}
         image: {{ default .Values.global.image.repository .Values.controller.image.repository }}:{{ default .Values.global.image.tag .Values.controller.image.tag }}
         imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.controller.image.imagePullPolicy }}

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

@@ -58,12 +58,8 @@ spec:
         {{- end }}
         - --loglevel
         - {{ .Values.repoServer.logLevel }}
-        {{- range $key, $value := .Values.repoServer.extraArgs }}
+        {{- with .Values.repoServer.extraArgs }}
-          {{- if $value }}
+        {{- . | toYaml | nindent 8 }}
-        - --{{ $key }}={{ $value }}
-          {{- else }}
-        - --{{ $key }}
-          {{- end }}
         {{- end }}
         {{- if .Values.repoServer.containerSecurityContext }}
         securityContext: {{- toYaml .Values.repoServer.containerSecurityContext | nindent 10 }}

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

@@ -66,12 +66,8 @@ spec:
         - --redis
         - {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }}
         {{- end }}
-        {{- range $key, $value := .Values.server.extraArgs }}
+        {{- with .Values.server.extraArgs }}
-          {{- if $value }}
+        {{- . | toYaml | nindent 8 }}
-        - --{{ $key }}={{ $value }}
-          {{- else }}
-        - --{{ $key }}
-          {{- end }}
         {{- end }}
         {{- if .Values.server.containerSecurityContext }}
         securityContext: {{- toYaml .Values.server.containerSecurityContext | nindent 10 }}

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

@@ -4,7 +4,7 @@ kind: ServiceMonitor
 metadata:
   name: {{ template "argo-cd.server.fullname" . }}
   {{- if .Values.server.metrics.serviceMonitor.namespace }}
-  namespace: {{ .Values.controller.metrics.serviceMonitor.namespace }}
+  namespace: {{ .Values.server.metrics.serviceMonitor.namespace }}
   {{- end }}
   labels:
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}