From 04395e357945be4530057f6ed40dc0feabd20ed7 Mon Sep 17 00:00:00 2001 From: yizhang-zen Date: Wed, 3 Apr 2024 14:38:18 -0700 Subject: [PATCH] Rename func to getClusterNameFromAnnotation to match with updated behavior Signed-off-by: yizhang-zen --- pkg/controllers/status/work_status_controller.go | 6 +++--- pkg/controllers/status/work_status_controller_test.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/controllers/status/work_status_controller.go b/pkg/controllers/status/work_status_controller.go index cbb8cdda2..ffc993a29 100644 --- a/pkg/controllers/status/work_status_controller.go +++ b/pkg/controllers/status/work_status_controller.go @@ -152,7 +152,7 @@ func (c *WorkStatusController) RunWorkQueue() { // generateKey generates a key from obj, the key contains cluster, GVK, namespace and name. func generateKey(obj interface{}) (util.QueueKey, error) { resource := obj.(*unstructured.Unstructured) - cluster, err := getClusterNameFromLabel(resource) + cluster, err := getClusterNameFromAnnotation(resource) if err != nil { return nil, err } @@ -164,8 +164,8 @@ func generateKey(obj interface{}) (util.QueueKey, error) { return keys.FederatedKeyFunc(cluster, obj) } -// getClusterNameFromLabel gets cluster name from ownerLabel, if label not exist, means resource is not created by karmada. -func getClusterNameFromLabel(resource *unstructured.Unstructured) (string, error) { +// getClusterNameFromAnnotation gets cluster name from ownerLabel, if label not exist, means resource is not created by karmada. +func getClusterNameFromAnnotation(resource *unstructured.Unstructured) (string, error) { workNamespace, exist := resource.GetAnnotations()[workv1alpha2.WorkNamespaceAnnotation] if !exist { klog.V(4).Infof("Ignore resource(%s/%s/%s) which not managed by karmada", resource.GetKind(), resource.GetNamespace(), resource.GetName()) diff --git a/pkg/controllers/status/work_status_controller_test.go b/pkg/controllers/status/work_status_controller_test.go index 68274e847..851fea508 100644 --- a/pkg/controllers/status/work_status_controller_test.go +++ b/pkg/controllers/status/work_status_controller_test.go @@ -382,7 +382,7 @@ func TestGenerateKey(t *testing.T) { existErr: false, }, { - name: "getClusterNameFromLabel failed", + name: "getClusterNameFromAnnotation failed", obj: &unstructured.Unstructured{ Object: map[string]interface{}{ "apiVersion": "v1", @@ -437,7 +437,7 @@ func TestGenerateKey(t *testing.T) { } } -func TestGetClusterNameFromLabel(t *testing.T) { +func TestGetClusterNameFromAnnotation(t *testing.T) { tests := []struct { name string resource *unstructured.Unstructured @@ -502,7 +502,7 @@ func TestGetClusterNameFromLabel(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - actual, err := getClusterNameFromLabel(tt.resource) + actual, err := getClusterNameFromAnnotation(tt.resource) assert.Equal(t, tt.expect, actual) if tt.existErr { assert.NotEmpty(t, err)