diff --git a/argocd/applicationsets/platform-operators.yaml b/argocd/applicationsets/platform-operators.yaml index 293657d..bf61c97 100644 --- a/argocd/applicationsets/platform-operators.yaml +++ b/argocd/applicationsets/platform-operators.yaml @@ -26,6 +26,21 @@ spec: destination: server: https://kubernetes.default.svc namespace: "{{.namespace}}" + ignoreDifferences: + - group: "" + kind: Namespace + name: tekton-operator + jsonPointers: + - /metadata/annotations + - /metadata/labels + - group: apiextensions.k8s.io + kind: CustomResourceDefinition + jsonPointers: + - /metadata/annotations + - /metadata/labels + - /status + managedFieldsManagers: + - kube-apiserver syncPolicy: automated: prune: true @@ -34,3 +49,4 @@ spec: - CreateNamespace=true - ServerSideApply=true - SkipDryRunOnMissingResource=true + - RespectIgnoreDifferences=true diff --git a/argocd/applicationsets/platform-secret-backed-addons.yaml b/argocd/applicationsets/platform-secret-backed-addons.yaml index 11b1c49..0c9aa66 100644 --- a/argocd/applicationsets/platform-secret-backed-addons.yaml +++ b/argocd/applicationsets/platform-secret-backed-addons.yaml @@ -35,6 +35,25 @@ spec: destination: server: https://kubernetes.default.svc namespace: "{{.namespace}}" + ignoreDifferences: + - group: apiextensions.k8s.io + kind: CustomResourceDefinition + jsonPointers: + - /metadata/annotations + - /metadata/labels + - /status + jqPathExpressions: + - .spec.conversion.webhook.clientConfig.caBundle + - group: monitoring.coreos.com + kind: Alertmanager + managedFieldsManagers: + - kube-apiserver + - prometheus-operator + - group: monitoring.coreos.com + kind: Prometheus + managedFieldsManagers: + - kube-apiserver + - prometheus-operator syncPolicy: automated: prune: true @@ -43,3 +62,4 @@ spec: - CreateNamespace=true - ServerSideApply=true - SkipDryRunOnMissingResource=true + - RespectIgnoreDifferences=true