diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json deleted file mode 100644 index 8944c3891..000000000 --- a/Godeps/Godeps.json +++ /dev/null @@ -1,181 +0,0 @@ -{ - "ImportPath": "kubesphere.io/kubesphere", - "GoVersion": "go1.10", - "GodepVersion": "v80", - "Packages": [ - "./..." - ], - "Deps": [ - { - "ImportPath": "github.com/docker/distribution/digestset", - "Comment": "v2.6.0-rc.1-277-g83389a14", - "Rev": "83389a148052d74ac602f5f1d62f86ff2f3c4aa5" - }, - { - "ImportPath": "github.com/docker/distribution/reference", - "Comment": "v2.6.0-rc.1-277-g83389a14", - "Rev": "83389a148052d74ac602f5f1d62f86ff2f3c4aa5" - }, - { - "ImportPath": "github.com/docker/docker/api", - "Comment": "docs-v1.12.0-rc4-2016-07-15-9343-gb7b6b6929", - "Rev": "b7b6b6929c6436145bd12e6fef7efb7d01fa170b" - }, - { - "ImportPath": "github.com/docker/docker/api/types", - "Comment": "docs-v1.12.0-rc4-2016-07-15-9343-gb7b6b6929", - "Rev": "b7b6b6929c6436145bd12e6fef7efb7d01fa170b" - }, - { - "ImportPath": "github.com/docker/docker/api/types/blkiodev", - "Comment": "docs-v1.12.0-rc4-2016-07-15-9343-gb7b6b6929", - "Rev": "b7b6b6929c6436145bd12e6fef7efb7d01fa170b" - }, - { - "ImportPath": "github.com/docker/docker/api/types/container", - "Comment": "docs-v1.12.0-rc4-2016-07-15-9343-gb7b6b6929", - "Rev": "b7b6b6929c6436145bd12e6fef7efb7d01fa170b" - }, - { - "ImportPath": "github.com/docker/docker/api/types/events", - "Comment": "docs-v1.12.0-rc4-2016-07-15-9343-gb7b6b6929", - "Rev": "b7b6b6929c6436145bd12e6fef7efb7d01fa170b" - }, - { - "ImportPath": "github.com/docker/docker/api/types/filters", - "Comment": "docs-v1.12.0-rc4-2016-07-15-9343-gb7b6b6929", - "Rev": "b7b6b6929c6436145bd12e6fef7efb7d01fa170b" - }, - { - "ImportPath": "github.com/docker/docker/api/types/image", - "Comment": "docs-v1.12.0-rc4-2016-07-15-9343-gb7b6b6929", - "Rev": "b7b6b6929c6436145bd12e6fef7efb7d01fa170b" - }, - { - "ImportPath": "github.com/docker/docker/api/types/mount", - "Comment": "docs-v1.12.0-rc4-2016-07-15-9343-gb7b6b6929", - "Rev": "b7b6b6929c6436145bd12e6fef7efb7d01fa170b" - }, - { - "ImportPath": "github.com/docker/docker/api/types/network", - "Comment": "docs-v1.12.0-rc4-2016-07-15-9343-gb7b6b6929", - "Rev": "b7b6b6929c6436145bd12e6fef7efb7d01fa170b" - }, - { - "ImportPath": "github.com/docker/docker/api/types/registry", - "Comment": "docs-v1.12.0-rc4-2016-07-15-9343-gb7b6b6929", - "Rev": "b7b6b6929c6436145bd12e6fef7efb7d01fa170b" - }, - { - "ImportPath": "github.com/docker/docker/api/types/strslice", - "Comment": "docs-v1.12.0-rc4-2016-07-15-9343-gb7b6b6929", - "Rev": "b7b6b6929c6436145bd12e6fef7efb7d01fa170b" - }, - { - "ImportPath": "github.com/docker/docker/api/types/swarm", - "Comment": "docs-v1.12.0-rc4-2016-07-15-9343-gb7b6b6929", - "Rev": "b7b6b6929c6436145bd12e6fef7efb7d01fa170b" - }, - { - "ImportPath": "github.com/docker/docker/api/types/swarm/runtime", - "Comment": "docs-v1.12.0-rc4-2016-07-15-9343-gb7b6b6929", - "Rev": "b7b6b6929c6436145bd12e6fef7efb7d01fa170b" - }, - { - "ImportPath": "github.com/docker/docker/api/types/time", - "Comment": "docs-v1.12.0-rc4-2016-07-15-9343-gb7b6b6929", - "Rev": "b7b6b6929c6436145bd12e6fef7efb7d01fa170b" - }, - { - "ImportPath": "github.com/docker/docker/api/types/versions", - "Comment": "docs-v1.12.0-rc4-2016-07-15-9343-gb7b6b6929", - "Rev": "b7b6b6929c6436145bd12e6fef7efb7d01fa170b" - }, - { - "ImportPath": "github.com/docker/docker/api/types/volume", - "Comment": "docs-v1.12.0-rc4-2016-07-15-9343-gb7b6b6929", - "Rev": "b7b6b6929c6436145bd12e6fef7efb7d01fa170b" - }, - { - "ImportPath": "github.com/docker/docker/client", - "Comment": "docs-v1.12.0-rc4-2016-07-15-9343-gb7b6b6929", - "Rev": "b7b6b6929c6436145bd12e6fef7efb7d01fa170b" - }, - { - "ImportPath": "github.com/docker/go-connections/nat", - "Comment": "v0.3.0-13-g7395e3f", - "Rev": "7395e3f8aa162843a74ed6d48e79627d9792ac55" - }, - { - "ImportPath": "github.com/docker/go-connections/sockets", - "Comment": "v0.3.0-13-g7395e3f", - "Rev": "7395e3f8aa162843a74ed6d48e79627d9792ac55" - }, - { - "ImportPath": "github.com/docker/go-connections/tlsconfig", - "Comment": "v0.3.0-13-g7395e3f", - "Rev": "7395e3f8aa162843a74ed6d48e79627d9792ac55" - }, - { - "ImportPath": "github.com/docker/go-units", - "Comment": "v0.3.2-4-g47565b4", - "Rev": "47565b4f722fb6ceae66b95f853feed578a4a51c" - }, - { - "ImportPath": "github.com/emicklei/go-restful", - "Comment": "v2.6.1", - "Rev": "92cd0815dd1a028a6e69faee9757c7436238e252" - }, - { - "ImportPath": "github.com/emicklei/go-restful/log", - "Comment": "v2.6.1", - "Rev": "92cd0815dd1a028a6e69faee9757c7436238e252" - }, - { - "ImportPath": "github.com/gogo/protobuf/proto", - "Comment": "v1.0.0-16-g30cf7ac3", - "Rev": "30cf7ac33676b5786e78c746683f0d4cd64fa75b" - }, - { - "ImportPath": "github.com/golang/glog", - "Rev": "23def4e6c14b4da8ac2ed8007337bc5eb5007998" - }, - { - "ImportPath": "github.com/opencontainers/go-digest", - "Comment": "v1.0.0-rc1-2-gc928146", - "Rev": "c9281466c8b2f606084ac71339773efd177436e7" - }, - { - "ImportPath": "github.com/opencontainers/image-spec/specs-go", - "Comment": "v1.0.0-35-ge562b04", - "Rev": "e562b04403929d582d449ae5386ff79dd7961a11" - }, - { - "ImportPath": "github.com/opencontainers/image-spec/specs-go/v1", - "Comment": "v1.0.0-35-ge562b04", - "Rev": "e562b04403929d582d449ae5386ff79dd7961a11" - }, - { - "ImportPath": "github.com/pkg/errors", - "Comment": "v0.8.0-12-g816c908", - "Rev": "816c9085562cd7ee03e7f8188a1cfd942858cded" - }, - { - "ImportPath": "github.com/spf13/pflag", - "Comment": "v1.0.1", - "Rev": "583c0c0531f06d5278b7d917446061adc344b5cd" - }, - { - "ImportPath": "golang.org/x/net/context", - "Rev": "6078986fec03a1dcc236c34816c71b0e05018fda" - }, - { - "ImportPath": "golang.org/x/net/context/ctxhttp", - "Rev": "6078986fec03a1dcc236c34816c71b0e05018fda" - }, - { - "ImportPath": "golang.org/x/net/proxy", - "Rev": "6078986fec03a1dcc236c34816c71b0e05018fda" - } - ] -} diff --git a/Godeps/Readme b/Godeps/Readme deleted file mode 100644 index 4cdaa53d5..000000000 --- a/Godeps/Readme +++ /dev/null @@ -1,5 +0,0 @@ -This directory tree is generated automatically by godep. - -Please do not edit. - -See https://github.com/tools/godep for more information. diff --git a/cmd/kubesphere.go b/cmd/kubesphere.go index 214f70c1a..97f533afa 100644 --- a/cmd/kubesphere.go +++ b/cmd/kubesphere.go @@ -18,6 +18,7 @@ package main import ( "github.com/spf13/pflag" + "kubesphere.io/kubesphere/pkg/app" "kubesphere.io/kubesphere/pkg/logs" "kubesphere.io/kubesphere/pkg/options" diff --git a/pkg/apis/v1alpha/components/components_handler.go b/pkg/apis/v1alpha/components/components_handler.go index 6335abffe..f165be3ad 100644 --- a/pkg/apis/v1alpha/components/components_handler.go +++ b/pkg/apis/v1alpha/components/components_handler.go @@ -17,11 +17,13 @@ limitations under the License. package components import ( + "net/http" + "github.com/emicklei/go-restful" + + "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/filter/route" "kubesphere.io/kubesphere/pkg/models" - "net/http" - "kubesphere.io/kubesphere/pkg/constants" ) func Register(ws *restful.WebService, subPath string) { diff --git a/pkg/apis/v1alpha/iam/iam_handler.go b/pkg/apis/v1alpha/iam/iam_handler.go index 6063fe159..a43f4cef0 100644 --- a/pkg/apis/v1alpha/iam/iam_handler.go +++ b/pkg/apis/v1alpha/iam/iam_handler.go @@ -13,19 +13,21 @@ See the License for the specific language governing permissions and limitations under the License. - */ +*/ package iam import ( - "github.com/emicklei/go-restful" - "kubesphere.io/kubesphere/pkg/filter/route" - "kubesphere.io/kubesphere/pkg/models" "net/http" "strings" - "kubesphere.io/kubesphere/pkg/constants" + + "github.com/emicklei/go-restful" "k8s.io/api/rbac/v1" "k8s.io/kubernetes/pkg/util/slice" + + "kubesphere.io/kubesphere/pkg/constants" + "kubesphere.io/kubesphere/pkg/filter/route" + "kubesphere.io/kubesphere/pkg/models" ) func Register(ws *restful.WebService) { diff --git a/pkg/apis/v1alpha/iam/policy.go b/pkg/apis/v1alpha/iam/policy.go index 161130b53..91c782ba0 100644 --- a/pkg/apis/v1alpha/iam/policy.go +++ b/pkg/apis/v1alpha/iam/policy.go @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. - */ +*/ package iam diff --git a/pkg/apis/v1alpha/iam/tools.go b/pkg/apis/v1alpha/iam/tools.go index 630059fb8..9e4f33bf9 100644 --- a/pkg/apis/v1alpha/iam/tools.go +++ b/pkg/apis/v1alpha/iam/tools.go @@ -13,13 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. - */ +*/ package iam import ( "k8s.io/api/rbac/v1" "k8s.io/kubernetes/pkg/util/slice" + "kubesphere.io/kubesphere/pkg/models" ) @@ -121,7 +122,7 @@ func getClusterRoleRules(name string) ([]rule, error) { rules := make([]rule, 0) - for i := 0; i < len(clusterRoleRuleGroup); i ++ { + for i := 0; i < len(clusterRoleRuleGroup); i++ { rule := rule{Name: clusterRoleRuleGroup[i].Name} rule.Actions = make([]action, 0) for j := 0; j < (len(clusterRoleRuleGroup[i].Actions)); j++ { @@ -143,7 +144,7 @@ func getRoleRules(namespace string, name string) ([]rule, error) { return nil, err } rules := make([]rule, 0) - for i := 0; i < len(roleRuleGroup); i ++ { + for i := 0; i < len(roleRuleGroup); i++ { rule := rule{Name: roleRuleGroup[i].Name} rule.Actions = make([]action, 0) for j := 0; j < len(roleRuleGroup[i].Actions); j++ { diff --git a/pkg/apis/v1alpha/install.go b/pkg/apis/v1alpha/install.go index 0a55ffe80..f4f3e9c07 100644 --- a/pkg/apis/v1alpha/install.go +++ b/pkg/apis/v1alpha/install.go @@ -18,17 +18,18 @@ package v1alpha import ( "github.com/emicklei/go-restful" + + "kubesphere.io/kubesphere/pkg/apis/v1alpha/components" "kubesphere.io/kubesphere/pkg/apis/v1alpha/containers" + "kubesphere.io/kubesphere/pkg/apis/v1alpha/iam" "kubesphere.io/kubesphere/pkg/apis/v1alpha/kubeconfig" "kubesphere.io/kubesphere/pkg/apis/v1alpha/kubectl" "kubesphere.io/kubesphere/pkg/apis/v1alpha/nodes" "kubesphere.io/kubesphere/pkg/apis/v1alpha/pods" "kubesphere.io/kubesphere/pkg/apis/v1alpha/registries" + "kubesphere.io/kubesphere/pkg/apis/v1alpha/routes" "kubesphere.io/kubesphere/pkg/apis/v1alpha/storage" "kubesphere.io/kubesphere/pkg/apis/v1alpha/volumes" - "kubesphere.io/kubesphere/pkg/apis/v1alpha/iam" - "kubesphere.io/kubesphere/pkg/apis/v1alpha/components" - "kubesphere.io/kubesphere/pkg/apis/v1alpha/routes" ) func init() { @@ -45,7 +46,7 @@ func init() { pods.Register(ws) containers.Register(ws) iam.Register(ws) - components.Register(ws,"/components") + components.Register(ws, "/components") routes.Register(ws) diff --git a/pkg/apis/v1alpha/kubeconfig/kubeconfig.go b/pkg/apis/v1alpha/kubeconfig/kubeconfig.go index 61b9666bf..98587ab65 100644 --- a/pkg/apis/v1alpha/kubeconfig/kubeconfig.go +++ b/pkg/apis/v1alpha/kubeconfig/kubeconfig.go @@ -15,8 +15,10 @@ package kubeconfig import ( - "github.com/emicklei/go-restful" "net/http" + + "github.com/emicklei/go-restful" + "kubesphere.io/kubesphere/pkg/models" ) @@ -24,12 +26,11 @@ const DefaultServiceAccount = "default" type Config struct { Certificate string - Server string - User string - Token string + Server string + User string + Token string } - func Register(ws *restful.WebService, subPath string) { ws.Route(ws.GET(subPath).To(handleKubeconfig)) diff --git a/pkg/apis/v1alpha/kubectl/kubectl.go b/pkg/apis/v1alpha/kubectl/kubectl.go index 5cbde4d61..b8a77caa0 100644 --- a/pkg/apis/v1alpha/kubectl/kubectl.go +++ b/pkg/apis/v1alpha/kubectl/kubectl.go @@ -17,16 +17,18 @@ limitations under the License. package kubectl import ( - "github.com/emicklei/go-restful" - "kubesphere.io/kubesphere/pkg/models" "net/http" + + "github.com/emicklei/go-restful" + + "kubesphere.io/kubesphere/pkg/models" ) func Register(ws *restful.WebService, subPath string) { - ws.Route(ws.GET(subPath).Consumes("*/*").Produces(restful.MIME_JSON).To(handleKubectl).Doc("use to " + + ws.Route(ws.GET(subPath).Consumes("*/*").Produces(restful.MIME_JSON).To(handleKubectl).Doc("use to "+ "get a kubectl pod in specified namespaces").Param(ws.PathParameter("namespace", - "namespace").DataType("string")).Do(returns200,returns500)) + "namespace").DataType("string")).Do(returns200, returns500)) } diff --git a/pkg/apis/v1alpha/registries/registries_handler.go b/pkg/apis/v1alpha/registries/registries_handler.go index 7a2ff1922..c74a2db7d 100644 --- a/pkg/apis/v1alpha/registries/registries_handler.go +++ b/pkg/apis/v1alpha/registries/registries_handler.go @@ -103,4 +103,4 @@ func handleQueryRegistries(request *restful.Request, response *restful.Response) } -} \ No newline at end of file +} diff --git a/pkg/apis/v1alpha/routes/routes_handler.go b/pkg/apis/v1alpha/routes/routes_handler.go index 66f2ace25..04c711565 100644 --- a/pkg/apis/v1alpha/routes/routes_handler.go +++ b/pkg/apis/v1alpha/routes/routes_handler.go @@ -72,7 +72,7 @@ func GetAllRouters(request *restful.Request, response *restful.Response) { if err != nil { glog.Error(err) response.WriteHeaderAndEntity(http.StatusInternalServerError, constants.MessageResponse{Message: err.Error()}) - } else { + } else { response.WriteAsJson(routers) } } diff --git a/pkg/apis/v1alpha/storage/storage_handler.go b/pkg/apis/v1alpha/storage/storage_handler.go index fa4a70e50..fd9c7170e 100644 --- a/pkg/apis/v1alpha/storage/storage_handler.go +++ b/pkg/apis/v1alpha/storage/storage_handler.go @@ -1,10 +1,12 @@ package storage import ( + "net/http" + "github.com/emicklei/go-restful" + "kubesphere.io/kubesphere/pkg/filter/route" "kubesphere.io/kubesphere/pkg/models" - "net/http" ) func Register(ws *restful.WebService, subPath string) { diff --git a/pkg/apis/v1alpha/volumes/volumes_handler.go b/pkg/apis/v1alpha/volumes/volumes_handler.go index ff41a22bb..57ba71495 100644 --- a/pkg/apis/v1alpha/volumes/volumes_handler.go +++ b/pkg/apis/v1alpha/volumes/volumes_handler.go @@ -1,10 +1,12 @@ package volumes import ( + "net/http" + "github.com/emicklei/go-restful" + "kubesphere.io/kubesphere/pkg/filter/route" "kubesphere.io/kubesphere/pkg/models" - "net/http" ) func Register(ws *restful.WebService, subPath string) { diff --git a/pkg/app/app.go b/pkg/app/app.go index b9a683032..d04642ea4 100644 --- a/pkg/app/app.go +++ b/pkg/app/app.go @@ -19,12 +19,14 @@ package app import ( "crypto/tls" "fmt" - "github.com/emicklei/go-restful" - "github.com/golang/glog" - _ "kubesphere.io/kubesphere/pkg/apis/v1alpha" - "kubesphere.io/kubesphere/pkg/options" "net" "net/http" + + "github.com/emicklei/go-restful" + "github.com/golang/glog" + + _ "kubesphere.io/kubesphere/pkg/apis/v1alpha" + "kubesphere.io/kubesphere/pkg/options" ) type kubeSphereServer struct { diff --git a/pkg/client/k8sclient.go b/pkg/client/k8sclient.go index e8b1400ef..b5f31b256 100644 --- a/pkg/client/k8sclient.go +++ b/pkg/client/k8sclient.go @@ -16,13 +16,13 @@ limitations under the License. package client - import ( - "kubesphere.io/kubesphere/pkg/options" + "github.com/golang/glog" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - "github.com/golang/glog" + + "kubesphere.io/kubesphere/pkg/options" ) var k8sClient *kubernetes.Clientset @@ -41,7 +41,7 @@ func getKubeConfig() (kubeConfig *rest.Config, err error) { } else { kubeConfig, err = rest.InClusterConfig() - if err != nil{ + if err != nil { return nil, err } } @@ -62,7 +62,7 @@ func NewK8sClient() *kubernetes.Clientset { } k8sClient, err = kubernetes.NewForConfig(kubeConfig) - if err != nil{ + if err != nil { glog.Error(err) panic(err) } diff --git a/pkg/constants/common.go b/pkg/constants/common.go index 745894c5a..71d572379 100644 --- a/pkg/constants/common.go +++ b/pkg/constants/common.go @@ -25,6 +25,6 @@ type PageableResponse struct { TotalCount int `json:"total_count"` } -const APIVERSION = "v1alpha1" +const APIVERSION = "v1alpha1" -const KIND = "kubesphere" +const KIND = "kubesphere" diff --git a/pkg/filter/container/logFilter.go b/pkg/filter/container/logFilter.go index 7debb0631..76b7a105d 100644 --- a/pkg/filter/container/logFilter.go +++ b/pkg/filter/container/logFilter.go @@ -17,9 +17,10 @@ limitations under the License. package container import ( + "strings" + "github.com/emicklei/go-restful" "github.com/golang/glog" - "strings" ) func logFilter() restful.FilterFunction { diff --git a/pkg/filter/route/route_filter.go b/pkg/filter/route/route_filter.go index 4b8261d36..1da5af8b9 100644 --- a/pkg/filter/route/route_filter.go +++ b/pkg/filter/route/route_filter.go @@ -17,24 +17,25 @@ limitations under the License. package route import ( - "github.com/emicklei/go-restful" - "github.com/golang/glog" "strings" "time" + + "github.com/emicklei/go-restful" + "github.com/golang/glog" ) // Route Filter (defines FilterFunction) func RouteLogging(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) { - start := time.Now() - chain.ProcessFilter(req, resp) - glog.Infof("%s - \"%s %s %s\" %d %dms", - strings.Split(req.Request.RemoteAddr, ":")[0], - req.Request.Method, - req.Request.URL.RequestURI(), - req.Request.Proto, - resp.StatusCode(), - time.Now().Sub(start)/1000000, - ) + start := time.Now() + chain.ProcessFilter(req, resp) + glog.Infof("%s - \"%s %s %s\" %d %dms", + strings.Split(req.Request.RemoteAddr, ":")[0], + req.Request.Method, + req.Request.URL.RequestURI(), + req.Request.Proto, + resp.StatusCode(), + time.Now().Sub(start)/1000000, + ) -} \ No newline at end of file +} diff --git a/pkg/models/components.go b/pkg/models/components.go index 8955eb530..232807af2 100644 --- a/pkg/models/components.go +++ b/pkg/models/components.go @@ -294,4 +294,4 @@ func GetComponents() (result []Components, err error) { return result, nil -} \ No newline at end of file +} diff --git a/pkg/models/kubeconfig.go b/pkg/models/kubeconfig.go index b34dba375..5c17137f5 100644 --- a/pkg/models/kubeconfig.go +++ b/pkg/models/kubeconfig.go @@ -18,16 +18,17 @@ package models import ( "bytes" - "github.com/golang/glog" - "text/template" "encoding/base64" + "text/template" + + "github.com/golang/glog" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "kubesphere.io/kubesphere/pkg/client" "kubesphere.io/kubesphere/pkg/options" ) -var kubeconfigTemp = - "apiVersion: v1\n" + +var kubeconfigTemp = "apiVersion: v1\n" + "clusters:\n" + "- cluster:\n" + " certificate-authority-data: {{.Certificate}}\n" + @@ -51,9 +52,9 @@ const DefaultServiceAccount = "default" type Config struct { Certificate string - Server string - User string - Token string + Server string + User string + Token string } func GetKubeConfig(namespace string) (string, error) { @@ -77,24 +78,24 @@ func GetKubeConfig(namespace string) (string, error) { func getKubeConfig(namespace, apiserverHost string) (*Config, error) { k8sClient := client.NewK8sClient() saInfo, err := k8sClient.CoreV1().ServiceAccounts(namespace).Get(DefaultServiceAccount, meta_v1.GetOptions{}) - if err != nil{ + if err != nil { glog.Errorln(err) return nil, err } secretName := saInfo.Secrets[0].Name secretInfo, err := k8sClient.CoreV1().Secrets(namespace).Get(secretName, meta_v1.GetOptions{}) - if err != nil{ + if err != nil { glog.Errorln(err) return nil, err } secretData := secretInfo.Data certificate := string(secretData["ca.crt"]) - certificate= base64.StdEncoding.EncodeToString([]byte(certificate)) + certificate = base64.StdEncoding.EncodeToString([]byte(certificate)) server := apiserverHost token := string(secretData["token"]) user := string(secretData["namespace"]) - return &Config{Certificate:certificate, Server:server, Token:token, User:user}, nil + return &Config{Certificate: certificate, Server: server, Token: token, User: user}, nil } diff --git a/pkg/models/kubectl.go b/pkg/models/kubectl.go index b44d8d235..d42c445d2 100644 --- a/pkg/models/kubectl.go +++ b/pkg/models/kubectl.go @@ -19,13 +19,14 @@ package models import ( "fmt" "math/rand" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/labels" - "kubesphere.io/kubesphere/pkg/client" + "github.com/golang/glog" "k8s.io/api/core/v1" -) + meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/labels" + "kubesphere.io/kubesphere/pkg/client" +) const ( deploymentName = "kubectl" @@ -33,7 +34,7 @@ const ( type kubectlPodInfo struct { Namespace string `json: "namespace"` - Pod string `json: "podname"` + Pod string `json: "podname"` Container string `json: "container"` } @@ -47,36 +48,35 @@ func GetKubectlPod(namespace string) (kubectlPodInfo, error) { selectors := deploy.Spec.Selector.MatchLabels labelSelector := labels.Set(selectors).AsSelector().String() - podList, err := k8sClient.CoreV1().Pods(namespace).List(meta_v1.ListOptions{LabelSelector:labelSelector}) + podList, err := k8sClient.CoreV1().Pods(namespace).List(meta_v1.ListOptions{LabelSelector: labelSelector}) if err != nil { glog.Errorln(err) return kubectlPodInfo{}, err } pod, err := selectCorrectPod(namespace, podList.Items) - if err != nil{ + if err != nil { glog.Errorln(err) return kubectlPodInfo{}, err } - info := kubectlPodInfo{Namespace:pod.Namespace, Pod:pod.Name, Container:pod.Status.ContainerStatuses[0].Name} + info := kubectlPodInfo{Namespace: pod.Namespace, Pod: pod.Name, Container: pod.Status.ContainerStatuses[0].Name} return info, nil } - func selectCorrectPod(namespace string, pods []v1.Pod) (kubectlPod v1.Pod, err error) { var kubectPodList []v1.Pod - for _, pod := range pods{ - for _, condition := range pod.Status.Conditions{ - if condition.Type == "Ready" && condition.Status == "True"{ + for _, pod := range pods { + for _, condition := range pod.Status.Conditions { + if condition.Type == "Ready" && condition.Status == "True" { kubectPodList = append(kubectPodList, pod) } } } - if len(kubectPodList) < 1{ + if len(kubectPodList) < 1 { err = fmt.Errorf("cannot find valid kubectl pod in namespace:%s", namespace) return v1.Pod{}, err } diff --git a/pkg/models/nodes.go b/pkg/models/nodes.go index 9a0a28d04..d89c3b825 100644 --- a/pkg/models/nodes.go +++ b/pkg/models/nodes.go @@ -25,6 +25,7 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "kubesphere.io/kubesphere/pkg/client" ksutil "kubesphere.io/kubesphere/pkg/util" diff --git a/pkg/models/pods.go b/pkg/models/pods.go index f9e143ef9..69955e738 100644 --- a/pkg/models/pods.go +++ b/pkg/models/pods.go @@ -14,9 +14,11 @@ import ( "fmt" "strconv" - "k8s.io/apimachinery/pkg/apis/meta/v1" - "kubesphere.io/kubesphere/pkg/constants" "math" + + "k8s.io/apimachinery/pkg/apis/meta/v1" + + "kubesphere.io/kubesphere/pkg/constants" ) type ResultPod struct { diff --git a/pkg/models/registries.go b/pkg/models/registries.go index 11f691ea6..c59dc9a99 100644 --- a/pkg/models/registries.go +++ b/pkg/models/registries.go @@ -237,4 +237,4 @@ func QueryRegistries(project string) (regList []Registries, err error) { return regList, nil -} \ No newline at end of file +} diff --git a/pkg/models/roles.go b/pkg/models/roles.go index a52af2504..96ec3052b 100644 --- a/pkg/models/roles.go +++ b/pkg/models/roles.go @@ -2,8 +2,9 @@ package models import ( "k8s.io/api/rbac/v1" - "kubesphere.io/kubesphere/pkg/client" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + "kubesphere.io/kubesphere/pkg/client" ) const ClusterRoleKind = "ClusterRole" diff --git a/pkg/models/routes.go b/pkg/models/routes.go index 1718a3897..66e92c804 100644 --- a/pkg/models/routes.go +++ b/pkg/models/routes.go @@ -17,15 +17,15 @@ limitations under the License. package models import ( - "strings" "io/ioutil" + "strings" + "github.com/golang/glog" coreV1 "k8s.io/api/core/v1" - metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/kubernetes/scheme" extensionsV1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/api/rbac/v1beta1" - "github.com/golang/glog" + metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/kubernetes/scheme" "kubesphere.io/kubesphere/pkg/client" ) @@ -37,7 +37,7 @@ type Router struct { Annotations string `json:"annotations"` } -func GetAllRouters() ([] *coreV1.Service, error) { +func GetAllRouters() ([]*coreV1.Service, error) { k8sClient := client.NewK8sClient() diff --git a/pkg/models/storage.go b/pkg/models/storage.go index 10afddc91..53a7a6a90 100644 --- a/pkg/models/storage.go +++ b/pkg/models/storage.go @@ -4,6 +4,7 @@ import ( v12 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/apis/meta/v1" + "kubesphere.io/kubesphere/pkg/client" ) diff --git a/pkg/models/volumes.go b/pkg/models/volumes.go index 07a150901..3d6aa4d74 100644 --- a/pkg/models/volumes.go +++ b/pkg/models/volumes.go @@ -3,6 +3,7 @@ package models import ( v12 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1" + "kubesphere.io/kubesphere/pkg/client" ) diff --git a/pkg/options/options.go b/pkg/options/options.go index 257b69a50..3f1861dfa 100644 --- a/pkg/options/options.go +++ b/pkg/options/options.go @@ -19,8 +19,9 @@ package options import ( goflag "flag" - "github.com/spf13/pflag" "net" + + "github.com/spf13/pflag" ) // ServerRunOptions runs a kubernetes api server. diff --git a/pkg/util/util.go b/pkg/util/util.go index 7515bd5c3..f21192474 100644 --- a/pkg/util/util.go +++ b/pkg/util/util.go @@ -18,8 +18,9 @@ package util import ( "encoding/json" - "github.com/golang/glog" "strings" + + "github.com/golang/glog" ) type JsonRawMessage []byte diff --git a/pkg/version/version.go b/pkg/version/version.go index 8cad80421..f2d9db125 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -18,8 +18,10 @@ package version import ( "fmt" - "github.com/spf13/pflag" "os" + + "github.com/spf13/pflag" + "kubesphere.io/kubesphere/pkg/constants" )