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

improve IAM module

Browse Source 
Signed-off-by: hongming <talonwan@yunify.com>
This commit is contained in:
hongming
2020-05-22 09:35:05 +08:00
parent 0d12529051
commit 8f93266ec0
640 changed files with 50221 additions and 18179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kapis/resources/v1alpha2/handler.go
View File

@@ -38,18 +38,18 @@ type resourceHandler struct {
kubectlOperator kubectl.Interface
}
func newResourceHandler(client kubernetes.Interface, factory informers.InformerFactory) *resourceHandler {
func newResourceHandler(k8sClient kubernetes.Interface, factory informers.InformerFactory, masterURL string) *resourceHandler {
return &resourceHandler{
resourcesGetter: resource.NewResourceGetter(factory),
componentsGetter: components.NewComponentsGetter(factory.KubernetesSharedInformerFactory()),
resourceQuotaGetter: quotas.NewResourceQuotaGetter(factory.KubernetesSharedInformerFactory()),
revisionGetter: revisions.NewRevisionGetter(factory.KubernetesSharedInformerFactory()),
routerOperator: routers.NewRouterOperator(client, factory.KubernetesSharedInformerFactory()),
routerOperator: routers.NewRouterOperator(k8sClient, factory.KubernetesSharedInformerFactory()),
gitVerifier: git.NewGitVerifier(factory.KubernetesSharedInformerFactory()),
registryGetter: registries.NewRegistryGetter(factory.KubernetesSharedInformerFactory()),
kubeconfigOperator: kubeconfig.NewKubeconfigOperator(),
kubectlOperator: kubectl.NewKubectlOperator(client, factory.KubernetesSharedInformerFactory()),
kubeconfigOperator: kubeconfig.NewOperator(k8sClient, nil, masterURL),
kubectlOperator: kubectl.NewOperator(k8sClient, factory.KubernetesSharedInformerFactory()),
}
}

4
pkg/kapis/resources/v1alpha2/register.go
View File

@@ -43,9 +43,9 @@ const (
var GroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha2"}
func AddToContainer(c *restful.Container, client kubernetes.Interface, factory informers.InformerFactory) error {
func AddToContainer(c *restful.Container, k8sClient kubernetes.Interface, factory informers.InformerFactory, masterURL string) error {
webservice := runtime.NewWebService(GroupVersion)
handler := newResourceHandler(client, factory)
handler := newResourceHandler(k8sClient, factory, masterURL)
webservice.Route(webservice.GET("/namespaces/{namespace}/{resources}").
To(handler.handleListNamespaceResources).

7
pkg/kapis/resources/v1alpha3/handler.go
View File

@@ -40,7 +40,7 @@ func (h *Handler) handleGetResources(request *restful.Request, response *restful
}
if err != resource.ErrResourceNotSupported {
klog.Error(err)
klog.Error(err, resourceType)
api.HandleInternalError(response, nil, err)
return
}
@@ -72,7 +72,7 @@ func (h *Handler) handleListResources(request *restful.Request, response *restfu
}
if err != resource.ErrResourceNotSupported {
klog.Error(err)
klog.Error(err, resourceType)
api.HandleInternalError(response, nil, err)
return
}
@@ -99,6 +99,9 @@ func (h *Handler) fallback(resourceType string, namespace string, q *query.Query
case query.FieldName:
conditions.Fuzzy[v1alpha2.Name] = string(value)
break
case query.FieldNames:
conditions.Match[v1alpha2.Name] = string(value)
break
case query.FieldCreationTimeStamp:
conditions.Match[v1alpha2.CreateTime] = string(value)
break