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

format code

Browse Source
This commit is contained in:
jeff
2018-06-05 20:52:50 +08:00
parent 41a64c4017
commit 85d35e42ea
32 changed files with 119 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

181
Godeps/Godeps.json generated
View File

@@ -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"
}
]
}

5
Godeps/Readme generated
View File

@@ -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.

1
cmd/kubesphere.go
View File

@@ -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"

6
pkg/apis/v1alpha/components/components_handler.go
View File

@@ -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) {

10
pkg/apis/v1alpha/iam/iam_handler.go
View File

@@ -18,14 +18,16 @@
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) {

1
pkg/apis/v1alpha/iam/tools.go
View File

@@ -20,6 +20,7 @@ package iam
import (
"k8s.io/api/rbac/v1"
"k8s.io/kubernetes/pkg/util/slice"
"kubesphere.io/kubesphere/pkg/models"
)

7
pkg/apis/v1alpha/install.go
View File

@@ -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() {

5
pkg/apis/v1alpha/kubeconfig/kubeconfig.go
View File

@@ -15,8 +15,10 @@
package kubeconfig
import (
"github.com/emicklei/go-restful"
"net/http"
"github.com/emicklei/go-restful"
"kubesphere.io/kubesphere/pkg/models"
)
@@ -29,7 +31,6 @@ type Config struct {
Token string
}
func Register(ws *restful.WebService, subPath string) {
ws.Route(ws.GET(subPath).To(handleKubeconfig))

6
pkg/apis/v1alpha/kubectl/kubectl.go
View File

@@ -17,9 +17,11 @@ 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) {

4
pkg/apis/v1alpha/storage/storage_handler.go
View File

@@ -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) {

4
pkg/apis/v1alpha/volumes/volumes_handler.go
View File

@@ -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) {

10
pkg/app/app.go
View File

@@ -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 {

6
pkg/client/k8sclient.go
View File

@@ -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

3
pkg/filter/container/logFilter.go
View File

@@ -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 {

5
pkg/filter/route/route_filter.go
View File

@@ -17,10 +17,11 @@ 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)

9
pkg/models/kubeconfig.go
View File

@@ -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" +

10
pkg/models/kubectl.go
View File

@@ -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"
@@ -65,7 +66,6 @@ func GetKubectlPod(namespace string) (kubectlPodInfo, error) {
}
func selectCorrectPod(namespace string, pods []v1.Pod) (kubectlPod v1.Pod, err error) {
var kubectPodList []v1.Pod

1
pkg/models/nodes.go
View File

@@ -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"

6
pkg/models/pods.go
View File

@@ -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 {

3
pkg/models/roles.go
View File

@@ -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"

8
pkg/models/routes.go
View File

@@ -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"
)

1
pkg/models/storage.go
View File

@@ -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"
)

1
pkg/models/volumes.go
View File

@@ -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"
)

3
pkg/options/options.go
View File

@@ -19,8 +19,9 @@ package options
import (
goflag "flag"
"github.com/spf13/pflag"
"net"
"github.com/spf13/pflag"
)
// ServerRunOptions runs a kubernetes api server.

3
pkg/util/util.go
View File

@@ -18,8 +18,9 @@ package util
import (
"encoding/json"
"github.com/golang/glog"
"strings"
"github.com/golang/glog"
)
type JsonRawMessage []byte

4
pkg/version/version.go
View File

@@ -18,8 +18,10 @@ package version
import (
"fmt"
"github.com/spf13/pflag"
"os"
"github.com/spf13/pflag"
"kubesphere.io/kubesphere/pkg/constants"
)