refact format function

Signed-off-by: wm775825 <1174929164@qq.com>
wm775825 · Dec 5, 2023 · b3e0919 · b3e0919
1 parent 0680826
commit b3e0919
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/fleet.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/fleet.go
@@ -91,12 +91,7 @@ func (f *FleetClientSet) Get(ctx context.Context, name string, options *metav1.G
 	if err = f.validateMinimumResourceVersion(options.ResourceVersion, accessor.GetResourceVersion()); err != nil {
 		return nil, err
 	}
-	if clusterName != KarmadaCluster {
-		accessor.SetName(accessor.GetName() + ".clusterspace." + clusterName)
-	}
-	mrv := newMultiClusterResourceVersionWithCapacity(1)
-	mrv.set(clusterName, accessor.GetResourceVersion())
-	accessor.SetResourceVersion(mrv.String())
+	setNameAndResourceVersion(accessor, clusterName)
 	return objPtr, nil
 }
 
@@ -218,9 +213,7 @@ func (f *FleetClientSet) ListPredicate(ctx context.Context, p storage.SelectionP
 			if err != nil {
 				return err
 			}
-			if clusterName != KarmadaCluster {
-				accessor.SetName(accessor.GetName() + ".clusterspace." + clusterName)
-			}
+			setName(accessor, clusterName)
 			accessor.SetResourceVersion(responseRV.String())
 
 			items = append(items, clone)
@@ -551,9 +544,7 @@ func (f *FleetClientSet) WatchPredicate(ctx context.Context, p storage.Selection
 		if err != nil {
 			return
 		}
-		if cluster != KarmadaCluster {
-			accessor.SetName(accessor.GetName() + ".clusterspace." + cluster)
-		}
+		setName(accessor, cluster)
 
 		responseRVLock.Lock()
 		defer responseRVLock.Unlock()
@@ -640,11 +631,6 @@ func (f *FleetClientSet) Create(ctx context.Context, obj runtime.Object, options
 	if err != nil {
 		return nil, err
 	}
-	if clusterName != KarmadaCluster {
-		accessor.SetName(accessor.GetName() + ".clusterspace." + clusterName)
-	}
-	mrv := newMultiClusterResourceVersionWithCapacity(1)
-	mrv.set(clusterName, accessor.GetResourceVersion())
-	accessor.SetResourceVersion(mrv.String())
+	setNameAndResourceVersion(accessor, clusterName)
 	return retObj, nil
 }
diff --git a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/utils.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/utils.go
@@ -9,6 +9,7 @@ import (
 	"sync"
 
 	"k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/conversion"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -221,3 +222,20 @@ func (w *watchMux) Stop() {
 		close(w.done)
 	}
 }
+
+func setNameAndResourceVersion(accessor metav1.Object, clusterName string) {
+	setName(accessor, clusterName)
+	setResourceVersion(accessor, clusterName)
+}
+
+func setName(accessor metav1.Object, clusterName string) {
+	if clusterName != KarmadaCluster {
+		accessor.SetName(accessor.GetName() + ".clusterspace." + clusterName)
+	}
+}
+
+func setResourceVersion(accessor metav1.Object, clusterName string) {
+	mrv := newMultiClusterResourceVersionWithCapacity(1)
+	mrv.set(clusterName, accessor.GetResourceVersion())
+	accessor.SetResourceVersion(mrv.String())
+}