From 73ca60528eb0a469a8f637bdda51f38581268beb Mon Sep 17 00:00:00 2001
From: Giulio Cardillo <giulio.cardillo@gmail.com>
Date: Fri, 13 Feb 2026 13:03:06 +0100
Subject: [PATCH] Fix volumes when configManagementPlugins is set

---
 .github/workflows/helm-unittest.yml |  4 ++--
 templates/plumbing/argocd.yaml      | 19 +++++++++----------
 tests/argocd_test.yaml              | 29 +++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/helm-unittest.yml b/.github/workflows/helm-unittest.yml
index 1a975ae..bfb380a 100644
--- a/.github/workflows/helm-unittest.yml
+++ b/.github/workflows/helm-unittest.yml
@@ -12,7 +12,7 @@ on: [push, pull_request]
 
 jobs:
   build:
-    name: Run helm lint over the chart
+    name: Run helm unittest over the chart
     # It has to be 24.04 because -latest has a podman version that is too old
     runs-on: ubuntu-24.04
 
@@ -20,6 +20,6 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v6
 
-      - name: Run make helmlint
+      - name: Run make helmunittest
         run: |
           make helm-unittest
diff --git a/templates/plumbing/argocd.yaml b/templates/plumbing/argocd.yaml
index 89b69a2..75483ef 100644
--- a/templates/plumbing/argocd.yaml
+++ b/templates/plumbing/argocd.yaml
@@ -99,6 +99,15 @@ spec:
       name: trusted-hub-bundle
     - emptyDir: {}
       name: ca-bundles
+{{- if len $.Values.clusterGroup.argoCD.configManagementPlugins }}
+    - emptyDir: {}
+      name: cmp-tmp
+{{- range $cmp := $.Values.clusterGroup.argoCD.configManagementPlugins }}
+    - configMap:
+        name: "argocd-cmp-{{ $cmp.name }}"
+      name: {{ $cmp.name }}
+{{- end }}
+{{- end }}
 {{- if len $.Values.clusterGroup.argoCD.configManagementPlugins }}
     sidecarContainers:
 {{- range $cmp := $.Values.clusterGroup.argoCD.configManagementPlugins }}
@@ -125,16 +134,6 @@ spec:
 {{- end }}
 {{- end }}
 {{- end }}
-{{- if len $.Values.clusterGroup.argoCD.configManagementPlugins }}
-    volumes:
-      - emptyDir: {}
-        name: cmp-tmp
-{{- range $cmp := $.Values.clusterGroup.argoCD.configManagementPlugins }}
-      - configMap:
-          name: "argocd-cmp-{{ $cmp.name }}"
-        name: {{ $cmp.name }}
-{{- end }}
-{{- end }}
 {{- if $.Values.clusterGroup.argoCD.resourceExclusions }}
   resourceExclusions: {{- $.Values.clusterGroup.argoCD.resourceExclusions | toYaml | indent 2 }}
 {{- end }}
diff --git a/tests/argocd_test.yaml b/tests/argocd_test.yaml
index 249e525..3bd55fc 100644
--- a/tests/argocd_test.yaml
+++ b/tests/argocd_test.yaml
@@ -203,3 +203,32 @@ tests:
               - echo
             image: test
             name: test
+
+  - it: should render volumes correctly when configManagementPlugins is set
+    set:
+      clusterGroup:
+        argoCD:
+          configManagementPlugins:
+            - name: test
+              image: test
+              pluginConfig: |
+                test
+    documentIndex: 0
+    asserts:
+      - contains:
+          path: spec.repo.volumes
+          content:
+            configMap:
+              name: kube-root-ca.crt
+            name: kube-root-ca
+      - contains:
+          path: spec.repo.volumes
+          content:
+            emptyDir: {}
+            name: cmp-tmp
+      - contains:
+          path: spec.repo.volumes
+          content:
+            configMap:
+              name: argocd-cmp-test
+            name: test