optimize the pv and pvc code

Signed-off-by: duanmengkk <[email protected]>
duanmengkk · Jan 23, 2024 · 0b36bc5 · 0b36bc5
1 parent 0cb00b4
commit 0b36bc5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/pkg/clustertree/cluster-manager/controllers/pod/leaf_pod_controller.go b/pkg/clustertree/cluster-manager/controllers/pod/leaf_pod_controller.go
@@ -2,6 +2,7 @@ package pod
 
 import (
 	"context"
+
 	"github.com/google/go-cmp/cmp"
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"

diff --git a/pkg/clustertree/cluster-manager/controllers/pv/leaf_pv_controller.go b/pkg/clustertree/cluster-manager/controllers/pv/leaf_pv_controller.go
@@ -2,6 +2,7 @@ package pv
 
 import (
 	"context"
+
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/pkg/clustertree/cluster-manager/controllers/pvc/leaf_pvc_controller.go b/pkg/clustertree/cluster-manager/controllers/pvc/leaf_pvc_controller.go
@@ -109,7 +109,7 @@ func (l *LeafPVCController) Reconcile(ctx context.Context, request reconcile.Req
 	if err != nil {
 		klog.Errorf("patch pvc namespace: %q, name: %q to root cluster failed, error: %v",
 			request.NamespacedName.Namespace, request.NamespacedName.Name, err)
-		return reconcile.Result{RequeueAfter: RootPVCRequeueTime}, nil
+		return reconcile.Result{RequeueAfter: utils.DefaultRequeueTime}, nil
 	}
 
 	return reconcile.Result{}, nil

diff --git a/pkg/clustertree/cluster-manager/controllers/pvc/root_pvc_controller.go b/pkg/clustertree/cluster-manager/controllers/pvc/root_pvc_controller.go
@@ -2,12 +2,13 @@ package pvc
 
 import (
 	"context"
+	"reflect"
+
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	mergetypes "k8s.io/apimachinery/pkg/types"
 	"k8s.io/klog"
-	"reflect"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/client"

diff --git a/pkg/utils/constants.go b/pkg/utils/constants.go
@@ -1,9 +1,10 @@
 package utils
 
 import (
+	"time"
+
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"time"
 )
 
 var (