From 7219bf66558684ae56c2b469ee56dc83b17b063f Mon Sep 17 00:00:00 2001 From: hanweisen Date: Wed, 29 Jun 2022 00:24:42 +0800 Subject: [PATCH] avoid required label override by overridepolicy Signed-off-by: hanweisen --- pkg/controllers/binding/common.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/controllers/binding/common.go b/pkg/controllers/binding/common.go index aefcce21b..dd63409a6 100644 --- a/pkg/controllers/binding/common.go +++ b/pkg/controllers/binding/common.go @@ -93,8 +93,6 @@ func ensureWork( return err } - workLabel := mergeLabel(clonedWorkload, workNamespace, binding, scope) - if hasScheduledReplica { if resourceInterpreter.HookEnabled(clonedWorkload.GroupVersionKind(), configv1alpha1.InterpreterOperationReviseReplica) { clonedWorkload, err = resourceInterpreter.ReviseReplica(clonedWorkload, desireReplicaInfos[targetCluster.Name]) @@ -124,6 +122,7 @@ func ensureWork( klog.Errorf("Failed to apply overrides for %s/%s/%s, err is: %v", clonedWorkload.GetKind(), clonedWorkload.GetNamespace(), clonedWorkload.GetName(), err) return err } + workLabel := mergeLabel(clonedWorkload, workNamespace, binding, scope) annotations := mergeAnnotations(clonedWorkload, binding, scope) annotations, err = recordAppliedOverrides(cops, ops, annotations)