Refactor with OpenPitrix

Signed-off-by: Zhengyi Lai <zheng1@yunify.com> (+2 squashed commits)

pkg/controller/namespace/namespace_controller.go

@@ -18,8 +18,6 @@ package namespace
 
 import (
 	"context"
-	"fmt"
-	"github.com/golang/protobuf/ptypes/wrappers"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -31,7 +29,6 @@ import (
 	"kubesphere.io/kubesphere/pkg/constants"
 	"kubesphere.io/kubesphere/pkg/simple/client/openpitrix"
 	"kubesphere.io/kubesphere/pkg/utils/sliceutil"
-	"openpitrix.io/openpitrix/pkg/pb"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
@@ -130,11 +127,6 @@ func (r *ReconcileNamespace) Reconcile(request reconcile.Request) (reconcile.Res
 				return reconcile.Result{}, err
 			}
 
-			// delete runtime
-			if err = r.deleteRuntime(instance); err != nil {
-				return reconcile.Result{}, err
-			}
-
 			// remove our finalizer from the list and update it.
 			instance.ObjectMeta.Finalizers = sliceutil.RemoveString(instance.ObjectMeta.Finalizers, func(item string) bool {
 				return item == finalizer
@@ -153,13 +145,6 @@ func (r *ReconcileNamespace) Reconcile(request reconcile.Request) (reconcile.Res
 		return reconcile.Result{}, err
 	}
 
-	// skip if openpitrix is not enabled
-	if r.openpitrixClient != nil {
-		if err := r.checkAndCreateRuntime(instance); err != nil {
-			return reconcile.Result{}, err
-		}
-	}
-
 	return reconcile.Result{}, nil
 }
 
@@ -175,88 +160,6 @@ func (r *ReconcileNamespace) isControlledByWorkspace(namespace *corev1.Namespace
 	return true, nil
 }
 
-// Create openpitrix runtime
-func (r *ReconcileNamespace) checkAndCreateRuntime(namespace *corev1.Namespace) error {
-
-	if runtimeId := namespace.Annotations[constants.OpenPitrixRuntimeAnnotationKey]; runtimeId != "" {
-		return nil
-	}
-
-	adminKubeConfigName := fmt.Sprintf("kubeconfig-%s", constants.AdminUserName)
-
-	runtimeCredentials, err := r.openpitrixClient.DescribeRuntimeCredentials(openpitrix.SystemContext(), &pb.DescribeRuntimeCredentialsRequest{SearchWord: &wrappers.StringValue{Value: adminKubeConfigName}, Limit: 1})
-
-	if err != nil {
-		klog.Error(fmt.Sprintf("create runtime, namespace: %s, error: %s", namespace.Name, err))
-		return err
-	}
-
-	var kubesphereRuntimeCredentialId string
-
-	// runtime credential exist
-	if len(runtimeCredentials.GetRuntimeCredentialSet()) > 0 {
-		kubesphereRuntimeCredentialId = runtimeCredentials.GetRuntimeCredentialSet()[0].GetRuntimeCredentialId().GetValue()
-	} else {
-		adminKubeConfig := corev1.ConfigMap{}
-		err := r.Get(context.TODO(), types.NamespacedName{Namespace: constants.KubeSphereControlNamespace, Name: adminKubeConfigName}, &adminKubeConfig)
-
-		if err != nil {
-			klog.Error(fmt.Sprintf("create runtime, namespace: %s, error: %s", namespace.Name, err))
-			return err
-		}
-
-		resp, err := r.openpitrixClient.CreateRuntimeCredential(openpitrix.SystemContext(), &pb.CreateRuntimeCredentialRequest{
-			Name:                     &wrappers.StringValue{Value: adminKubeConfigName},
-			Provider:                 &wrappers.StringValue{Value: "kubernetes"},
-			Description:              &wrappers.StringValue{Value: "kubeconfig"},
-			RuntimeUrl:               &wrappers.StringValue{Value: "kubesphere"},
-			RuntimeCredentialContent: &wrappers.StringValue{Value: adminKubeConfig.Data["config"]},
-		})
-
-		if err != nil {
-			klog.Error(fmt.Sprintf("create runtime, namespace: %s, error: %s", namespace.Name, err))
-			return err
-		}
-
-		kubesphereRuntimeCredentialId = resp.GetRuntimeCredentialId().GetValue()
-	}
-
-	// TODO runtime id is invalid when recreate runtime
-	runtimeId, err := r.openpitrixClient.CreateRuntime(openpitrix.SystemContext(), &pb.CreateRuntimeRequest{
-		Name:                &wrappers.StringValue{Value: namespace.Name},
-		RuntimeCredentialId: &wrappers.StringValue{Value: kubesphereRuntimeCredentialId},
-		Provider:            &wrappers.StringValue{Value: openpitrix.KubernetesProvider},
-		Zone:                &wrappers.StringValue{Value: namespace.Name},
-	})
-
-	if err != nil {
-		klog.Error(fmt.Sprintf("create runtime, namespace: %s, error: %s", namespace.Name, err))
-		return err
-	}
-
-	klog.V(4).Infof("runtime created successfully, namespace: %s, runtime id: %s", namespace.Name, runtimeId)
-
-	return nil
-}
-
-// Delete openpitrix runtime
-func (r *ReconcileNamespace) deleteRuntime(namespace *corev1.Namespace) error {
-
-	if runtimeId := namespace.Annotations[constants.OpenPitrixRuntimeAnnotationKey]; runtimeId != "" {
-		_, err := r.openpitrixClient.DeleteRuntimes(openpitrix.SystemContext(), &pb.DeleteRuntimesRequest{RuntimeId: []string{runtimeId}, Force: &wrappers.BoolValue{Value: true}})
-
-		if err == nil || openpitrix.IsNotFound(err) || openpitrix.IsDeleted(err) {
-			return nil
-		} else {
-			klog.Errorf("delete openpitrix runtime: %s, error: %s", runtimeId, err)
-			return err
-		}
-	}
-
-	return nil
-}
-
-// Create openpitrix runtime
 func (r *ReconcileNamespace) checkAndBindWorkspace(namespace *corev1.Namespace) error {
 
 	workspaceName := namespace.Labels[constants.WorkspaceLabelKey]

pkg/kapis/openpitrix/v1/handler.go

@@ -44,39 +44,40 @@ func newOpenpitrixHandler(factory informers.InformerFactory, opClient op.Client)
 	}
 }
 
-func (h *openpitrixHandler) ListApplications(request *restful.Request, response *restful.Response) {
-	limit, offset := params.ParsePaging(request)
-	runtimeId := request.PathParameter("runtime")
-	namespace := request.PathParameter("namespace")
-	orderBy := params.GetStringValueWithDefault(request, params.OrderByParam, openpitrix.CreateTime)
-	reverse := params.GetBoolValueWithDefault(request, params.ReverseParam, false)
-	conditions, err := params.ParseConditions(request)
+func (h *openpitrixHandler) ListApplications(req *restful.Request, resp *restful.Response) {
+	limit, offset := params.ParsePaging(req)
+	clusterName := req.PathParameter("cluster")
+	namespace := req.PathParameter("namespace")
+	orderBy := params.GetStringValueWithDefault(req, params.OrderByParam, openpitrix.CreateTime)
+	reverse := params.GetBoolValueWithDefault(req, params.ReverseParam, false)
+	conditions, err := params.ParseConditions(req)
 
 	if err != nil {
 		klog.V(4).Infoln(err)
-		api.HandleBadRequest(response, nil, err)
+		api.HandleBadRequest(resp, nil, err)
 		return
 	}
 	conditions.Match[openpitrix.Zone] = namespace
-	conditions.Match[openpitrix.RuntimeId] = runtimeId
+	// in openpitrix, runtime id is the cluster name
+	conditions.Match[openpitrix.RuntimeId] = clusterName
 
 	result, err := h.openpitrix.ListApplications(conditions, limit, offset, orderBy, reverse)
 
 	if err != nil {
 		klog.Errorln(err)
-		api.HandleInternalError(response, nil, err)
+		api.HandleInternalError(resp, nil, err)
 		return
 	}
 
-	response.WriteAsJson(result)
+	resp.WriteAsJson(result)
 }
 
 func (h *openpitrixHandler) DescribeApplication(req *restful.Request, resp *restful.Response) {
-	runtimeId := req.PathParameter("runtime")
+	clusterName := req.PathParameter("cluster")
 	namespace := req.PathParameter("namespace")
-	clusterId := req.PathParameter("application")
+	applicationId := req.PathParameter("application")
 
-	app, err := h.openpitrix.DescribeApplication(namespace, clusterId, runtimeId)
+	app, err := h.openpitrix.DescribeApplication(namespace, applicationId, clusterName)
 
 	if err != nil {
 		klog.Errorln(err)
@@ -89,7 +90,7 @@ func (h *openpitrixHandler) DescribeApplication(req *restful.Request, resp *rest
 }
 
 func (h *openpitrixHandler) CreateApplication(req *restful.Request, resp *restful.Response) {
-	runtimeId := req.PathParameter("runtime")
+	clusterName := req.PathParameter("cluster")
 	namespace := req.PathParameter("namespace")
 	var createClusterRequest openpitrix.CreateClusterRequest
 	err := req.ReadEntity(&createClusterRequest)
@@ -101,7 +102,7 @@ func (h *openpitrixHandler) CreateApplication(req *restful.Request, resp *restfu
 
 	createClusterRequest.Username = req.HeaderParameter(constants.UserNameHeader)
 
-	err = h.openpitrix.CreateApplication(runtimeId, namespace, createClusterRequest)
+	err = h.openpitrix.CreateApplication(clusterName, namespace, createClusterRequest)
 
 	if err != nil {
 		klog.Errorln(err)
@@ -114,8 +115,8 @@ func (h *openpitrixHandler) CreateApplication(req *restful.Request, resp *restfu
 
 func (h *openpitrixHandler) ModifyApplication(req *restful.Request, resp *restful.Response) {
 	var modifyClusterAttributesRequest openpitrix.ModifyClusterAttributesRequest
-	runtimeId := req.PathParameter("runtime")
-	clusterId := req.PathParameter("application")
+	clusterName := req.PathParameter("cluster")
+	applicationId := req.PathParameter("application")
 	namespace := req.PathParameter("namespace")
 	err := req.ReadEntity(&modifyClusterAttributesRequest)
 	if err != nil {
@@ -124,7 +125,7 @@ func (h *openpitrixHandler) ModifyApplication(req *restful.Request, resp *restfu
 		return
 	}
 
-	app, err := h.openpitrix.DescribeApplication(namespace, clusterId, runtimeId)
+	app, err := h.openpitrix.DescribeApplication(namespace, applicationId, clusterName)
 
 	if err != nil {
 		klog.Errorln(err)
@@ -132,8 +133,8 @@ func (h *openpitrixHandler) ModifyApplication(req *restful.Request, resp *restfu
 		return
 	}
 
-	if runtimeId != app.Cluster.RuntimeId {
-		err = fmt.Errorf("rumtime not match %s,%s", app.Cluster.RuntimeId, runtimeId)
+	if clusterName != app.Cluster.RuntimeId {
+		err = fmt.Errorf("runtime and cluster not match %s,%s", app.Cluster.RuntimeId, clusterName)
 		klog.V(4).Infoln(err)
 		api.HandleForbidden(resp, nil, err)
 		return
@@ -151,10 +152,10 @@ func (h *openpitrixHandler) ModifyApplication(req *restful.Request, resp *restfu
 }
 
 func (h *openpitrixHandler) DeleteApplication(req *restful.Request, resp *restful.Response) {
-	runtimeId := req.PathParameter("runtime")
-	clusterId := req.PathParameter("application")
+	clusterName := req.PathParameter("cluster")
+	applicationId := req.PathParameter("application")
 	namespace := req.PathParameter("namespace")
-	app, err := h.openpitrix.DescribeApplication(namespace, clusterId, runtimeId)
+	app, err := h.openpitrix.DescribeApplication(namespace, applicationId, clusterName)
 
 	if err != nil {
 		klog.Errorln(err)
@@ -162,14 +163,14 @@ func (h *openpitrixHandler) DeleteApplication(req *restful.Request, resp *restfu
 		return
 	}
 
-	if runtimeId != app.Cluster.RuntimeId {
-		err = fmt.Errorf("rumtime not match %s,%s", app.Cluster.RuntimeId, runtimeId)
+	if clusterName != app.Cluster.RuntimeId {
+		err = fmt.Errorf("runtime and cluster not match %s,%s", app.Cluster.RuntimeId, clusterName)
 		klog.V(4).Infoln(err)
 		api.HandleForbidden(resp, nil, err)
 		return
 	}
 
-	err = h.openpitrix.DeleteApplication(clusterId)
+	err = h.openpitrix.DeleteApplication(applicationId)
 
 	if err != nil {
 		klog.Errorln(err)
@@ -181,9 +182,9 @@ func (h *openpitrixHandler) DeleteApplication(req *restful.Request, resp *restfu
 }
 
 func (h *openpitrixHandler) UpgradeApplication(req *restful.Request, resp *restful.Response) {
-	runtimeId := req.PathParameter("runtime")
+	clusterName := req.PathParameter("cluster")
 	namespace := req.PathParameter("namespace")
-	clusterId := req.PathParameter("application")
+	applicationId := req.PathParameter("application")
 	var upgradeClusterRequest openpitrix.UpgradeClusterRequest
 	err := req.ReadEntity(&upgradeClusterRequest)
 	if err != nil {
@@ -194,7 +195,7 @@ func (h *openpitrixHandler) UpgradeApplication(req *restful.Request, resp *restf
 
 	upgradeClusterRequest.Username = req.HeaderParameter(constants.UserNameHeader)
 
-	app, err := h.openpitrix.DescribeApplication(namespace, clusterId, runtimeId)
+	app, err := h.openpitrix.DescribeApplication(namespace, applicationId, clusterName)
 
 	if err != nil {
 		klog.Errorln(err)
@@ -202,8 +203,8 @@ func (h *openpitrixHandler) UpgradeApplication(req *restful.Request, resp *restf
 		return
 	}
 
-	if runtimeId != app.Cluster.RuntimeId {
-		err = fmt.Errorf("rumtime not match %s,%s", app.Cluster.RuntimeId, runtimeId)
+	if clusterName != app.Cluster.RuntimeId {
+		err = fmt.Errorf("runtime and cluster not match %s,%s", app.Cluster.RuntimeId, clusterName)
 		klog.V(4).Infoln(err)
 		api.HandleForbidden(resp, nil, err)
 		return

pkg/kapis/openpitrix/v1/register.go

@@ -43,7 +43,21 @@ func AddToContainer(c *restful.Container, factory informers.InformerFactory, op
 	webservice := runtime.NewWebService(GroupVersion)
 	handler := newOpenpitrixHandler(factory, op)
 
-	webservice.Route(webservice.GET("/runtimes/{runtime}/applications").
+	webservice.Route(webservice.GET("/applications").
+		To(handler.ListApplications).
+		Returns(http.StatusOK, api.StatusOK, models.PageableResponse{}).
+		Metadata(restfulspec.KeyOpenAPITags, []string{constants.NamespaceResourcesTag}).
+		Doc("List all applications").
+		Param(webservice.QueryParameter(params.ConditionsParam, "query conditions, connect multiple conditions with commas, equal symbol for exact query, wave symbol for fuzzy query e.g. name~a").
+			Required(false).
+			DataFormat("key=value,key~value").
+			DefaultValue("")).
+		Param(webservice.QueryParameter(params.PagingParam, "paging query, e.g. limit=100,page=1").
+			Required(false).
+			DataFormat("limit=%d,page=%d").
+			DefaultValue("limit=10,page=1")))
+
+	webservice.Route(webservice.GET("/clusters/{cluster}/applications").
 		To(handler.ListApplications).
 		Returns(http.StatusOK, api.StatusOK, models.PageableResponse{}).
 		Metadata(restfulspec.KeyOpenAPITags, []string{constants.NamespaceResourcesTag}).
@@ -52,13 +66,13 @@ func AddToContainer(c *restful.Container, factory informers.InformerFactory, op
 			Required(false).
 			DataFormat("key=value,key~value").
 			DefaultValue("")).
-		Param(webservice.PathParameter("runtime", "the id of runtime")).
+		Param(webservice.PathParameter("cluster", "the name of the cluster.").Required(true)).
 		Param(webservice.QueryParameter(params.PagingParam, "paging query, e.g. limit=100,page=1").
 			Required(false).
 			DataFormat("limit=%d,page=%d").
 			DefaultValue("limit=10,page=1")))
 
-	webservice.Route(webservice.GET("/runtimes/{runtime}/namespaces/{namespace}/applications").
+	webservice.Route(webservice.GET("/clusters/{cluster}/namespaces/{namespace}/applications").
 		To(handler.ListApplications).
 		Returns(http.StatusOK, api.StatusOK, models.PageableResponse{}).
 		Metadata(restfulspec.KeyOpenAPITags, []string{constants.NamespaceResourcesTag}).
@@ -67,61 +81,61 @@ func AddToContainer(c *restful.Container, factory informers.InformerFactory, op
 			Required(false).
 			DataFormat("key=value,key~value").
 			DefaultValue("")).
-		Param(webservice.PathParameter("runtime", "the id of runtime")).
-		Param(webservice.PathParameter("namespace", "the name of the project")).
+		Param(webservice.PathParameter("cluster", "the name of the cluster.").Required(true)).
+		Param(webservice.PathParameter("namespace", "the name of the project").Required(true)).
 		Param(webservice.QueryParameter(params.PagingParam, "paging query, e.g. limit=100,page=1").
 			Required(false).
 			DataFormat("limit=%d,page=%d").
 			DefaultValue("limit=10,page=1")))
 
-	webservice.Route(webservice.GET("/runtimes/{runtime}/namespaces/{namespace}/applications/{application}").
+	webservice.Route(webservice.GET("/clusters/{cluster}/namespaces/{namespace}/applications/{application}").
 		To(handler.DescribeApplication).
 		Returns(http.StatusOK, api.StatusOK, openpitrix2.Application{}).
 		Metadata(restfulspec.KeyOpenAPITags, []string{constants.NamespaceResourcesTag}).
 		Doc("Describe the specified application of the namespace").
-		Param(webservice.PathParameter("runtime", "the id of runtime")).
-		Param(webservice.PathParameter("namespace", "the name of the project")).
-		Param(webservice.PathParameter("application", "application ID")))
+		Param(webservice.PathParameter("cluster", "the name of the cluster.").Required(true)).
+		Param(webservice.PathParameter("namespace", "the name of the project").Required(true)).
+		Param(webservice.PathParameter("application", "the id of the application").Required(true)))
 
-	webservice.Route(webservice.POST("/runtimes/{runtime}/namespaces/{namespace}/applications").
+	webservice.Route(webservice.POST("/clusters/{cluster}/namespaces/{namespace}/applications").
 		To(handler.CreateApplication).
 		Doc("Deploy a new application").
 		Metadata(restfulspec.KeyOpenAPITags, []string{constants.NamespaceResourcesTag}).
 		Reads(openpitrix2.CreateClusterRequest{}).
 		Returns(http.StatusOK, api.StatusOK, errors.Error{}).
-		Param(webservice.PathParameter("runtime", "the id of runtime")).
-		Param(webservice.PathParameter("namespace", "the name of the project")))
+		Param(webservice.PathParameter("cluster", "the name of the cluster.").Required(true)).
+		Param(webservice.PathParameter("namespace", "the name of the project").Required(true)))
 
-	webservice.Route(webservice.PATCH("/runtimes/{runtime}/namespaces/{namespace}/applications/{application}").
+	webservice.Route(webservice.PATCH("/clusters/{cluster}/namespaces/{namespace}/applications/{application}").
 		Consumes(mimePatch...).
 		To(handler.ModifyApplication).
 		Doc("Modify application").
 		Metadata(restfulspec.KeyOpenAPITags, []string{constants.NamespaceResourcesTag}).
 		Reads(openpitrix2.ModifyClusterAttributesRequest{}).
 		Returns(http.StatusOK, api.StatusOK, errors.Error{}).
-		Param(webservice.PathParameter("runtime", "the id of runtime")).
-		Param(webservice.PathParameter("namespace", "the name of the project")).
-		Param(webservice.PathParameter("application", "the id of the application cluster")))
+		Param(webservice.PathParameter("cluster", "the name of the cluster.").Required(true)).
+		Param(webservice.PathParameter("namespace", "the name of the project").Required(true)).
+		Param(webservice.PathParameter("application", "the id of the application").Required(true)))
 
-	webservice.Route(webservice.DELETE("/runtimes/{runtime}/namespaces/{namespace}/applications/{application}").
+	webservice.Route(webservice.DELETE("/clusters/{cluster}/namespaces/{namespace}/applications/{application}").
 		To(handler.DeleteApplication).
 		Doc("Delete the specified application").
 		Metadata(restfulspec.KeyOpenAPITags, []string{constants.NamespaceResourcesTag}).
 		Returns(http.StatusOK, api.StatusOK, errors.Error{}).
-		Param(webservice.PathParameter("runtime", "the id of runtime")).
-		Param(webservice.PathParameter("namespace", "the name of the project")).
-		Param(webservice.PathParameter("application", "the id of the application cluster")))
+		Param(webservice.PathParameter("cluster", "the name of the cluster.").Required(true)).
+		Param(webservice.PathParameter("namespace", "the name of the project").Required(true)).
+		Param(webservice.PathParameter("application", "the id of the application").Required(true)))
 
-	webservice.Route(webservice.POST("/runtimes/{runtime}/namespaces/{namespace}/applications/{application}").
+	webservice.Route(webservice.POST("/clusters/{cluster}/namespaces/{namespace}/applications/{application}").
 		Consumes(mimePatch...).
 		To(handler.UpgradeApplication).
 		Doc("Upgrade application").
 		Metadata(restfulspec.KeyOpenAPITags, []string{constants.NamespaceResourcesTag}).
 		Reads(openpitrix2.UpgradeClusterRequest{}).
 		Returns(http.StatusOK, api.StatusOK, errors.Error{}).
-		Param(webservice.PathParameter("runtime", "the id of runtime")).
-		Param(webservice.PathParameter("namespace", "the name of the project")).
-		Param(webservice.PathParameter("application", "the id of the application cluster")))
+		Param(webservice.PathParameter("cluster", "the name of the cluster.").Required(true)).
+		Param(webservice.PathParameter("namespace", "the name of the project").Required(true)).
+		Param(webservice.PathParameter("application", "the id of the application").Required(true)))
 
 	webservice.Route(webservice.POST("/apps/{app}/versions").
 		To(handler.CreateAppVersion).

pkg/models/openpitrix/applications.go

@@ -35,8 +35,8 @@ import (
 
 type ApplicationInterface interface {
 	ListApplications(conditions *params.Conditions, limit, offset int, orderBy string, reverse bool) (*models.PageableResponse, error)
-	DescribeApplication(namespace, clusterId, runtimeId string) (*Application, error)
-	CreateApplication(runtimeId, namespace string, request CreateClusterRequest) error
+	DescribeApplication(namespace, applicationId, clusterName string) (*Application, error)
+	CreateApplication(clusterName, namespace string, request CreateClusterRequest) error
 	ModifyApplication(request ModifyClusterAttributesRequest) error
 	DeleteApplication(id string) error
 	UpgradeApplication(request UpgradeClusterRequest) error
@@ -143,10 +143,10 @@ func (c *applicationOperator) describeApplication(cluster *pb.Cluster) (*Applica
 	return &app, nil
 }
 
-func (c *applicationOperator) DescribeApplication(namespace string, clusterId string, runtimeId string) (*Application, error) {
+func (c *applicationOperator) DescribeApplication(namespace string, applicationId string, clusterName string) (*Application, error) {
 	describeClusterRequest := &pb.DescribeClustersRequest{
-		ClusterId:  []string{clusterId},
-		RuntimeId:  []string{runtimeId},
+		ClusterId:  []string{applicationId},
+		RuntimeId:  []string{clusterName},
 		Zone:       []string{namespace},
 		WithDetail: pbutil.ToProtoBool(true),
 		Limit:      1,
@@ -358,11 +358,11 @@ func (c *applicationOperator) getIng(namespace string, services []v1.Service) []
 	return ings
 }
 
-func (c *applicationOperator) CreateApplication(runtimeId, namespace string, request CreateClusterRequest) error {
+func (c *applicationOperator) CreateApplication(clusterName, namespace string, request CreateClusterRequest) error {
 	_, err := c.opClient.CreateCluster(openpitrix.ContextWithUsername(request.Username), &pb.CreateClusterRequest{
 		AppId:     &wrappers.StringValue{Value: request.AppId},
 		VersionId: &wrappers.StringValue{Value: request.VersionId},
-		RuntimeId: &wrappers.StringValue{Value: request.RuntimeId},
+		RuntimeId: &wrappers.StringValue{Value: clusterName},
 		Conf:      &wrappers.StringValue{Value: request.Conf},
 		Zone:      &wrappers.StringValue{Value: namespace},
 	})
@@ -395,8 +395,8 @@ func (c *applicationOperator) ModifyApplication(request ModifyClusterAttributesR
 	return nil
 }
 
-func (c *applicationOperator) DeleteApplication(clusterId string) error {
-	_, err := c.opClient.DeleteClusters(openpitrix.SystemContext(), &pb.DeleteClustersRequest{ClusterId: []string{clusterId}, Force: &wrappers.BoolValue{Value: true}})
+func (c *applicationOperator) DeleteApplication(applicationId string) error {
+	_, err := c.opClient.DeleteClusters(openpitrix.SystemContext(), &pb.DeleteClustersRequest{ClusterId: []string{applicationId}, Force: &wrappers.BoolValue{Value: true}})
 
 	if err != nil {
 		klog.Errorln(err)

pkg/simple/client/openpitrix/openpitrix.go

@@ -1,6 +1,6 @@
 /*
 
- Copyright 2019 The KubeSphere Authors.
+ Copyright 2020 The KubeSphere Authors.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ package openpitrix
 import (
 	"context"
 	"fmt"
+	"github.com/golang/protobuf/ptypes/wrappers"
 	"k8s.io/klog"
 	"openpitrix.io/openpitrix/pkg/manager"
 	"openpitrix.io/openpitrix/pkg/pb"
@@ -48,6 +49,12 @@ type Client interface {
 	pb.CategoryManagerClient
 	pb.AttachmentManagerClient
 	pb.RepoIndexerClient
+	// upsert the openpitrix runtime when cluster is updated or created
+	UpsertRuntime(cluster string, kubeConfig string) error
+	// clean up the openpitrix runtime when cluster is deleted
+	CleanupRuntime(cluster string) error
+	// migrate the openpitrix runtime when upgrade ks2.x to ks3.x
+	MigrateRuntime(runtimeId string, cluster string) error
 }
 
 type client struct {
@@ -60,6 +67,47 @@ type client struct {
 	pb.RepoIndexerClient
 }
 
+func (c *client) UpsertRuntime(cluster string, kubeConfig string) error {
+	ctx := SystemContext()
+	req := &pb.CreateRuntimeCredentialRequest{
+		Name:                     &wrappers.StringValue{Value: fmt.Sprintf("kubeconfig-%s", cluster)},
+		Provider:                 &wrappers.StringValue{Value: "kubernetes"},
+		Description:              &wrappers.StringValue{Value: "kubeconfig"},
+		RuntimeUrl:               &wrappers.StringValue{Value: "kubesphere"},
+		RuntimeCredentialContent: &wrappers.StringValue{Value: kubeConfig},
+		RuntimeCredentialId:      &wrappers.StringValue{Value: cluster},
+	}
+	_, err := c.CreateRuntimeCredential(ctx, req)
+	if err != nil {
+		return err
+	}
+	_, err = c.CreateRuntime(ctx, &pb.CreateRuntimeRequest{
+		Name:                &wrappers.StringValue{Value: cluster},
+		RuntimeCredentialId: &wrappers.StringValue{Value: cluster},
+		Provider:            &wrappers.StringValue{Value: KubernetesProvider},
+		Zone:                &wrappers.StringValue{Value: cluster},
+	})
+
+	return err
+}
+
+func (c *client) CleanupRuntime(cluster string) error {
+	ctx := SystemContext()
+	_, err := c.DeleteClusterInRuntime(ctx, &pb.DeleteClusterInRuntimeRequest{
+		RuntimeId: []string{cluster},
+	})
+	return err
+}
+
+func (c *client) MigrateRuntime(runtimeId string, cluster string) error {
+	ctx := SystemContext()
+	_, err := c.MigrateClusterInRuntime(ctx, &pb.MigrateClusterInRuntimeRequest{
+		FromRuntimeId: runtimeId,
+		ToRuntimeId:   cluster,
+	})
+	return err
+}
+
 func parseToHostPort(endpoint string) (string, int, error) {
 	args := strings.Split(endpoint, ":")
 	if len(args) != 2 {