diff --git a/clusters/cl01tl/deployment/stack/templates/application-set.yaml b/clusters/cl01tl/deployment/stack/templates/application-set.yaml index a516992fd..2b54bafa8 100644 --- a/clusters/cl01tl/deployment/stack/templates/application-set.yaml +++ b/clusters/cl01tl/deployment/stack/templates/application-set.yaml @@ -52,4 +52,5 @@ spec: - ApplyOutOfSyncOnly={{ $stack.syncPolicy.syncOptions.applyOutOfSyncOnly | default true }} - ServerSideApply={{ $stack.syncPolicy.syncOptions.serverSideApply | default true }} - PruneLast={{ $stack.syncPolicy.syncOptions.pruneLast | default true }} + - RespectIgnoreDifferences={{ $stack.syncPolicy.syncOptions.respectIgnoreDifferences | default true }} {{- end }} diff --git a/clusters/cl01tl/deployment/stack/templates/application.yaml b/clusters/cl01tl/deployment/stack/templates/application.yaml index 1eeb3ecf6..ae66901f2 100644 --- a/clusters/cl01tl/deployment/stack/templates/application.yaml +++ b/clusters/cl01tl/deployment/stack/templates/application.yaml @@ -18,11 +18,11 @@ spec: name: in-cluster namespace: kube-system revisionHistoryLimit: 3 - # ignoreDifferences: - # - group: "" - # kind: ServiceMonitor - # jqPathExpressions: - # - .spec.endpoints[].relabelings[].action + ignoreDifferences: + - group: "" + kind: ServiceMonitor + jqPathExpressions: + - .spec.endpoints[].relabelings[].action syncPolicy: automated: prune: true @@ -38,6 +38,7 @@ spec: - ApplyOutOfSyncOnly=true - ServerSideApply=true - PruneLast=true + - RespectIgnoreDifferences=true --- apiVersion: argoproj.io/v1alpha1 diff --git a/clusters/cl01tl/deployment/stack/values.yaml b/clusters/cl01tl/deployment/stack/values.yaml index 2a73e0cff..25ab06252 100644 --- a/clusters/cl01tl/deployment/stack/values.yaml +++ b/clusters/cl01tl/deployment/stack/values.yaml @@ -18,7 +18,6 @@ applicationSet: prune: true syncOptions: serverSideApply: true - RespectIgnoreDifferences: true - name: deployment namespace: argocd syncPolicy: @@ -54,26 +53,33 @@ applicationSet: kind: Service jqPathExpressions: - .spec.externalName - # - kind: StatefulSet - # jqPathExpressions: - # - .spec.volumeClaimTemplates[].apiVersion - # - .spec.volumeClaimTemplates[].kind + - kind: StatefulSet + jqPathExpressions: + - .spec.volumeClaimTemplates[].apiVersion + - .spec.volumeClaimTemplates[].kind syncPolicy: automated: prune: true syncOptions: serverSideApply: true - RespectIgnoreDifferences: true - name: services ignoreDifferences: - group: "" kind: GpuDevicePlugin jqPathExpressions: - .metadata.annotations[] - # - kind: StatefulSet - # jqPathExpressions: - # - .spec.volumeClaimTemplates[].apiVersion - # - .spec.volumeClaimTemplates[].kind + - group: "apps" + kind: "Deployment" + jsonPointers: + - /spec/template/metadata/annotations/checksum~1secret + - /spec/template/metadata/annotations/checksum~1secret-core + - /spec/template/metadata/annotations/checksum~1secret-jobservice + - /spec/template/metadata/annotations/checksum~1tls + - group: "apps" + kind: "StatefulSet" + jsonPointers: + - /spec/template/metadata/annotations/checksum~1secret + - /spec/template/metadata/annotations/checksum~1tls syncPolicy: automated: prune: true @@ -85,4 +91,3 @@ applicationSet: prune: true syncOptions: serverSideApply: true - RespectIgnoreDifferences: true