From 86ec847cfc4a08c433cc311d6b0e0ed30d253d5f Mon Sep 17 00:00:00 2001
From: alexlebens <alexanderlebens@gmail.com>
Date: Wed, 22 May 2024 15:57:04 -0500
Subject: [PATCH] change sync options handling

---
 .../stack/templates/application-set.yaml      |  7 ++--
 clusters/cl01tl/deployment/stack/values.yaml  | 35 +++----------------
 2 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/clusters/cl01tl/deployment/stack/templates/application-set.yaml b/clusters/cl01tl/deployment/stack/templates/application-set.yaml
index 91761c380..9259bf43f 100644
--- a/clusters/cl01tl/deployment/stack/templates/application-set.yaml
+++ b/clusters/cl01tl/deployment/stack/templates/application-set.yaml
@@ -39,11 +39,9 @@ spec:
       ignoreDifferences:
         {{- toYaml $stack.ignoreDifferences | nindent 8 }}          
       syncPolicy:
-        {{- if $stack.syncPolicy.automated.enabled }}
         automated:
           prune: {{ $stack.syncPolicy.automated.prune | default false }}
           selfHeal: {{ $stack.syncPolicy.automated.selfHeal | default false }}
-        {{- end }}
         retry:
           limit: 3
           backoff:
@@ -51,5 +49,8 @@ spec:
             factor: 2
             maxDuration: 15m
         syncOptions:
-          {{- toYaml $stack.syncPolicy.syncOptions | nindent 10 }}
+          - CreateNamespace={{ $stack.syncPolicy.syncOptions.createNamespace | default true }}
+          - ApplyOutOfSyncOnly={{ $stack.syncPolicy.syncOptions.applyOutOfSyncOnly | default true }}
+          - ServerSideApply={{ $stack.syncPolicy.syncOptions.serverSideApply | default false }}
+          - PruneLast={{ $stack.syncPolicy.syncOptions.pruneLast | default true }}
 {{- end }}
diff --git a/clusters/cl01tl/deployment/stack/values.yaml b/clusters/cl01tl/deployment/stack/values.yaml
index 9942bd968..7245feacb 100644
--- a/clusters/cl01tl/deployment/stack/values.yaml
+++ b/clusters/cl01tl/deployment/stack/values.yaml
@@ -7,37 +7,22 @@ applicationSet:
   - name: applications
     syncPolicy:
       automated:
-        enabled: true
         prune: true
-        selfheal: false
       syncOptions:
-        - CreateNamespace=true
-        - ApplyOutOfSyncOnly=true
-        - ServerSideApply=false
-        - PruneLast=true
+        createNamespace: true
   - name: deployment
     namespace: argocd
     syncPolicy:
       automated:
-        enabled: true
         prune: true
-        selfheal: false
       syncOptions:
-        - CreateNamespace=true
-        - ApplyOutOfSyncOnly=true
-        - ServerSideApply=false
-        - PruneLast=true
+        createNamespace: true
   - name: platform
     syncPolicy:
       automated:
-        enabled: true
         prune: true
-        selfheal: false
       syncOptions:
-        - CreateNamespace=true
-        - ApplyOutOfSyncOnly=true
-        - ServerSideApply=true
-        - PruneLast=true
+        serverSideApply: true
   - name: services
     ignoreDifferences:
       - group: ""
@@ -46,25 +31,15 @@ applicationSet:
           - .status.loadBalancer.ingress[].ipMode      
     syncPolicy:
       automated:
-        enabled: true
         prune: true
-        selfheal: false
       syncOptions:
-        - CreateNamespace=true
-        - ApplyOutOfSyncOnly=true
-        - ServerSideApply=true
-        - PruneLast=true
+        serverSideApply: true
   - name: storage
     syncPolicy:
       automated:
-        enabled: true
         prune: true
-        selfheal: false
       syncOptions:
-        - CreateNamespace=true
-        - ApplyOutOfSyncOnly=true
-        - ServerSideApply=false
-        - PruneLast=true
+        createNamespace: true
 application:
   cilium:
     namespace: kube-system