Style: adjusted the directory of the func

for func DeleteSyncConfigDeployment()

pkg/controllers/client.go

@@ -12,7 +12,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/tools/remotecommand"
-	"k8s.io/client-go/util/retry"
 
 	"github.com/opencurve/curve-operator/pkg/daemon"
 	"github.com/opencurve/curve-operator/pkg/k8sutil"
@@ -157,22 +156,3 @@ func getReadConfigJobLabel(c *daemon.Cluster) map[string]string {
 	labels["curve"] = c.Kind
 	return labels
 }
-
-// deleteSyncConfigDeployment delete the SyncConfigDeployment after the cluster is deployed.
-func deleteSyncConfigDeployment(c *daemon.Cluster, syncConfigDeployment string) error {
-	err := retry.OnError(retry.DefaultRetry, func(err error) bool {
-		// retrying for any error that occurs
-		return true
-	}, func() error {
-		return c.Context.Clientset.AppsV1().Deployments(c.Namespace).Delete(syncConfigDeployment, &metav1.DeleteOptions{})
-	})
-
-	if err != nil {
-		return errors.Wrapf(err, "failed to delete deployment %s after the %s has been deployed",
-			SyncConfigDeployment, c.Kind)
-	}
-
-	logger.Infof("the %s has been deployed and the deployment %s has been deleted", c.Kind, SyncConfigDeployment)
-
-	return nil
-}

pkg/controllers/cluster.go

@@ -1,13 +1,15 @@
 package controllers
 
 import (
+	"context"
 	"time"
 
 	"github.com/coreos/pkg/capnslog"
 
 	"github.com/opencurve/curve-operator/pkg/chunkserver"
 	"github.com/opencurve/curve-operator/pkg/daemon"
 	"github.com/opencurve/curve-operator/pkg/etcd"
+	"github.com/opencurve/curve-operator/pkg/k8sutil"
 	"github.com/opencurve/curve-operator/pkg/mds"
 	"github.com/opencurve/curve-operator/pkg/metaserver"
 	"github.com/opencurve/curve-operator/pkg/monitor"
@@ -164,5 +166,5 @@ func reconcileCurveFSDaemons(c *daemon.Cluster) error {
 
 // cleanClusterInstallEnv clean up the cluster install environment
 func cleanClusterInstallEnv(c *daemon.Cluster) error {
-	return deleteSyncConfigDeployment(c, SyncConfigDeployment)
+	return k8sutil.DeleteSyncConfigDeployment(context.TODO(), &c.Context, SyncConfigDeployment, c.Namespace)
 }

pkg/k8sutil/deployment.go

@@ -7,6 +7,7 @@ import (
 
 	appsv1 "k8s.io/api/apps/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/util/retry"
 
 	"github.com/opencurve/curve-operator/pkg/clusterd"
 	"github.com/opencurve/curve-operator/pkg/k8sutil/patch"
@@ -99,3 +100,22 @@ func WaitForDeploymentToStart(ctx context.Context, clusterdContext *clusterd.Con
 	}
 	return fmt.Errorf("gave up waiting for deployment %q to update", deployment.Name)
 }
+
+// DeleteSyncConfigDeployment delete the SyncConfigDeployment after the cluster is deployed.
+func DeleteSyncConfigDeployment(ctx context.Context, clusterdContext *clusterd.Context, syncConfigDeployment, namespace string) error {
+	err := retry.OnError(retry.DefaultRetry, func(err error) bool {
+		// retrying for any error that occurs
+		return true
+	}, func() error {
+		return clusterdContext.Clientset.AppsV1().Deployments(namespace).Delete(syncConfigDeployment, &metav1.DeleteOptions{})
+	})
+
+	if err != nil {
+		return fmt.Errorf("failed to delete deployment %q after the curve cluster has been deployed. %v",
+			syncConfigDeployment, err)
+	}
+
+	logger.Infof("the curve cluster has been deployed and the deployment %q has been deleted", syncConfigDeployment)
+
+	return nil
+}