Deprecated namespace and name label for PP/CPP

pkg/apis/policy/v1alpha1/well_known_constants.go

@@ -16,6 +16,7 @@ limitations under the License.
 
 package v1alpha1
 
+// The well-known label key constant.
 const (
 	// PropagationPolicyPermanentIDLabel is the identifier of a PropagationPolicy object.
 	// Karmada generates a unique identifier, such as metadata.UUID, for each PropagationPolicy object.
@@ -31,22 +32,16 @@ const (
 	// In backup scenarios, when applying the backup resource manifest in a new cluster, the UUID may change.
 	ClusterPropagationPolicyPermanentIDLabel = "clusterpropagationpolicy.karmada.io/permanent-id"
 
-	// PropagationPolicyNamespaceAnnotation is added to objects to specify associated PropagationPolicy namespace.
-	PropagationPolicyNamespaceAnnotation = "propagationpolicy.karmada.io/namespace"
-
-	// PropagationPolicyNameAnnotation is added to objects to specify associated PropagationPolicy name.
-	PropagationPolicyNameAnnotation = "propagationpolicy.karmada.io/name"
-
-	// ClusterPropagationPolicyAnnotation is added to objects to specify associated ClusterPropagationPolicy name.
-	ClusterPropagationPolicyAnnotation = "clusterpropagationpolicy.karmada.io/name"
-
 	// PropagationPolicyNamespaceLabel is added to objects to specify associated PropagationPolicy namespace.
+	// Deprecated
 	PropagationPolicyNamespaceLabel = "propagationpolicy.karmada.io/namespace"
 
 	// PropagationPolicyNameLabel is added to objects to specify associated PropagationPolicy's name.
+	// Deprecated
 	PropagationPolicyNameLabel = "propagationpolicy.karmada.io/name"
 
 	// ClusterPropagationPolicyLabel is added to objects to specify associated ClusterPropagationPolicy.
+	// Deprecated
 	ClusterPropagationPolicyLabel = "clusterpropagationpolicy.karmada.io/name"
 
 	// NamespaceSkipAutoPropagationLabel is added to namespace objects to indicate if
@@ -59,3 +54,15 @@ const (
 	// synced to new member clusters, but old member clusters still have it.
 	NamespaceSkipAutoPropagationLabel = "namespace.karmada.io/skip-auto-propagation"
 )
+
+// The well-known annotation key constant.
+const (
+	// PropagationPolicyNamespaceAnnotation is added to objects to specify associated PropagationPolicy namespace.
+	PropagationPolicyNamespaceAnnotation = "propagationpolicy.karmada.io/namespace"
+
+	// PropagationPolicyNameAnnotation is added to objects to specify associated PropagationPolicy name.
+	PropagationPolicyNameAnnotation = "propagationpolicy.karmada.io/name"
+
+	// ClusterPropagationPolicyAnnotation is added to objects to specify associated ClusterPropagationPolicy name.
+	ClusterPropagationPolicyAnnotation = "clusterpropagationpolicy.karmada.io/name"
+)

pkg/controllers/federatedhpa/federatedhpa_controller.go

@@ -407,19 +407,14 @@ func (c *FHPAController) getBindingByLabel(resourceLabel map[string]string, reso
 		return nil, fmt.Errorf("Target resource has no label. ")
 	}
 
-	var policyName, policyNameSpace string
 	var selector labels.Selector
-	if _, ok := resourceLabel[policyv1alpha1.PropagationPolicyNameLabel]; ok {
-		policyName = resourceLabel[policyv1alpha1.PropagationPolicyNameLabel]
-		policyNameSpace = resourceLabel[policyv1alpha1.PropagationPolicyNamespaceLabel]
+	if _, ok := resourceLabel[policyv1alpha1.PropagationPolicyPermanentIDLabel]; ok {
 		selector = labels.SelectorFromSet(labels.Set{
-			policyv1alpha1.PropagationPolicyNameLabel:      policyName,
-			policyv1alpha1.PropagationPolicyNamespaceLabel: policyNameSpace,
+			policyv1alpha1.PropagationPolicyPermanentIDLabel: resourceLabel[policyv1alpha1.PropagationPolicyPermanentIDLabel],
 		})
-	} else if _, ok = resourceLabel[policyv1alpha1.ClusterPropagationPolicyLabel]; ok {
-		policyName = resourceLabel[policyv1alpha1.ClusterPropagationPolicyLabel]
+	} else if _, ok = resourceLabel[policyv1alpha1.ClusterPropagationPolicyPermanentIDLabel]; ok {
 		selector = labels.SelectorFromSet(labels.Set{
-			policyv1alpha1.ClusterPropagationPolicyLabel: policyName,
+			policyv1alpha1.ClusterPropagationPolicyPermanentIDLabel: resourceLabel[policyv1alpha1.ClusterPropagationPolicyPermanentIDLabel],
 		})
 	} else {
 		return nil, fmt.Errorf("No label of policy found. ")

pkg/controllers/hpascaletargetmarker/hpa_scale_target_marker_predicate.go

@@ -91,7 +91,6 @@ func (r *HpaScaleTargetMarker) Generic(_ event.GenericEvent) bool {
 }
 
 func hasBeenPropagated(hpa *autoscalingv2.HorizontalPodAutoscaler) bool {
-	_, ppExist := hpa.GetLabels()[policyv1alpha1.PropagationPolicyNameLabel]
-	_, cppExist := hpa.GetLabels()[policyv1alpha1.ClusterPropagationPolicyLabel]
-	return ppExist || cppExist
+	_, exist := hpa.GetLabels()[policyv1alpha1.PropagationPolicyPermanentIDLabel]
+	return exist
 }

pkg/controllers/multiclusterservice/mcs_controller.go

@@ -496,10 +496,7 @@ func (c *MCSController) claimMultiClusterServiceForService(svc *corev1.Service,
 	}
 
 	// cleanup the policy labels
-	delete(svcCopy.Labels, policyv1alpha1.PropagationPolicyNameLabel)
-	delete(svcCopy.Labels, policyv1alpha1.PropagationPolicyNamespaceLabel)
 	delete(svcCopy.Labels, policyv1alpha1.PropagationPolicyPermanentIDLabel)
-	delete(svcCopy.Labels, policyv1alpha1.ClusterPropagationPolicyLabel)
 	delete(svcCopy.Labels, policyv1alpha1.ClusterPropagationPolicyPermanentIDLabel)
 
 	svcCopy.Labels[util.ResourceTemplateClaimedByLabel] = util.MultiClusterServiceKind