karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1480 from XiShanYongYe-Chang/update-work-label 

Update WorkNamespaceLabel/WorkNameLabel to v1alpha1
This commit is contained in:
karmada-bot 2022-03-14 17:54:33 +08:00 committed by GitHub
parent 42c8c3103b 74451dba63
commit feeadbe3ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controllers/binding/common.go
View File

@ -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 { func mergeLabel(workload *unstructured.Unstructured, workNamespace string, binding metav1.Object, scope apiextensionsv1.ResourceScope) map[string]string {
var workLabel = make(map[string]string) var workLabel = make(map[string]string)
util.MergeLabel(workload, workv1alpha2.WorkNamespaceLabel, workNamespace) util.MergeLabel(workload, workv1alpha1.WorkNamespaceLabel, workNamespace)
util.MergeLabel(workload, workv1alpha2.WorkNameLabel, names.GenerateWorkName(workload.GetKind(), workload.GetName(), workload.GetNamespace())) util.MergeLabel(workload, workv1alpha1.WorkNameLabel, names.GenerateWorkName(workload.GetKind(), workload.GetName(), workload.GetNamespace()))
if scope == apiextensionsv1.NamespaceScoped { if scope == apiextensionsv1.NamespaceScoped {
util.MergeLabel(workload, workv1alpha2.ResourceBindingReferenceKey, names.GenerateBindingReferenceKey(binding.GetNamespace(), binding.GetName())) util.MergeLabel(workload, workv1alpha2.ResourceBindingReferenceKey, names.GenerateBindingReferenceKey(binding.GetNamespace(), binding.GetName()))
workLabel[workv1alpha2.ResourceBindingReferenceKey] = names.GenerateBindingReferenceKey(binding.GetNamespace(), binding.GetName()) workLabel[workv1alpha2.ResourceBindingReferenceKey] = names.GenerateBindingReferenceKey(binding.GetNamespace(), binding.GetName())

5
pkg/controllers/federatedresourcequota/federated_resource_quota_sync_controller.go
View File

@ -23,7 +23,6 @@ import (
clusterv1alpha1 "github.com/karmada-io/karmada/pkg/apis/cluster/v1alpha1" clusterv1alpha1 "github.com/karmada-io/karmada/pkg/apis/cluster/v1alpha1"
policyv1alpha1 "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1" policyv1alpha1 "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1"
workv1alpha1 "github.com/karmada-io/karmada/pkg/apis/work/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"
"github.com/karmada-io/karmada/pkg/util/helper" "github.com/karmada-io/karmada/pkg/util/helper"
"github.com/karmada-io/karmada/pkg/util/names" "github.com/karmada-io/karmada/pkg/util/names"
@ -163,8 +162,8 @@ func (c *SyncController) buildWorks(quota *policyv1alpha1.FederatedResourceQuota
resourceQuota.Namespace = quota.Namespace resourceQuota.Namespace = quota.Namespace
resourceQuota.Name = quota.Name resourceQuota.Name = quota.Name
resourceQuota.Labels = map[string]string{ resourceQuota.Labels = map[string]string{
workv1alpha2.WorkNamespaceLabel: workNamespace, workv1alpha1.WorkNamespaceLabel: workNamespace,
workv1alpha2.WorkNameLabel: workName, workv1alpha1.WorkNameLabel: workName,
} }
resourceQuota.Spec.Hard = extractClusterHardResourceList(quota.Spec, cluster.Name) resourceQuota.Spec.Hard = extractClusterHardResourceList(quota.Spec, cluster.Name)