Update argocd chart releases (#57)

nephelaiio · Apr 25, 2024 · 0fdda1f · 0fdda1f
1 parent 4f7dc0e
commit 0fdda1f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 16 deletions.
diff --git a/Makefile b/Makefile
@@ -25,7 +25,9 @@ lint: install
 	poetry run molecule syntax
 
 test dependency create prepare converge idempotence side-effect verify destroy login reset list:
-	KIND_RELEASE=$(KIND_RELEASE) K8S_RELEASE=$(K8S_RELEASE) poetry run molecule $@ -s ${MOLECULE_SCENARIO}
+	KIND_RELEASE=$(KIND_RELEASE) \
+	K8S_RELEASE=$(K8S_RELEASE) \
+	poetry run molecule $@ -s ${MOLECULE_SCENARIO}
 
 rebuild: destroy prepare create
 

diff --git a/defaults/main/argocd.yml b/defaults/main/argocd.yml
@@ -8,8 +8,8 @@ k8s_argocd_exec_timeout: "3m"
 k8s_argocd_chart:
   name: "argo-cd"
   repo: "https://argoproj.github.io/argo-helm"
-  release: "5.53.13"
-  last_checked: "2024-02-02T22:37:26-06:00"
+  release: "6.7.14"
+  last_checked: "2024-04-23T22:53:28-06:00"
 k8s_argocd_chart_values:
   redis-ha:
     enabled: false
@@ -26,8 +26,8 @@ k8s_argocd_apps_wait_timeout: "{{ k8s_wait_timeout }}"
 k8s_argocd_apps_chart:
   name: "argocd-apps"
   repo: "https://argoproj.github.io/argo-helm"
-  release: "1.6.1"
-  last_checked: "2024-02-02T22:37:49-06:00"
+  release: "2.0.0"
+  last_checked: "2024-04-23T22:53:35-06:00"
 k8s_argocd_apps_chart_values:
   applications: []
   applicationsets: []

diff --git a/molecule/argocd/molecule.yml b/molecule/argocd/molecule.yml
@@ -55,25 +55,36 @@ provisioner:
           k8s_molecule_cluster_type: kind
           k8s_argocd_apps_chart_values:
             applications:
-              - name: guestbook
-                namespace: argocd
+              argocd-application:
+                additionalLabels: {}
+                additionalAnnotations: {}
                 finalizers:
                   - resources-finalizer.argocd.argoproj.io
                 project: default
-                sources:
-                  - repoURL: https://github.com/argoproj/argocd-example-apps.git
-                    path: guestbook
-                    targetRevision: HEAD
+                source:
+                  repoURL: https://github.com/argoproj/argocd-example-apps.git
+                  targetRevision: HEAD
+                  path: guestbook
+                  directory:
+                    recurse: true
                 destination:
                   server: https://kubernetes.default.svc
-                  namespace: guestbook
+                  namespace: default
                 syncPolicy:
                   automated:
-                    prune: true
-                    selfHeal: true
-                    allowEmpty: false
+                    prune: false
+                    selfHeal: false
                   syncOptions:
-                    - CreateNamespace=true
+                    - ApplyOutOfSyncOnly=true
+                revisionHistoryLimit: null
+                ignoreDifferences:
+                  - group: apps
+                    kind: Deployment
+                    jsonPointers:
+                      - /spec/replicas
+                info:
+                  - name: url
+                    value: https://argoproj.github.io/
 verifier:
   name: ansible
 scenario: