Feb 1, 2026 · Feb 1, 2026 · Feb 1, 2026 · Feb 1, 2026 · Feb 14, 2026 · Feb 14, 2026
diff --git a/manifest/generate.go b/manifest/generate.go
diff --git a/manifest/generate_test.go b/manifest/generate_test.go
Original file line number	Diff line number	Diff line change
Expand Up		@@ -244,33 +244,10 @@ func isPatchEmpty(patch []byte) bool {
		}

		func cleanMetadataForPatch(data []byte) ([]byte, error) {
	var objMap map[string]interface{}
	if err := json.Unmarshal(data, &objMap); err != nil {
	objMap, err := deleteStatusAndTidyMetadata(data)
	if err != nil {
		return nil, err
		}

	delete(objMap, "status")

	if metadata, ok := objMap["metadata"].(map[string]interface{}); ok {
	delete(metadata, "managedFields")
	delete(metadata, "generation")
	delete(metadata, "creationTimestamp")
	delete(metadata, "resourceVersion")
	delete(metadata, "uid")

	// Remove helm-related and k8s annotations that shouldn't be compared
	if a := metadata["annotations"]; a != nil {
	annotations := a.(map[string]interface{})
	delete(annotations, "meta.helm.sh/release-name")
	delete(annotations, "meta.helm.sh/release-namespace")
	delete(annotations, "deployment.kubernetes.io/revision")

	if len(annotations) == 0 {
	delete(metadata, "annotations")
	}
	}
	}

		return json.Marshal(objMap)
		}
Comment on lines +252 to +261 Copilot AI Feb 14, 2026 Copy link Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. `cleanMetadataForPatch` largely overlaps with `deleteStatusAndTidyMetadata` (manifest/util.go) but removes a different set of metadata fields/annotations (e.g., `meta.helm.sh/*` and `deployment.kubernetes.io/revision` are handled in the other helper but not here). Having two slightly different "tidy metadata" implementations risks inconsistent behavior between patch generation and manifest rendering. Suggest reusing/extracting the existing helper (or at least aligning the exact fields removed) so the same metadata is ignored everywhere. Copilot uses AI. Check for mistakes.

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,7 +4,9 @@ import (
		"testing"

		"github.com/stretchr/testify/require"
	apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
		"k8s.io/apimachinery/pkg/api/meta"
	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
		"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
		"k8s.io/apimachinery/pkg/runtime"
		"k8s.io/apimachinery/pkg/runtime/schema"
Expand Down Expand Up		@@ -318,3 +320,101 @@ func TestCreatePatchForUnstructured(t *testing.T) {
		})
		}
		}

	// TestCreatePatchForCRD tests the three-way merge implementation for CRD objects.
	// This ensures the isCRD branch in createPatch is properly covered.
	func TestCreatePatchForCRD(t *testing.T) {
	originalCRD := &apiextv1.CustomResourceDefinition{
	TypeMeta: metav1.TypeMeta{
	APIVersion: "apiextensions.k8s.io/v1",
	Kind: "CustomResourceDefinition",
	},
	ObjectMeta: metav1.ObjectMeta{
	Name: "crds.example.com",
	},
	Spec: apiextv1.CustomResourceDefinitionSpec{
	Group: "example.com",
	Names: apiextv1.CustomResourceDefinitionNames{
	Plural: "crds",
	Singular: "crd",
	Kind: "Crd",
	},
	Versions: []apiextv1.CustomResourceDefinitionVersion{
	{
	Name: "v1",
	Served: true,
	Storage: true,
	},
	},
	},
	}

	currentCRD := &apiextv1.CustomResourceDefinition{
	TypeMeta: metav1.TypeMeta{
	APIVersion: "apiextensions.k8s.io/v1",
	Kind: "CustomResourceDefinition",
	},
	ObjectMeta: metav1.ObjectMeta{
	Name: "crds.example.com",
	},
	Spec: apiextv1.CustomResourceDefinitionSpec{
	Group: "example.com",
	Names: apiextv1.CustomResourceDefinitionNames{
	Plural: "crds",
	Singular: "crd",
	Kind: "Crd",
	},
	Versions: []apiextv1.CustomResourceDefinitionVersion{
	{
	Name: "v1",
	Served: true,
	Storage: true,
	},
	},
	},
	}

	targetCRD := &apiextv1.CustomResourceDefinition{
	TypeMeta: metav1.TypeMeta{
	APIVersion: "apiextensions.k8s.io/v1",
	Kind: "CustomResourceDefinition",
	},
	ObjectMeta: metav1.ObjectMeta{
	Name: "crds.example.com",
	},
	Spec: apiextv1.CustomResourceDefinitionSpec{
	Group: "example.com",
	Names: apiextv1.CustomResourceDefinitionNames{
	Plural: "crds",
	Singular: "crd",
	Kind: "Crd",
	},
	Versions: []apiextv1.CustomResourceDefinitionVersion{
	{
	Name: "v1",
	Served: true,
	Storage: true,
	},
	},
	},
	}

	target := &resource.Info{
	Mapping: &meta.RESTMapping{
	GroupVersionKind: schema.GroupVersionKind{
	Group: "apiextensions.k8s.io",
	Version: "v1",
	Kind: "CustomResourceDefinition",
	},
	},
	Object: targetCRD,
	}

	patch, patchType, err := createPatch(originalCRD, currentCRD, target)
	require.NoError(t, err, "createPatch should not return an error for CRD")
	require.Equal(t, types.MergePatchType, patchType, "patch type should be MergePatchType for CRD objects")

	t.Logf("CRD Patch result: %s", string(patch))

	require.Equal(t, "{}", string(patch), "CRD with no changes should result in empty patch")
	}