From ddae1854a1f2d4546a92db7a987da3cc1a26abea Mon Sep 17 00:00:00 2001 From: Lauren Lajas <29675370+llajas@users.noreply.github.com> Date: Sat, 24 Feb 2024 04:51:09 -0600 Subject: [PATCH] fix: ignore differences for ArgoCD certain objects are showing a diff state, namely statefulSets and CSI drivers when installed via Helm. In the case of CSI's this fixes deployment blockers imposed by Argocd The statefulSet is merely an 'eyesore' https://github.com/argoproj/argo-cd/issues/11143 --- bootstrap/root/templates/stack.yaml | 11 ++++++----- bootstrap/root/values.yaml | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bootstrap/root/templates/stack.yaml b/bootstrap/root/templates/stack.yaml index d855e1dd..2ac57c83 100644 --- a/bootstrap/root/templates/stack.yaml +++ b/bootstrap/root/templates/stack.yaml @@ -38,12 +38,13 @@ spec: - CreateNamespace=true - ApplyOutOfSyncOnly=true - ServerSideApply=true - {{- if eq $stack.name "csi-driver-smb" }} ignoreDifferences: - group: storage.k8s.io kind: CSIDriver - name: smb.csi.k8s.io - jsonPointers: - - /spec/seLinuxMount - {{- end }} + jqPathExpressions: + - .spec.seLinuxMount + - group: apps + kind: StatefulSet + jqPathExpressions: + - .'.spec.volumeClaimTemplates[]?' {{- end }} diff --git a/bootstrap/root/values.yaml b/bootstrap/root/values.yaml index 30a6712c..37e96eec 100644 --- a/bootstrap/root/values.yaml +++ b/bootstrap/root/values.yaml @@ -7,4 +7,3 @@ stacks: - name: system - name: platform - name: apps - - name: csi-driver-smb