From c4f89c1cf0c090a09b9e04e277887523b0fee4c5 Mon Sep 17 00:00:00 2001
From: Marco van Zijl <marco@mvzijl.nl>
Date: Thu, 30 Oct 2025 21:28:28 +0100
Subject: [PATCH] Remove go templating

---
 appset/applicationset.yaml | 97 +++++---------------------------------
 1 file changed, 13 insertions(+), 84 deletions(-)

diff --git a/appset/applicationset.yaml b/appset/applicationset.yaml
index a1b8e5d..d9f87b8 100644
--- a/appset/applicationset.yaml
+++ b/appset/applicationset.yaml
@@ -7,102 +7,31 @@ spec:
   goTemplate: true
   goTemplateOptions: ["missingkey=error"]
   generators:
-  - merge:
-      # Join base (directories) with overrides (files) by folder name:
-      mergeKeys:
-        - '{{ .path.basename }}'         # requires recent Argo CD (see note)
-      generators:
-        # Base: every folder under apps/*
-        - git:
-            repoURL: https://git.mvzijl.nl/marco/veda.git
-            revision: HEAD
-            branch: applicationset-rewrite
-            directories:
-            - path: apps/*
-        # Overrides: optional appset.(yaml|yml|json) in each app
-        - git:
-            repoURL: https://git.mvzijl.nl/marco/veda.git
-            revision: HEAD
-            branch: applicationset-rewrite
-            files:
-              - path: apps/*/appset.yaml
-              - path: apps/*/appset.yml
-              - path: apps/*/appset.json
-  # ---- Application template ----
+  - git:
+      repoURL: https://git.mvzijl.nl/marco/veda.git
+      revision: HEAD
+      branch: applicationset-rewrite
+      directories:
+      - path: apps/*
   template:
     metadata:
-      name: '{{ default .path.basename .name }}'
-      labels:
-        app.kubernetes.io/part-of: root
-        # allow grouping for RollingSync (see section B)
-        tier: '{{ default "apps" (index .labels "tier") }}'
+      name: '{{.path.basename}}'
       finalizers:
         - resources-finalizer.argocd.argoproj.io
     spec:
-      project: '{{ default "default" .project }}'
+      project: default
       source:
         repoURL: https://git.mvzijl.nl/marco/veda.git
+        targetRevision: HEAD
         branch: applicationset-rewrite
-        targetRevision: '{{ default "main" .targetRevision }}'
-        path: '{{ .path.path }}'
-        # Tool-specific overrides (only render when present)
-        {{- if .helm }}
-        helm:
-          {{- if .helm.releaseName }}releaseName: {{ .helm.releaseName }}{{- end }}
-          {{- if .helm.valueFiles }}
-          valueFiles:
-          {{- range .helm.valueFiles }}
-            - {{ . }}
-          {{- end }}
-          {{- end }}
-          {{- if hasKey .helm "ignoreMissingValueFiles" }}
-          ignoreMissingValueFiles: {{ .helm.ignoreMissingValueFiles }}
-          {{- end }}
-        {{- end }}
-        {{- if .kustomize }}
-        kustomize:
-          {{- if .kustomize.namePrefix }}namePrefix: {{ .kustomize.namePrefix }}{{- end }}
-          {{- if .kustomize.commonLabels }}
-          commonLabels:
-          {{- range $k,$v := .kustomize.commonLabels }}
-            {{ $k }}: {{ $v }}
-          {{- end }}
-          {{- end }}
-        {{- end }}
-        {{- if .directory }}
-        directory:
-          {{- if hasKey .directory "recurse" }}recurse: {{ .directory.recurse }}{{- end }}
-        {{- end }}
+        path: '{{.path.path}}'
       destination:
-        server: '{{ default "https://kubernetes.default.svc" .server }}'
-        namespace: '{{ default .path.basename .namespace }}'
+        server: https://kubernetes.default.svc
+        namespace: '{{.path.basename}}'
       syncPolicy:
         automated:
           prune: false
           selfHeal: false
         syncOptions:
           - CreateNamespace=true
-          - ServerSideApply=true
-          {{- range .syncOptions }}
-          - {{ . }}
-          {{- end }}
-  # ---- Progressive / RollingSync (section B) ----
-  strategy:
-    type: RollingSync
-    rollingSync:
-      steps:
-        - matchExpressions:
-            - key: tier
-              operator: In
-              values: ["system"]     # e.g. CRDs/operators first
-        - matchExpressions:
-            - key: tier
-              operator: In
-              values: ["platform"]   # infra (DBs, ingress, etc.)
-          maxUpdate: 50%
-        - matchExpressions:
-            - key: tier
-              operator: In
-              values: ["apps"]       # leaf apps
-          maxUpdate: 25%
-    deletionOrder: Reverse
\ No newline at end of file
+          - ApplyOutOfSyncOnly=true