From f1ba157cf514a9c28280c5c7885e150c86a527c8 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Sat, 18 Nov 2023 14:15:25 +0100 Subject: [PATCH] Don't require namespace for ignoreDifferences --- argocd/app-of-apps/templates/applications.yaml | 2 ++ argocd/app-of-apps/test/values.yaml | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/argocd/app-of-apps/templates/applications.yaml b/argocd/app-of-apps/templates/applications.yaml index 488b017..43adfa9 100644 --- a/argocd/app-of-apps/templates/applications.yaml +++ b/argocd/app-of-apps/templates/applications.yaml @@ -18,7 +18,9 @@ spec: group: {{ .group }} {{- end }} name: {{ .name }} + {{- if .namespace }} namespace: {{ .namespace }} + {{- end }} jsonPointers: {{- toYaml .jsonPointers | nindent 10 }} {{- end }} diff --git a/argocd/app-of-apps/test/values.yaml b/argocd/app-of-apps/test/values.yaml index 4b27d16..135ad12 100644 --- a/argocd/app-of-apps/test/values.yaml +++ b/argocd/app-of-apps/test/values.yaml @@ -57,10 +57,9 @@ applications: serverSideApply: true syncWave: 2 ignoreDifferences: - - group: "" + - group: "*" kind: PersistentVolume name: prometheus-prometheus-pv-0 - namespace: observability jsonPointers: - /spec/claimRef/resourceVersion - /spec/claimRef/uid