From d28167db73e9a21b98af98a906423d003a27a92c Mon Sep 17 00:00:00 2001
From: Chris Butler <chris.butler@redhat.com>
Date: Wed, 27 May 2026 10:49:50 +0900
Subject: [PATCH] fix: ignore CRD label differences for Kyverno

Kyverno's migration job creates policies.kyverno.io CRD without Helm
labels, causing ArgoCD sync issues. Configure ignoreDifferences to
ignore label/annotation mismatches on the CRD while respecting all
other drift via RespectIgnoreDifferences syncOption.

Fixes fresh deployment sync issues where migration job runs before
Helm chart manages the CRD.
---
 values-baremetal-gpu.yaml | 8 ++++++++
 values-baremetal.yaml     | 8 ++++++++
 values-simple.yaml        | 8 ++++++++
 3 files changed, 24 insertions(+)

diff --git a/values-baremetal-gpu.yaml b/values-baremetal-gpu.yaml
index e5c237c4..ecb54bff 100644
--- a/values-baremetal-gpu.yaml
+++ b/values-baremetal-gpu.yaml
@@ -223,6 +223,14 @@ clusterGroup:
           limit: 20
         syncOptions:
           - ServerSideApply=true
+          - RespectIgnoreDifferences=true
+      ignoreDifferences:
+        - group: apiextensions.k8s.io
+          kind: CustomResourceDefinition
+          name: policies.kyverno.io
+          jsonPointers:
+            - /metadata/labels
+            - /metadata/annotations
       extraValueFiles:
         - '/overrides/values-kyverno.yaml'
       overrides:
diff --git a/values-baremetal.yaml b/values-baremetal.yaml
index c04eadb7..f63b1c02 100644
--- a/values-baremetal.yaml
+++ b/values-baremetal.yaml
@@ -196,6 +196,14 @@ clusterGroup:
           limit: 20
         syncOptions:
           - ServerSideApply=true
+          - RespectIgnoreDifferences=true
+      ignoreDifferences:
+        - group: apiextensions.k8s.io
+          kind: CustomResourceDefinition
+          name: policies.kyverno.io
+          jsonPointers:
+            - /metadata/labels
+            - /metadata/annotations
       extraValueFiles:
         - '/overrides/values-kyverno.yaml'
       overrides:
diff --git a/values-simple.yaml b/values-simple.yaml
index 4fd749e6..4fcdf140 100644
--- a/values-simple.yaml
+++ b/values-simple.yaml
@@ -129,6 +129,14 @@ clusterGroup:
           limit: 20
         syncOptions:
           - ServerSideApply=true
+          - RespectIgnoreDifferences=true
+      ignoreDifferences:
+        - group: apiextensions.k8s.io
+          kind: CustomResourceDefinition
+          name: policies.kyverno.io
+          jsonPointers:
+            - /metadata/labels
+            - /metadata/annotations
       extraValueFiles:
         - '/overrides/values-kyverno.yaml'