diff --git a/pkg/controllers/binding/common.go b/pkg/controllers/binding/common.go index 4231915c7..031aeda46 100644 --- a/pkg/controllers/binding/common.go +++ b/pkg/controllers/binding/common.go @@ -181,8 +181,8 @@ func transScheduleResultToMap(scheduleResult []workv1alpha2.TargetCluster) map[s func mergeLabel(workload *unstructured.Unstructured, workNamespace string, binding metav1.Object, scope apiextensionsv1.ResourceScope) map[string]string { var workLabel = make(map[string]string) - util.MergeLabel(workload, workv1alpha2.WorkNamespaceLabel, workNamespace) - util.MergeLabel(workload, workv1alpha2.WorkNameLabel, names.GenerateWorkName(workload.GetKind(), workload.GetName(), workload.GetNamespace())) + util.MergeLabel(workload, workv1alpha1.WorkNamespaceLabel, workNamespace) + util.MergeLabel(workload, workv1alpha1.WorkNameLabel, names.GenerateWorkName(workload.GetKind(), workload.GetName(), workload.GetNamespace())) if scope == apiextensionsv1.NamespaceScoped { util.MergeLabel(workload, workv1alpha2.ResourceBindingReferenceKey, names.GenerateBindingReferenceKey(binding.GetNamespace(), binding.GetName())) workLabel[workv1alpha2.ResourceBindingReferenceKey] = names.GenerateBindingReferenceKey(binding.GetNamespace(), binding.GetName()) diff --git a/pkg/controllers/federatedresourcequota/federated_resource_quota_sync_controller.go b/pkg/controllers/federatedresourcequota/federated_resource_quota_sync_controller.go index 8603bc66e..3aa8e3527 100644 --- a/pkg/controllers/federatedresourcequota/federated_resource_quota_sync_controller.go +++ b/pkg/controllers/federatedresourcequota/federated_resource_quota_sync_controller.go @@ -23,7 +23,6 @@ import ( clusterv1alpha1 "github.com/karmada-io/karmada/pkg/apis/cluster/v1alpha1" policyv1alpha1 "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1" workv1alpha1 "github.com/karmada-io/karmada/pkg/apis/work/v1alpha1" - workv1alpha2 "github.com/karmada-io/karmada/pkg/apis/work/v1alpha2" "github.com/karmada-io/karmada/pkg/util" "github.com/karmada-io/karmada/pkg/util/helper" "github.com/karmada-io/karmada/pkg/util/names" @@ -163,8 +162,8 @@ func (c *SyncController) buildWorks(quota *policyv1alpha1.FederatedResourceQuota resourceQuota.Namespace = quota.Namespace resourceQuota.Name = quota.Name resourceQuota.Labels = map[string]string{ - workv1alpha2.WorkNamespaceLabel: workNamespace, - workv1alpha2.WorkNameLabel: workName, + workv1alpha1.WorkNamespaceLabel: workNamespace, + workv1alpha1.WorkNameLabel: workName, } resourceQuota.Spec.Hard = extractClusterHardResourceList(quota.Spec, cluster.Name)