feat(argocd): Support new k8sclient.retry options

add support for the new following controller/server parameters
introduce in the 2.9.0 version:
- controller.k8sclient.retry.max
- controller.k8sclient.retry.base.backoff
- server.k8sclient.retry.max
- server.k8sclient.retry.base.backoff

Signed-off-by: Laurent Lavaud <llavaud@lvdconsulting.pro>

charts/argo-cd/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: v2.9.1
 kubeVersion: ">=1.23.0-0"
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 5.51.2
+version: 5.52.0
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:
@@ -26,5 +26,5 @@ annotations:
     fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
     url: https://argoproj.github.io/argo-helm/pgp_keys.asc
   artifacthub.io/changes: |
-    - kind: changed
+    - kind: added
-      description: Upgrade Argo CD to v2.9.1
+      description: Support new k8sclient.retry options

charts/argo-cd/README.md

@@ -452,6 +452,8 @@ NAME: my-release
 | configs.params."application.namespaces" | string | `""` | Enables [Applications in any namespace] |
 | configs.params."applicationsetcontroller.enable.progressive.syncs" | bool | `false` | Enables use of the Progressive Syncs capability |
 | configs.params."applicationsetcontroller.policy" | string | `"sync"` | Modify how application is synced between the generator and the cluster. One of: `sync`, `create-only`, `create-update`, `create-delete` |
+| configs.params."controller.k8sclient.retry.base.backoff" | int | `100` | The initial backoff delay on the first retry attempt in ms. Subsequent retries will double this backoff time up to a maximum threshold |
+| configs.params."controller.k8sclient.retry.max" | int | `0` | The maximum number of retries for each request |
 | configs.params."controller.operation.processors" | int | `10` | Number of application operation processors |
 | configs.params."controller.repo.server.timeout.seconds" | int | `60` | Repo server RPC call timeout seconds. |
 | configs.params."controller.self.heal.timeout.seconds" | int | `5` | Specifies timeout between application self heal attempts |
@@ -462,6 +464,8 @@ NAME: my-release
 | configs.params."server.disable.auth" | bool | `false` | Disable Argo CD RBAC for user authentication |
 | configs.params."server.enable.gzip" | bool | `true` | Enable GZIP compression |
 | configs.params."server.insecure" | bool | `false` | Run server without TLS |
+| configs.params."server.k8sclient.retry.base.backoff" | int | `100` | The initial backoff delay on the first retry attempt in ms. Subsequent retries will double this backoff time up to a maximum threshold |
+| configs.params."server.k8sclient.retry.max" | int | `0` | The maximum number of retries for each request |
 | 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 "". |

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

@@ -254,6 +254,18 @@ spec:
                 name: argocd-cmd-params-cm
                 key: controller.kubectl.parallelism.limit
                 optional: true
+          - name: ARGOCD_K8SCLIENT_RETRY_MAX
+            valueFrom:
+                configMapKeyRef:
+                  name: argocd-cmd-params-cm
+                  key: controller.k8sclient.retry.max
+                  optional: true
+          - name: ARGOCD_K8SCLIENT_RETRY_BASE_BACKOFF
+            valueFrom:
+                configMapKeyRef:
+                  name: argocd-cmd-params-cm
+                  key: controller.k8sclient.retry.base.backoff
+                  optional: true
         {{- with .Values.controller.envFrom }}
         envFrom:
           {{- toYaml . | nindent 10 }}

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

@@ -296,6 +296,18 @@ spec:
                 name: argocd-cmd-params-cm
                 key: server.enable.proxy.extension
                 optional: true
+          - name: ARGOCD_K8SCLIENT_RETRY_MAX
+            valueFrom:
+                configMapKeyRef:
+                  name: argocd-cmd-params-cm
+                  key: server.k8sclient.retry.max
+                  optional: true
+          - name: ARGOCD_K8SCLIENT_RETRY_BASE_BACKOFF
+            valueFrom:
+                configMapKeyRef:
+                  name: argocd-cmd-params-cm
+                  key: server.k8sclient.retry.base.backoff
+                  optional: true
         {{- with .Values.server.envFrom }}
         envFrom:
           {{- toYaml . | nindent 10 }}

charts/argo-cd/values.yaml

@@ -236,6 +236,10 @@ configs:
     controller.self.heal.timeout.seconds: 5
     # -- Repo server RPC call timeout seconds.
     controller.repo.server.timeout.seconds: 60
+    # -- The maximum number of retries for each request
+    controller.k8sclient.retry.max: 0
+    # -- The initial backoff delay on the first retry attempt in ms. Subsequent retries will double this backoff time up to a maximum threshold
+    controller.k8sclient.retry.base.backoff: 100
 
     ## Server properties
     # -- Run server without TLS
@@ -252,6 +256,10 @@ configs:
     server.enable.gzip: true
     # -- Set X-Frame-Options header in HTTP responses to value. To disable, set to "".
     server.x.frame.options: sameorigin
+    # -- The maximum number of retries for each request
+    server.k8sclient.retry.max: 0
+    # -- The initial backoff delay on the first retry attempt in ms. Subsequent retries will double this backoff time up to a maximum threshold
+    server.k8sclient.retry.base.backoff: 100
 
     ## Repo-server properties
     # -- Limit on number of concurrent manifests generate requests. Any value less the 1 means no limit.