From e47031d31a2718a874e20ef269578f35f4f2156b Mon Sep 17 00:00:00 2001
From: Konstantin Averkiev <kaverkiev@slb.ru>
Date: Thu, 3 Jul 2025 12:31:52 +0300
Subject: [PATCH] developed scheme with values inside charts

---
 appsets/appset.yaml | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/appsets/appset.yaml b/appsets/appset.yaml
index 9981e4b..50fccb8 100644
--- a/appsets/appset.yaml
+++ b/appsets/appset.yaml
@@ -9,23 +9,14 @@ spec:
   goTemplate: true
   goTemplateOptions: ["missingkey=error"]
   generators:
-    - matrix:
-        generators:
-          - git:
-              repoURL: git@gitea.invuneon.ru:gitea_admin/infra.git
-              revision: HEAD
-              directories:
-                - path: charts/*
-              pathParamPrefix: chart
-          - git:
-              repoURL: git@gitea.invuneon.ru:gitea_admin/infra.git
-              revision: HEAD
-              files:
-                - path: charts/values/*.yaml
-              pathParamPrefix: values
+    - git:
+        repoURL: git@gitea.invuneon.ru:gitea_admin/infra.git
+        revision: HEAD
+        files:
+          - path: charts/*/values/*.yaml
   template:
     metadata:
-      name: '{{ replace .values.path.filename ".yaml" "" }}-{{ index .chart.path.segments 1 }}'
+      name: '{{ trimSuffix ".yaml" .path.filename }}-{{ index .path.segments 1 }}'
       annotations:
         argocd.argoproj.io/manifest-generate-paths: ".;.."
       finalizers:
@@ -38,14 +29,14 @@ spec:
       source:
         repoURL: git@gitea.invuneon.ru:gitea_admin/infra.git
         targetRevision: HEAD
-        path: charts/{{ index .chart.path.segments 1 }}
+        path: charts/{{ index .path.segments 1 }}
         helm:
-          releaseName: '{{ index .chart.path.segments 1 }}'
+          releaseName: '{{ index .path.segments 1 }}'
           valueFiles:
-            - secrets+age-import:///helm-secrets-private-keys/key.txt?values/{{ .values.path.filename }}
+            - secrets+age-import:///helm-secrets-private-keys/key.txt?values/{{ .path.filename }}
       destination:
         name: in-cluster
-        namespace: '{{ replace .values.path.filename ".yaml" "" }}-{{ index .chart.path.segments 1 }}'
+        namespace: '{{ trimSuffix ".yaml" .path.filename }}-{{ index .path.segments 1 }}'
       syncPolicy:
         automated:
           prune: true