From bdd118caf8f513673d80a744510d37bd168e8742 Mon Sep 17 00:00:00 2001
From: Petr Drastil <petr.drastil@gmail.com>
Date: Sun, 9 Oct 2022 00:22:51 +0200
Subject: [PATCH] fix(argo-cd): Move incorrectly placed timeout configs (#1526)

---
 charts/argo-cd/Chart.yaml          |  4 ++--
 charts/argo-cd/README.md           |  2 --
 charts/argo-cd/templates/NOTES.txt |  4 ++--
 charts/argo-cd/values.yaml         | 14 ++++++++++----
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 3bbff281..d9d79339 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v2.4.14
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 5.5.13
+version: 5.5.14
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:
@@ -22,4 +22,4 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - "[Changed]: Updated Redis to 7.0.5 for fixing CVE-2022-35951."
+    - "[Fixed]: Incorrectly placed timeout.reconciliation and timeout.hard.reconciliation"
diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md
index aed2b789..f4a4c60b 100644
--- a/charts/argo-cd/README.md
+++ b/charts/argo-cd/README.md
@@ -377,8 +377,6 @@ NAME: my-release
 | configs.params."server.rootpath" | string | `""` | Used if Argo CD is running behind reverse proxy under subpath different from / |
 | configs.params."server.staticassets" | string | `"/shared/app"` | Directory path that contains additional static assets |
 | configs.params."server.x.frame.options" | string | `"sameorigin"` | Set X-Frame-Options header in HTTP responses to value. To disable, set to "". |
-| configs.params."timeout.hard.reconciliation" | int | `0` | Time period in seconds for application hard resync |
-| configs.params."timeout.reconciliation" | int | `180` | Time period in seconds for application resync |
 | configs.params.annotations | object | `{}` | Annotations to be added to the argocd-cmd-params-cm ConfigMap |
 | configs.repositories | object | `{}` | Repositories list to be used by applications |
 | configs.repositoriesAnnotations | object | `{}` | Annotations to be added to `configs.repositories` Secret |
diff --git a/charts/argo-cd/templates/NOTES.txt b/charts/argo-cd/templates/NOTES.txt
index a112b85a..bebdb822 100644
--- a/charts/argo-cd/templates/NOTES.txt
+++ b/charts/argo-cd/templates/NOTES.txt
@@ -5,10 +5,10 @@ DEPRECATED option controller.args.statusProcessors - Use configs.params.controll
 DEPRECATED option controller.args.operationProcessors - Use configs.params.controller.operation.processors
 {{- end }}
 {{- if .Values.controller.args.appResyncPeriod }}
-DEPRECATED option controller.args.appResyncPeriod - Use configs.params.timeout.reconciliation
+DEPRECATED option controller.args.appResyncPeriod - Use server.config.timeout.reconciliation
 {{- end }}
 {{- if .Values.controller.args.appHardResyncPeriod }}
-DEPRECATED option controller.args.appHardResyncPeriod - Use configs.params.timeout.hard.reconciliation
+DEPRECATED option controller.args.appHardResyncPeriod - Use server.config.timeout.hard.reconciliation
 {{- end }}
 {{- if .Values.controller.args.selfHealTimeout }}
 DEPRECATED option controller.args.selfHealTimeout -  Use configs.params.controller.self.heal.timeout.seconds
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 8c9c70ec..05ce622c 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -299,10 +299,6 @@ configs:
     ## Generic parameters
     # -- Open-Telemetry collector address: (e.g. "otel-collector:4317")
     otlp.address: ''
-    # -- Time period in seconds for application resync
-    timeout.reconciliation: 180
-    # -- Time period in seconds for application hard resync
-    timeout.hard.reconciliation: 0
 
     ## Controller Properties
     # -- Number of application status processors
@@ -1502,6 +1498,7 @@ server:
   config:
     # Argo CD's externally facing base URL (optional). Required when configuring SSO
     url: ""
+
     # Argo CD instance label key
     application.instanceLabelKey: argocd.argoproj.io/instance
 
@@ -1517,6 +1514,14 @@ server:
     # https://argo-cd.readthedocs.io/en/latest/faq/#how-to-disable-admin-user
     admin.enabled: "true"
 
+    # Application reconciliation timeout is the max amount of time required to discover if a new manifests version got
+    # published to the repository. Reconciliation by timeout is disabled if timeout is set to 0. Three minutes by default.
+    timeout.reconciliation: 180s
+
+    # Timeout to refresh application data as well as target manifests cache
+    timeout.hard.reconciliation: "0"
+
+    # Dex configuration
     # dex.config: |
     #   connectors:
     #     # GitHub example
@@ -1529,6 +1534,7 @@ server:
     #         orgs:
     #         - name: your-github-org
 
+    # OIDC configuration as an alternative to dex (optional).
     # oidc.config: |
     #   name: AzureAD
     #   issuer: https://login.microsoftonline.com/TENANT_ID/v2.0