devlopment branch (#1736)

pkg/kapis/operations/v1alpha2/register.go

@@ -20,9 +20,9 @@ package v1alpha2
 import (
 	"github.com/emicklei/go-restful"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"kubesphere.io/kubesphere/pkg/apiserver/operations"
 	"kubesphere.io/kubesphere/pkg/apiserver/runtime"
 	"kubesphere.io/kubesphere/pkg/server/errors"
+	"kubesphere.io/kubesphere/pkg/simple/client/k8s"
 	"net/http"
 )
 
@@ -30,25 +30,15 @@ const GroupName = "operations.kubesphere.io"
 
 var GroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha2"}
 
-var (
-	WebServiceBuilder = runtime.NewContainerBuilder(addWebService)
-	AddToContainer    = WebServiceBuilder.AddToContainer
-)
-
-func addWebService(c *restful.Container) error {
+func AddToContainer(c *restful.Container, client k8s.Client) error {
 
 	ok := "ok"
 	webservice := runtime.NewWebService(GroupVersion)
 
-	webservice.Route(webservice.POST("/nodes/{node}/drainage").
-		To(operations.DrainNode).
-		Deprecate().
-		Doc("remove a node from service, safely evict all of your pods from a node and you can power down the node. More info: https://kubernetes.io/docs/tasks/administer-cluster/safely-drain-node/").
-		Param(webservice.PathParameter("node", "node name")).
-		Returns(http.StatusOK, ok, errors.Error{}))
+	handler := newOperationHandler(client)
 
 	webservice.Route(webservice.POST("/namespaces/{namespace}/jobs/{job}").
-		To(operations.RerunJob).
+		To(handler.handleJobReRun).
 		Doc("Rerun job whether the job is complete or not").
 		Deprecate().
 		Param(webservice.PathParameter("job", "job name")).