admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

migrate legacy API

Browse Source 
Signed-off-by: hongming <talonwan@yunify.com>
This commit is contained in:
hongming
2020-04-20 07:01:43 +08:00
parent 3f89eaef7e
commit 7db2ba662c
103 changed files with 5962 additions and 2363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/kapis/tenant/v1alpha2/handler.go
View File

@@ -5,6 +5,7 @@ import (
"github.com/emicklei/go-restful"
"k8s.io/klog"
"kubesphere.io/kubesphere/pkg/api"
"kubesphere.io/kubesphere/pkg/apiserver/query"
"kubesphere.io/kubesphere/pkg/apiserver/request"
"kubesphere.io/kubesphere/pkg/informers"
"kubesphere.io/kubesphere/pkg/models/tenant"
@@ -15,15 +16,16 @@ type tenantHandler struct {
tenant tenant.Interface
}
func newTenantHandler(k8sClient k8s.Client, factory informers.InformerFactory) *tenantHandler {
func newTenantHandler(_ k8s.Client, factory informers.InformerFactory) *tenantHandler {
return &tenantHandler{
tenant: tenant.New(k8sClient, factory),
tenant: tenant.New(factory),
}
}
func (h *tenantHandler) ListWorkspaces(req *restful.Request, resp *restful.Response) {
user, ok := request.UserFrom(req.Request.Context())
queryParam := query.ParseQueryParameter(req)
if !ok {
err := errors.New("cannot obtain user info")
@@ -32,7 +34,7 @@ func (h *tenantHandler) ListWorkspaces(req *restful.Request, resp *restful.Respo
return
}
result, err := h.tenant.ListWorkspaces(user)
result, err := h.tenant.ListWorkspaces(user, queryParam)
if err != nil {
api.HandleInternalError(resp, nil, err)
@@ -44,6 +46,7 @@ func (h *tenantHandler) ListWorkspaces(req *restful.Request, resp *restful.Respo
func (h *tenantHandler) ListNamespaces(req *restful.Request, resp *restful.Response) {
user, ok := request.UserFrom(req.Request.Context())
queryParam := query.ParseQueryParameter(req)
if !ok {
err := errors.New("cannot obtain user info")
@@ -54,7 +57,7 @@ func (h *tenantHandler) ListNamespaces(req *restful.Request, resp *restful.Respo
workspace := req.PathParameter("workspace")
result, err := h.tenant.ListNamespaces(user, workspace)
result, err := h.tenant.ListNamespaces(user, workspace, queryParam)
if err != nil {
api.HandleInternalError(resp, nil, err)