From bbb38b310dc80ddb51e1094765a68fc714c08204 Mon Sep 17 00:00:00 2001
From: killianmuldoon <47175296+killianmuldoon@users.noreply.github.com>
Date: Thu, 3 Oct 2024 14:53:05 +0100
Subject: [PATCH] feat(argo-cd): Add affinity to redisSecretInit Job (#2962)

feat: Add affinity to redisSecretInit Job

Signed-off-by: killianmuldoon <kmuldoon@nvidia.com>
---
 charts/argo-cd/Chart.yaml                           | 6 +++---
 charts/argo-cd/README.md                            | 1 +
 charts/argo-cd/templates/redis-secret-init/job.yaml | 4 ++++
 charts/argo-cd/values.yaml                          | 3 +++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 16b11ae6..4a70abc4 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: v2.12.4
 kubeVersion: ">=1.25.0-0"
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 7.6.7
+version: 7.6.8
 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: fixed
-      description: Arrange for ApplicationSet in any namespace.
+    - kind: added
+      description: Set affinity in redis secret-init job.
diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md
index b44bb431..f0d146b1 100644
--- a/charts/argo-cd/README.md
+++ b/charts/argo-cd/README.md
@@ -1394,6 +1394,7 @@ If you use an External Redis (See Option 3 above), this Job is not deployed.
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
+| redisSecretInit.affinity | object | `{}` | Assign custom [affinity] rules to the Redis secret-init Job |
 | redisSecretInit.containerSecurityContext | object | See [values.yaml] | Application controller container-level security context |
 | redisSecretInit.enabled | bool | `true` | Enable Redis secret initialization. If disabled, secret must be provisioned by alternative methods |
 | redisSecretInit.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for the Redis secret-init Job |
diff --git a/charts/argo-cd/templates/redis-secret-init/job.yaml b/charts/argo-cd/templates/redis-secret-init/job.yaml
index 8a280e35..5fd41f64 100644
--- a/charts/argo-cd/templates/redis-secret-init/job.yaml
+++ b/charts/argo-cd/templates/redis-secret-init/job.yaml
@@ -54,6 +54,10 @@ spec:
       priorityClassName: {{ . }}
       {{- end }}
       restartPolicy: OnFailure
+      {{- with include "argo-cd.affinity" (dict "context" . "component" .Values.redisSecretInit) }}
+      affinity:
+        {{- trim . | nindent 8 }}
+      {{- end }}
       {{- with .Values.redisSecretInit.nodeSelector | default .Values.global.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 70dfb347..be3cec78 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -1725,6 +1725,9 @@ redisSecretInit:
   # @default -- `""` (defaults to global.priorityClassName)
   priorityClassName: ""
 
+  # -- Assign custom [affinity] rules to the Redis secret-init Job
+  affinity: {}
+
   # -- Node selector to be added to the Redis secret-init Job
   # @default -- `{}` (defaults to global.nodeSelector)
   nodeSelector: {}