From 4b0358d20f72f5d6f3dc3ffd3a5f507fd3d127db Mon Sep 17 00:00:00 2001
From: Igor Nikonorov <igor.nikonorov@gmail.com>
Date: Tue, 9 Mar 2021 20:03:26 +0200
Subject: [PATCH] feat(argo-cd): add self-heal-timeout as a template variable
 (#609)

Signed-off-by: Igor Nikonorov <igor.nikonorov@syncier.com>
---
 charts/argo-cd/Chart.yaml                                       | 2 +-
 charts/argo-cd/README.md                                        | 1 +
 .../templates/argocd-application-controller/deployment.yaml     | 2 ++
 charts/argo-cd/values.yaml                                      | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index af7da2f2..9bd0a5dc 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 1.8.4
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 2.15.0
+version: 2.16.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 edfff5f5..382a852a 100644
--- a/charts/argo-cd/README.md
+++ b/charts/argo-cd/README.md
@@ -97,6 +97,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
 | controller.affinity | [Assign custom affinity rules to the deployment](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/) | `{}` |
 | controller.args.operationProcessors | define the controller `--operation-processors` | `"10"` |
 | controller.args.appResyncPeriod | define the controller `--app-resync` | `"180"` |
+| controller.args.selfHealTimeout | define the controller `--self-heal-timeout-seconds` | `"5"` |
 | 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` |
diff --git a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
index e9a9d700..bf4d9080 100755
--- a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
@@ -57,6 +57,8 @@ spec:
         - {{ .Values.controller.args.operationProcessors | quote }}
         - --app-resync
         - {{ .Values.controller.args.appResyncPeriod | quote }}
+        - --self-heal-timeout-seconds
+        - {{ .Values.controller.args.selfHealTimeout | quote }}
         - --repo-server
         - {{ template "argo-cd.repoServer.fullname" . }}:{{ .Values.repoServer.service.port }}
         - --logformat
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index fee16b46..2f67d7ec 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -43,6 +43,7 @@ controller:
     statusProcessors: "20"
     operationProcessors: "10"
     appResyncPeriod: "180"
+    selfHealTimeout: "5"
 
   ## Argo controller log format: text|json
   logFormat: text