From 99531a5ac6174e606fa2d1927faf57df16973be0 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Mon, 4 Nov 2024 11:11:48 +0100
Subject: [PATCH] run individual updatecli pipelines per chart as merging on
 subkey is too complex

---
 .github/workflows/bumpVersions.yml | 14 ++++++--------
 .gitignore                         |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/bumpVersions.yml b/.github/workflows/bumpVersions.yml
index 07dc7ee11..2ce25bb1b 100644
--- a/.github/workflows/bumpVersions.yml
+++ b/.github/workflows/bumpVersions.yml
@@ -92,16 +92,14 @@ jobs:
           ref: ${{ inputs.alfresco-updatecli-ref || env.DEFAULT_BRANCH_NAME }}
           path: alfresco-updatecli
 
-      - name: Preprocess values file appending existing keys only
+      - name: Build manifest and run UpdateCli pipelines
         shell: bash
         run: |
-          yq '. *? load("alfresco-updatecli/deployments/values/supported-matrix.yaml") |
-          explode(.)' updatecli-matrix-targets.yaml |
-          tee ./merged.yaml
-
-      - name: updatecli apply
-        # path to values file must be relative https://github.com/updatecli/updatecli/issues/1253
-        run: updatecli apply -c alfresco-updatecli/deployments/uber-manifest.tpl -v ./merged.yaml
+          for i in helm/*/updatecli-matrix-targets.yaml; do CHART=$(basename $(dirname $i))
+             echo "Building UpdateCli manifest for chart $CHART"
+             yq '. *? load("alfresco-updatecli/deployments/values/supported-matrix.yaml") | explode(.)' ${i} | tee ./${CHART}_merged.yaml
+             updatecli apply -c alfresco-updatecli/deployments/uber-manifest.tpl -v ./${CHART}_merged.yaml
+          done
         env:
           QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
           QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
diff --git a/.gitignore b/.gitignore
index b5faa9bc5..b82644581 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,6 @@ hs_err_pid*
 
 # updatecli workflow
 alfresco-updatecli
-merged.yaml
+*_merged.yaml
 
 _site