Merge branch 'master' into master

charts/argo-cd/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: "1.4.1"
+appVersion: "1.4.2"
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 1.7.0
+version: 1.7.3
 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

@@ -36,7 +36,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.4.1"` |
+| global.image.tag | If defined, a tag applied to all ArgoCD deployments. | `"v1.4.2"` |
 | global.securityContext | Toggle and define securityContext | See [values.yaml](values.yaml) | 
 | nameOverride | Provide a name in place of `argocd` | `"argocd"` |
 | installCRDs | bool | `true` | Install CRDs if you are using Helm2. |
@@ -129,6 +129,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
 | repoServer.readinessProbe.periodSeconds | int | `10` |
 | repoServer.readinessProbe.successThreshold | int | `1` |
 | repoServer.readinessProbe.timeoutSeconds | int | `1` |
+| repoServer.replicas | The number of repo server pods to run | `1` |
 | repoServer.resources | Resource limits and requests for the repo server pods. | `{}` |
 | repoServer.service.annotations | Repo server service annotations. | `{}` |
 | repoServer.service.labels | Repo server service labels. | `{}` |
@@ -183,6 +184,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
 | server.readinessProbe.periodSeconds | int | `10` |
 | server.readinessProbe.successThreshold | int | `1` |
 | server.readinessProbe.timeoutSeconds | int | `1` |
+| server.replicas | The number of server pods to run | `1` |
 | server.resources | Resource limits and requests for the server | `{}` |
 | server.service.annotations | Server service annotations | `{}` |
 | server.service.labels | Server service labels | `{}` |

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

@@ -16,7 +16,7 @@ spec:
       app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.repoServer.name }}
       app.kubernetes.io/instance: {{ .Release.Name }}
   revisionHistoryLimit: 5
-  replicas: 1
+  replicas: {{ .Values.repoServer.replicas }}
   template:
     metadata:
       {{- if .Values.repoServer.podAnnotations }}

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

@@ -16,7 +16,7 @@ spec:
       app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
       app.kubernetes.io/instance: {{ .Release.Name }}
   revisionHistoryLimit: 5
-  replicas: 1
+  replicas: {{ .Values.server.replicas }}
   template:
     metadata:
       {{- if .Values.server.podAnnotations }}

charts/argo-cd/values.yaml

@@ -10,7 +10,7 @@ installCRDs: true
 global:
   image:
     repository: argoproj/argocd
-    tag: v1.4.1
+    tag: v1.4.2
     imagePullPolicy: IfNotPresent
   securityContext: {}
   #  runAsUser: 999
@@ -23,7 +23,7 @@ controller:
 
   image:
     repository: # argoproj/argocd
-    tag: # v1.4.1
+    tag: # v1.4.2
     imagePullPolicy: # IfNotPresent
 
   ## Argo controller commandline flags
@@ -268,9 +268,11 @@ redis:
 server:
   name: server
 
+  replicas: 1
+
   image:
     repository: # argoproj/argocd
-    tag: # v1.4.1
+    tag: # v1.4.2
     imagePullPolicy: # IfNotPresent
 
   ## Additional command line arguments to pass to argocd-server
@@ -509,9 +511,11 @@ server:
 repoServer:
   name: repo-server
 
+  replicas: 1
+
   image:
     repository: # argoproj/argocd
-    tag: # v1.4.1
+    tag: # v1.4.2
     imagePullPolicy: # IfNotPresent
 
   ## Additional command line arguments to pass to argocd-repo-server