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

Merge branch 'master' into crd-gen

Browse Source 
Signed-off-by: runzexia <runzexia@yunify.com>

# Conflicts:
#	go.mod
#	go.sum
This commit is contained in:
runzexia
2019-07-31 11:31:41 +08:00
parent de7fc0819f d713cb316a
commit 34ddd34944
221 changed files with 16630 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
vendor/modules.txt vendored
View File

@@ -356,7 +356,6 @@ github.com/naoina/toml/ast
# github.com/onsi/ginkgo v1.8.0
github.com/onsi/ginkgo
github.com/onsi/ginkgo/config
github.com/onsi/ginkgo/types
github.com/onsi/ginkgo/internal/codelocation
github.com/onsi/ginkgo/internal/failer
github.com/onsi/ginkgo/internal/remote
@@ -366,6 +365,7 @@ github.com/onsi/ginkgo/internal/writer
github.com/onsi/ginkgo/reporters
github.com/onsi/ginkgo/reporters/stenographer
github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable
github.com/onsi/ginkgo/types
github.com/onsi/ginkgo/internal/spec_iterator
github.com/onsi/ginkgo/internal/containernode
github.com/onsi/ginkgo/internal/leafnodes
@@ -374,13 +374,15 @@ github.com/onsi/ginkgo/internal/specrunner
github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty
# github.com/onsi/gomega v1.5.0
github.com/onsi/gomega
github.com/onsi/gomega/gstruct
github.com/onsi/gomega/internal/assertion
github.com/onsi/gomega/internal/asyncassertion
github.com/onsi/gomega/internal/testingtsupport
github.com/onsi/gomega/matchers
github.com/onsi/gomega/types
github.com/onsi/gomega/internal/oraclematcher
github.com/onsi/gomega/format
github.com/onsi/gomega/gstruct/errors
github.com/onsi/gomega/internal/oraclematcher
github.com/onsi/gomega/matchers/support/goraph/bipartitegraph
github.com/onsi/gomega/matchers/support/goraph/edge
github.com/onsi/gomega/matchers/support/goraph/node
@@ -653,6 +655,7 @@ gopkg.in/warnings.v0
gopkg.in/yaml.v2
# k8s.io/api v0.0.0-20181213150558-05914d821849
k8s.io/api/rbac/v1
k8s.io/api/networking/v1
k8s.io/api/apps/v1
k8s.io/api/core/v1
k8s.io/api/batch/v1
@@ -672,7 +675,6 @@ k8s.io/api/batch/v2alpha1
k8s.io/api/certificates/v1beta1
k8s.io/api/coordination/v1beta1
k8s.io/api/events/v1beta1
k8s.io/api/networking/v1
k8s.io/api/rbac/v1alpha1
k8s.io/api/rbac/v1beta1
k8s.io/api/scheduling/v1alpha1
@@ -706,10 +708,11 @@ k8s.io/apimachinery/pkg/util/net
k8s.io/apimachinery/pkg/runtime/serializer
k8s.io/apimachinery/pkg/watch
k8s.io/apimachinery/pkg/types
k8s.io/apimachinery/pkg/util/yaml
k8s.io/apimachinery/pkg/util/errors
k8s.io/apimachinery/pkg/fields
k8s.io/apimachinery/pkg/api/meta
k8s.io/apimachinery/pkg/apis/meta/internalversion
k8s.io/apimachinery/pkg/util/errors
k8s.io/apimachinery/pkg/util/validation
k8s.io/apimachinery/pkg/runtime/serializer/streaming
k8s.io/apimachinery/pkg/api/validation/path
@@ -736,7 +739,6 @@ k8s.io/apimachinery/pkg/api/validation
k8s.io/apimachinery/pkg/apis/meta/v1/validation
k8s.io/apimachinery/pkg/util/uuid
k8s.io/apimachinery/pkg/util/waitgroup
k8s.io/apimachinery/pkg/util/yaml
k8s.io/apimachinery/third_party/forked/golang/reflect
k8s.io/apimachinery/pkg/util/framer
k8s.io/apimachinery/pkg/util/mergepatch
@@ -863,6 +865,10 @@ k8s.io/client-go/tools/record
k8s.io/client-go/util/workqueue
k8s.io/client-go/informers/batch/v1
k8s.io/client-go/listers/batch/v1
k8s.io/client-go/kubernetes/fake
k8s.io/client-go/informers/networking/v1
k8s.io/client-go/listers/networking/v1
k8s.io/client-go/util/retry
k8s.io/client-go/tools/remotecommand
k8s.io/client-go/tools/auth
k8s.io/client-go/tools/clientcmd/api
@@ -927,9 +933,40 @@ k8s.io/client-go/util/cert
k8s.io/client-go/util/integer
k8s.io/client-go/tools/pager
k8s.io/client-go/util/buffer
k8s.io/client-go/util/retry
k8s.io/client-go/tools/reference
k8s.io/client-go/dynamic
k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake
k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/fake
k8s.io/client-go/kubernetes/typed/apps/v1/fake
k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake
k8s.io/client-go/kubernetes/typed/apps/v1beta2/fake
k8s.io/client-go/kubernetes/typed/auditregistration/v1alpha1/fake
k8s.io/client-go/kubernetes/typed/authentication/v1/fake
k8s.io/client-go/kubernetes/typed/authentication/v1beta1/fake
k8s.io/client-go/kubernetes/typed/authorization/v1/fake
k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake
k8s.io/client-go/kubernetes/typed/autoscaling/v1/fake
k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/fake
k8s.io/client-go/kubernetes/typed/autoscaling/v2beta2/fake
k8s.io/client-go/kubernetes/typed/batch/v1/fake
k8s.io/client-go/kubernetes/typed/batch/v1beta1/fake
k8s.io/client-go/kubernetes/typed/batch/v2alpha1/fake
k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake
k8s.io/client-go/kubernetes/typed/coordination/v1beta1/fake
k8s.io/client-go/kubernetes/typed/core/v1/fake
k8s.io/client-go/kubernetes/typed/events/v1beta1/fake
k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake
k8s.io/client-go/kubernetes/typed/networking/v1/fake
k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake
k8s.io/client-go/kubernetes/typed/rbac/v1/fake
k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake
k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake
k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1/fake
k8s.io/client-go/kubernetes/typed/scheduling/v1beta1/fake
k8s.io/client-go/kubernetes/typed/settings/v1alpha1/fake
k8s.io/client-go/kubernetes/typed/storage/v1/fake
k8s.io/client-go/kubernetes/typed/storage/v1alpha1/fake
k8s.io/client-go/kubernetes/typed/storage/v1beta1/fake
k8s.io/client-go/transport/spdy
k8s.io/client-go/util/exec
k8s.io/client-go/tools/clientcmd/api/v1
@@ -948,7 +985,6 @@ k8s.io/client-go/informers/certificates/v1beta1
k8s.io/client-go/informers/coordination/v1beta1
k8s.io/client-go/informers/events/v1beta1
k8s.io/client-go/informers/extensions/v1beta1
k8s.io/client-go/informers/networking/v1
k8s.io/client-go/informers/policy/v1beta1
k8s.io/client-go/informers/rbac/v1
k8s.io/client-go/informers/rbac/v1alpha1
@@ -977,7 +1013,6 @@ k8s.io/client-go/listers/certificates/v1beta1
k8s.io/client-go/listers/coordination/v1beta1
k8s.io/client-go/listers/events/v1beta1
k8s.io/client-go/listers/extensions/v1beta1
k8s.io/client-go/listers/networking/v1
k8s.io/client-go/listers/policy/v1beta1
k8s.io/client-go/listers/rbac/v1
k8s.io/client-go/listers/rbac/v1alpha1
@@ -997,6 +1032,7 @@ k8s.io/gengo/types
k8s.io/gengo/parser
# k8s.io/klog v0.3.0
k8s.io/klog
k8s.io/klog/klogr
# k8s.io/kube-openapi v0.0.0-20181109181836-c59034cc13d5
k8s.io/kube-openapi/pkg/common
k8s.io/kube-openapi/cmd/openapi-gen/