From 3274d6492785794f1a090274a107689076822f72 Mon Sep 17 00:00:00 2001 From: chaunceyjiang Date: Thu, 27 Jul 2023 18:02:05 +0800 Subject: [PATCH] fix: When the PP is deleted, the propagationpolicy.karmada.io/name label in the resource template's labels is not removed. Signed-off-by: chaunceyjiang fix: When the PP is deleted, the propagationpolicy.karmada.io/name label in the resource template's labels is not removed. Signed-off-by: chaunceyjiang --- pkg/detector/policy.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkg/detector/policy.go b/pkg/detector/policy.go index f9d0a13b582e..e126ff50d858 100644 --- a/pkg/detector/policy.go +++ b/pkg/detector/policy.go @@ -89,6 +89,10 @@ func (d *ResourceDetector) propagateResource(object *unstructured.Unstructured, func (d *ResourceDetector) getAndApplyPolicy(object *unstructured.Unstructured, objectKey keys.ClusterWideKey, policyNamespace, policyName string) error { policyObject, err := d.propagationPolicyLister.ByNamespace(policyNamespace).Get(policyName) if err != nil { + if apierrors.IsNotFound(err) { + klog.V(4).Infof("PropagationPolicy(%s/%s) has been removed.", policyNamespace, policyName) + return d.HandlePropagationPolicyDeletion(policyNamespace, policyName) + } klog.Errorf("Failed to get claimed policy(%s/%s),: %v", policyNamespace, policyName, err) return err } @@ -122,6 +126,11 @@ func (d *ResourceDetector) getAndApplyPolicy(object *unstructured.Unstructured, func (d *ResourceDetector) getAndApplyClusterPolicy(object *unstructured.Unstructured, objectKey keys.ClusterWideKey, policyName string) error { policyObject, err := d.clusterPropagationPolicyLister.Get(policyName) if err != nil { + if apierrors.IsNotFound(err) { + klog.V(4).Infof("ClusterPropagationPolicy(%s) has been removed.", policyName) + return d.HandleClusterPropagationPolicyDeletion(policyName) + } + klog.Errorf("Failed to get claimed policy(%s),: %v", policyName, err) return err }