From da0ca36d1aa2facafc160e6a302f6aa841cc6b19 Mon Sep 17 00:00:00 2001 From: hongming Date: Wed, 24 Apr 2019 14:30:34 +0800 Subject: [PATCH] fix: applications api Signed-off-by: hongming --- pkg/apiserver/resources/application.go | 10 ++++++++++ pkg/models/iam/am.go | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pkg/apiserver/resources/application.go b/pkg/apiserver/resources/application.go index 1d17384eb..11ec96b10 100644 --- a/pkg/apiserver/resources/application.go +++ b/pkg/apiserver/resources/application.go @@ -63,6 +63,7 @@ func ApplicationHandler(req *restful.Request, resp *restful.Response) { func NamespacedApplicationHandler(req *restful.Request, resp *restful.Response) { limit, offset := params.ParsePaging(req.QueryParameter(params.PagingParam)) namespaceName := req.PathParameter("namespace") + clusterId := req.QueryParameter("cluster_id") conditions, err := params.ParseConditions(req.QueryParameter(params.ConditionsParam)) if err != nil { if err != nil { @@ -70,6 +71,15 @@ func NamespacedApplicationHandler(req *restful.Request, resp *restful.Response) return } } + if len(clusterId) > 0 { + app, err := applications.GetApp(clusterId) + if err != nil { + resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err)) + return + } + resp.WriteEntity(app) + return + } namespace, err := resources.GetResource("", resources.Namespaces, namespaceName) diff --git a/pkg/models/iam/am.go b/pkg/models/iam/am.go index a6d047869..d89aac0f7 100644 --- a/pkg/models/iam/am.go +++ b/pkg/models/iam/am.go @@ -643,10 +643,10 @@ func CreateClusterRoleBinding(username string, clusterRoleName string) error { glog.Errorln("create cluster role binding", err) return err } + if err := kubeconfig.CreateKubeConfig(username); err != nil { + glog.Errorln("create user kubeconfig failed", username, err) + } if clusterRoleName == constants.ClusterAdmin { - if err := kubeconfig.CreateKubeConfig(username); err != nil { - glog.Errorln("create user kubeconfig failed", username, err) - } if err := kubectl.CreateKubectlDeploy(username); err != nil { glog.Errorln("create user terminal pod failed", username, err) }