chore: disable PVC watcher (#1191)

caicloud · Jul 18, 2019 · 68de294 · 68de294
1 parent 13806ae
commit 68de294
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 26 deletions.
diff --git a/pkg/server/biz/integration/cluster/cluster.go b/pkg/server/biz/integration/cluster/cluster.go
@@ -13,7 +13,6 @@ import (
 	"github.com/caicloud/cyclone/pkg/server/biz/integration"
 	"github.com/caicloud/cyclone/pkg/server/biz/pvc"
 	"github.com/caicloud/cyclone/pkg/server/biz/tenant"
-	"github.com/caicloud/cyclone/pkg/server/biz/usage"
 	svrcommon "github.com/caicloud/cyclone/pkg/server/common"
 	"github.com/caicloud/cyclone/pkg/server/config"
 	"github.com/caicloud/cyclone/pkg/util/cerr"
@@ -137,12 +136,12 @@ func Close(client clientset.Interface, in *api.Integration, tenant string) (err
 	}()
 	cluster := in.Spec.Cluster
 
-	// new cluster clientset
-	clusterClient, err := common.NewClusterClient(&cluster.Credential, cluster.IsControlCluster)
-	if err != nil {
-		log.Errorf("new cluster client error %v", err)
-		return
-	}
+	//// new cluster clientset
+	//clusterClient, err := common.NewClusterClient(&cluster.Credential, cluster.IsControlCluster)
+	//if err != nil {
+	//	log.Errorf("new cluster client error %v", err)
+	//	return
+	//}
 
 	// delete namespace which is created by cyclone
 	if cluster.Namespace == svrcommon.TenantNamespace(tenant) {
@@ -176,10 +175,10 @@ func Close(client clientset.Interface, in *api.Integration, tenant string) (err
 	}
 
 	// Delete the PVC watcher deployment.
-	err = usage.DeletePVCUsageWatcher(clusterClient, cluster.Namespace)
-	if err != nil {
-		log.Warningf("Delete PVC watcher '%s' error: %v", usage.PVCWatcherName, err)
-	}
+	//err = usage.DeletePVCUsageWatcher(clusterClient, cluster.Namespace)
+	//if err != nil {
+	//	log.Warningf("Delete PVC watcher '%s' error: %v", usage.PVCWatcherName, err)
+	//}
 
 	// delete pvc which is created by cyclone
 	if cluster.PVC == svrcommon.TenantPVC(tenant) {

diff --git a/pkg/server/biz/pvc/pvc.go b/pkg/server/biz/pvc/pvc.go
@@ -11,8 +11,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes"
 
-	"github.com/caicloud/cyclone/pkg/apis/cyclone/v1alpha1"
-	"github.com/caicloud/cyclone/pkg/server/biz/usage"
 	"github.com/caicloud/cyclone/pkg/server/common"
 	"github.com/caicloud/cyclone/pkg/util/retry"
 )
@@ -59,13 +57,14 @@ func CreatePVC(tenantName, storageClass, size string, namespace string, client *
 	}
 
 	// Launch PVC usage watcher to watch the usage of PVC.
-	err = usage.LaunchPVCUsageWatcher(client, tenantName, v1alpha1.ExecutionContext{
-		Namespace: nsname,
-		PVC:       pvcName,
-	})
-	if err != nil {
-		log.Warningf("Launch PVC usage watcher for %s/%s error: %v", nsname, pvcName, err)
-	}
+	//err = usage.LaunchPVCUsageWatcher(client, tenantName, v1alpha1.ExecutionContext{
+	//	Namespace: nsname,
+	//	PVC:       pvcName,
+	//})
+	//if err != nil {
+	//	log.Warningf("Launch PVC usage watcher for %s/%s error: %v", nsname, pvcName, err)
+	//}
+
 	return nil
 }
 
@@ -77,13 +76,13 @@ func DeletePVC(tenantName, namespace string, client *kubernetes.Clientset) error
 		nsname = namespace
 	}
 
-	err := usage.DeletePVCUsageWatcher(client, nsname)
-	if err != nil && !errors.IsNotFound(err) {
-		log.Errorf("delete pvc usage watcher in namespace %s failed %s", nsname, err)
-		return err
-	}
+	//err := usage.DeletePVCUsageWatcher(client, nsname)
+	//if err != nil && !errors.IsNotFound(err) {
+	//	log.Errorf("delete pvc usage watcher in namespace %s failed %s", nsname, err)
+	//	return err
+	//}
 
-	err = client.CoreV1().PersistentVolumeClaims(nsname).Delete(pvcName, &meta_v1.DeleteOptions{})
+	err := client.CoreV1().PersistentVolumeClaims(nsname).Delete(pvcName, &meta_v1.DeleteOptions{})
 	if err != nil && !errors.IsNotFound(err) {
 		log.Errorf("delete persistent volume claim %s error %v", pvcName, err)
 		return err