From 9d7b12896feb71b2523ba65129d7695284018140 Mon Sep 17 00:00:00 2001 From: Felix Wolf Date: Mon, 30 Mar 2026 22:36:52 +0200 Subject: [PATCH] fix: Ignore status field diffs in ArgoCD resource comparisons Configure ArgoCD to ignore /status in diffs globally. Fixes 'terminatingReplicas: field not declared in schema' errors caused by Kubernetes 1.32 adding new DaemonSet status fields that ArgoCD's built-in schema doesn't know about. Co-Authored-By: Claude Opus 4.6 (1M context) --- prototypes/argocd/helm/argo-cd.yaml | 6 ++++++ rendered/envs/production/argocd/configmap-argocd-cm.yaml | 5 +++++ .../argocd/deployment-argo-cd-argocd-repo-server.yaml | 2 +- .../production/argocd/deployment-argo-cd-argocd-server.yaml | 2 +- .../statefulset-argo-cd-argocd-application-controller.yaml | 2 +- 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/prototypes/argocd/helm/argo-cd.yaml b/prototypes/argocd/helm/argo-cd.yaml index 439f20f..0960723 100644 --- a/prototypes/argocd/helm/argo-cd.yaml +++ b/prototypes/argocd/helm/argo-cd.yaml @@ -9,6 +9,12 @@ global: configs: params: server.insecure: true + cm: + resource.customizations.ignoreDifferences.all: | + managedFieldsManagers: + - kube-controller-manager + jsonPointers: + - /status server: ingress: diff --git a/rendered/envs/production/argocd/configmap-argocd-cm.yaml b/rendered/envs/production/argocd/configmap-argocd-cm.yaml index 0096b8d..8d38dff 100644 --- a/rendered/envs/production/argocd/configmap-argocd-cm.yaml +++ b/rendered/envs/production/argocd/configmap-argocd-cm.yaml @@ -4,6 +4,11 @@ data: application.instanceLabelKey: argocd.argoproj.io/instance application.sync.impersonation.enabled: "false" exec.enabled: "false" + resource.customizations.ignoreDifferences.all: | + managedFieldsManagers: + - kube-controller-manager + jsonPointers: + - /status server.rbac.log.enforce.enable: "false" statusbadge.enabled: "false" timeout.hard.reconciliation: 0s diff --git a/rendered/envs/production/argocd/deployment-argo-cd-argocd-repo-server.yaml b/rendered/envs/production/argocd/deployment-argo-cd-argocd-repo-server.yaml index 11597f0..cf52a3d 100644 --- a/rendered/envs/production/argocd/deployment-argo-cd-argocd-repo-server.yaml +++ b/rendered/envs/production/argocd/deployment-argo-cd-argocd-repo-server.yaml @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/cm: 52c5a2727dab153bcfd45d15790886f8ec029f5dde02ec94a383c60583bcbb2e + checksum/cm: 3583210793db8d1abf108262c051079800349bbfb09cb52450b6dd436e4523f1 checksum/cmd-params: f46fb4747491e33ef19e957952ce838b6507690ddf03e01967ec0b131af9b595 labels: app.kubernetes.io/component: repo-server diff --git a/rendered/envs/production/argocd/deployment-argo-cd-argocd-server.yaml b/rendered/envs/production/argocd/deployment-argo-cd-argocd-server.yaml index 64ca542..491aa79 100644 --- a/rendered/envs/production/argocd/deployment-argo-cd-argocd-server.yaml +++ b/rendered/envs/production/argocd/deployment-argo-cd-argocd-server.yaml @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/cm: 52c5a2727dab153bcfd45d15790886f8ec029f5dde02ec94a383c60583bcbb2e + checksum/cm: 3583210793db8d1abf108262c051079800349bbfb09cb52450b6dd436e4523f1 checksum/cmd-params: f46fb4747491e33ef19e957952ce838b6507690ddf03e01967ec0b131af9b595 labels: app.kubernetes.io/component: server diff --git a/rendered/envs/production/argocd/statefulset-argo-cd-argocd-application-controller.yaml b/rendered/envs/production/argocd/statefulset-argo-cd-argocd-application-controller.yaml index 873d75c..3782acf 100644 --- a/rendered/envs/production/argocd/statefulset-argo-cd-argocd-application-controller.yaml +++ b/rendered/envs/production/argocd/statefulset-argo-cd-argocd-application-controller.yaml @@ -24,7 +24,7 @@ spec: template: metadata: annotations: - checksum/cm: 52c5a2727dab153bcfd45d15790886f8ec029f5dde02ec94a383c60583bcbb2e + checksum/cm: 3583210793db8d1abf108262c051079800349bbfb09cb52450b6dd436e4523f1 checksum/cmd-params: f46fb4747491e33ef19e957952ce838b6507690ddf03e01967ec0b131af9b595 labels: app.kubernetes.io/component: application-controller