Skip to content

Commit 5c809ee

Browse files
stttsgman0
authored andcommitted
UPSTREAM: <squash>: remove syncer custom code from apiextensions-apiserver
Signed-off-by: Dr. Stefan Schimanski <[email protected]>
1 parent 7a27a28 commit 5c809ee

File tree

2 files changed

+0
-68
lines changed

2 files changed

+0
-68
lines changed

staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresource/status_strategy.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,6 @@ func (a statusStrategy) PrepareForUpdate(ctx context.Context, obj, old runtime.O
6767
// track changed fields in the status update.
6868
managedFields := newCustomResourceObject.GetManagedFields()
6969

70-
// KCP PATCH START
71-
// Get the syncer view diff internal annotations
72-
// before overriding the new object with the old,
73-
// because we want to update them.
74-
newObjectSyncerViewDiffAnnotations := getSyncerViewDiffAnnotations(newCustomResourceObject)
75-
// KCP PATCH END
76-
7770
// copy old object into new object
7871
oldCustomResourceObject := old.(*unstructured.Unstructured)
7972
// overridding the resourceVersion in metadata is safe here, we have already checked that
@@ -83,11 +76,6 @@ func (a statusStrategy) PrepareForUpdate(ctx context.Context, obj, old runtime.O
8376
// set status
8477
newCustomResourceObject.SetManagedFields(managedFields)
8578

86-
// KCP PATCH START
87-
// Update the the syncer view diff annotations even on status update
88-
updateSyncerViewDiffAnnotations(newCustomResourceObject, newObjectSyncerViewDiffAnnotations)
89-
// KCP PATCH END
90-
9179
newCustomResource = newCustomResourceObject.UnstructuredContent()
9280
if ok {
9381
newCustomResource["status"] = status

staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresource/status_strategy_patch.go

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)