github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

move storage/storagebackend to apiserver

pull/6/head
deads2k 2017-01-26 14:42:01 -05:00
parent 9775269fb9
commit aea12038b4
41 changed files with 47 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-aggregator/pkg/cmd/server/BUILD
View File

@ -22,13 +22,13 @@ go_library(
"//pkg/genericapiserver/server:go_default_library",
"//pkg/genericapiserver/server/options:go_default_library",
"//pkg/kubectl/cmd/util:go_default_library",
"//pkg/storage/storagebackend:go_default_library",
"//vendor:github.com/pborman/uuid",
"//vendor:github.com/spf13/cobra",
"//vendor:k8s.io/apimachinery/pkg/runtime/schema",
"//vendor:k8s.io/apimachinery/pkg/util/sets",
"//vendor:k8s.io/apimachinery/pkg/util/wait",
"//vendor:k8s.io/apiserver/pkg/server/filters",
"//vendor:k8s.io/apiserver/pkg/storage/storagebackend",
"//vendor:k8s.io/client-go/rest",
],
)

2
cmd/kube-aggregator/pkg/cmd/server/start.go
View File

@ -28,6 +28,7 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apiserver/pkg/server/filters"
"k8s.io/apiserver/pkg/storage/storagebackend"
restclient "k8s.io/client-go/rest"
"k8s.io/kubernetes/cmd/kube-aggregator/pkg/apiserver"
"k8s.io/kubernetes/cmd/kube-aggregator/pkg/legacy"
@ -38,7 +39,6 @@ import (
genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server"
genericoptions "k8s.io/kubernetes/pkg/genericapiserver/server/options"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/storage/storagebackend"
"k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1"
)

2
examples/apiserver/BUILD
View File

@ -21,11 +21,11 @@ go_library(
"//pkg/genericapiserver/server:go_default_library",
"//pkg/genericapiserver/server/options:go_default_library",
"//pkg/kubeapiserver/options:go_default_library",
"//pkg/storage/storagebackend:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:k8s.io/apimachinery/pkg/runtime/schema",
"//vendor:k8s.io/apimachinery/pkg/util/errors",
"//vendor:k8s.io/apiserver/pkg/authorization/authorizerfactory",
"//vendor:k8s.io/apiserver/pkg/storage/storagebackend",
],
)

2
examples/apiserver/apiserver.go
View File

@ -22,6 +22,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
utilerrors "k8s.io/apimachinery/pkg/util/errors"
"k8s.io/apiserver/pkg/authorization/authorizerfactory"
"k8s.io/apiserver/pkg/storage/storagebackend"
"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1"
testgroupetcd "k8s.io/kubernetes/examples/apiserver/rest"
"k8s.io/kubernetes/pkg/api"
@ -30,7 +31,6 @@ import (
genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server"
genericoptions "k8s.io/kubernetes/pkg/genericapiserver/server/options"
kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options"
"k8s.io/kubernetes/pkg/storage/storagebackend"
// Install the testgroup API
_ "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup/install"

2
pkg/controller/serviceaccount/BUILD
View File

@ -30,7 +30,6 @@ go_library(
"//pkg/registry/core/serviceaccount:go_default_library",
"//pkg/registry/core/serviceaccount/storage:go_default_library",
"//pkg/serviceaccount:go_default_library",
"//pkg/storage/storagebackend:go_default_library",
"//pkg/util/metrics:go_default_library",
"//pkg/util/workqueue:go_default_library",
"//vendor:github.com/golang/glog",
@ -46,6 +45,7 @@ go_library(
"//vendor:k8s.io/apimachinery/pkg/util/wait",
"//vendor:k8s.io/apimachinery/pkg/watch",
"//vendor:k8s.io/apiserver/pkg/endpoints/request",
"//vendor:k8s.io/apiserver/pkg/storage/storagebackend",
"//vendor:k8s.io/client-go/tools/cache",
],
)

2
pkg/controller/serviceaccount/tokengetter.go
View File

@ -19,6 +19,7 @@ package serviceaccount
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/apiserver/pkg/storage/storagebackend"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/genericapiserver/registry/generic"
@ -27,7 +28,6 @@ import (
serviceaccountregistry "k8s.io/kubernetes/pkg/registry/core/serviceaccount"
serviceaccountstore "k8s.io/kubernetes/pkg/registry/core/serviceaccount/storage"
"k8s.io/kubernetes/pkg/serviceaccount"
"k8s.io/kubernetes/pkg/storage/storagebackend"
)
// clientGetter implements ServiceAccountTokenGetter using a clientset.Interface

2
pkg/genericapiserver/registry/generic/BUILD
View File

@ -18,13 +18,13 @@ go_library(
tags = ["automanaged"],
deps = [
"//pkg/storage:go_default_library",
"//pkg/storage/storagebackend:go_default_library",
"//pkg/storage/storagebackend/factory:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
"//vendor:k8s.io/apimachinery/pkg/fields",
"//vendor:k8s.io/apimachinery/pkg/runtime",
"//vendor:k8s.io/apimachinery/pkg/runtime/schema",
"//vendor:k8s.io/apiserver/pkg/storage/storagebackend",
],
)

2
pkg/genericapiserver/registry/generic/options.go
View File

@ -18,8 +18,8 @@ package generic
import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apiserver/pkg/storage/storagebackend"
"k8s.io/kubernetes/pkg/storage"
"k8s.io/kubernetes/pkg/storage/storagebackend"
)
// RESTOptions is set of configuration options to generic registries.

2
pkg/genericapiserver/registry/generic/registry/BUILD
View File

@ -25,7 +25,6 @@ go_library(
"//pkg/registry/cachesize:go_default_library",
"//pkg/storage:go_default_library",
"//pkg/storage/etcd:go_default_library",
"//pkg/storage/storagebackend:go_default_library",
"//pkg/storage/storagebackend/factory:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:golang.org/x/net/context",
@ -42,6 +41,7 @@ go_library(
"//vendor:k8s.io/apimachinery/pkg/util/validation/field",
"//vendor:k8s.io/apimachinery/pkg/watch",
"//vendor:k8s.io/apiserver/pkg/endpoints/request",
"//vendor:k8s.io/apiserver/pkg/storage/storagebackend",
],
)

2
pkg/genericapiserver/registry/generic/registry/storage_factory.go
View File

@ -18,10 +18,10 @@ package registry
import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apiserver/pkg/storage/storagebackend"
"k8s.io/kubernetes/pkg/genericapiserver/registry/generic"
"k8s.io/kubernetes/pkg/storage"
etcdstorage "k8s.io/kubernetes/pkg/storage/etcd"
"k8s.io/kubernetes/pkg/storage/storagebackend"
"k8s.io/kubernetes/pkg/storage/storagebackend/factory"
)

2
pkg/genericapiserver/registry/generic/storage_decorator.go
View File

@ -19,8 +19,8 @@ package generic
import (
"github.com/golang/glog"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apiserver/pkg/storage/storagebackend"
"k8s.io/kubernetes/pkg/storage"
"k8s.io/kubernetes/pkg/storage/storagebackend"
"k8s.io/kubernetes/pkg/storage/storagebackend/factory"
)

4
pkg/genericapiserver/server/BUILD
View File

@ -30,7 +30,6 @@ go_test(
"//pkg/genericapiserver/registry/rest:go_default_library",
"//pkg/genericapiserver/server/options:go_default_library",
"//pkg/storage/etcd/testing:go_default_library",
"//pkg/storage/storagebackend:go_default_library",
"//vendor:github.com/go-openapi/spec",
"//vendor:github.com/stretchr/testify/assert",
"//vendor:k8s.io/apimachinery/pkg/api/meta",
@ -44,6 +43,7 @@ go_test(
"//vendor:k8s.io/apiserver/pkg/authentication/user",
"//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
"//vendor:k8s.io/apiserver/pkg/endpoints/request",
"//vendor:k8s.io/apiserver/pkg/storage/storagebackend",
"//vendor:k8s.io/apiserver/pkg/util/flag",
"//vendor:k8s.io/client-go/util/cert",
],
@ -74,7 +74,6 @@ go_library(
"//pkg/genericapiserver/server/mux:go_default_library",
"//pkg/genericapiserver/server/options:go_default_library",
"//pkg/genericapiserver/server/routes:go_default_library",
"//pkg/storage/storagebackend:go_default_library",
"//vendor:github.com/coreos/go-systemd/daemon",
"//vendor:github.com/emicklei/go-restful",
"//vendor:github.com/emicklei/go-restful/swagger",
@ -105,6 +104,7 @@ go_library(
"//vendor:k8s.io/apiserver/pkg/endpoints/request",
"//vendor:k8s.io/apiserver/pkg/server/filters",
"//vendor:k8s.io/apiserver/pkg/server/healthz",
"//vendor:k8s.io/apiserver/pkg/storage/storagebackend",
"//vendor:k8s.io/client-go/rest",
"//vendor:k8s.io/client-go/util/cert",
],

2
pkg/genericapiserver/server/options/BUILD
View File

@ -20,7 +20,6 @@ go_library(
tags = ["automanaged"],
deps = [
"//pkg/api:go_default_library",
"//pkg/storage/storagebackend:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:github.com/spf13/pflag",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
@ -29,6 +28,7 @@ go_library(
"//vendor:k8s.io/apiserver/pkg/admission",
"//vendor:k8s.io/apiserver/pkg/authentication/authenticatorfactory",
"//vendor:k8s.io/apiserver/pkg/authorization/authorizerfactory",
"//vendor:k8s.io/apiserver/pkg/storage/storagebackend",
"//vendor:k8s.io/apiserver/pkg/util/feature",
"//vendor:k8s.io/apiserver/pkg/util/flag",
"//vendor:k8s.io/client-go/kubernetes/typed/authentication/v1beta1",

2
pkg/genericapiserver/server/options/etcd.go
View File

@ -21,7 +21,7 @@ import (
"github.com/spf13/pflag"
"k8s.io/kubernetes/pkg/storage/storagebackend"
"k8s.io/apiserver/pkg/storage/storagebackend"
)
const (

2
pkg/genericapiserver/server/storage_factory.go
View File

@ -25,7 +25,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/runtime/serializer/recognizer"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/kubernetes/pkg/storage/storagebackend"
"k8s.io/apiserver/pkg/storage/storagebackend"
"github.com/golang/glog"
)

2
pkg/genericapiserver/server/storage_factory_test.go
View File

@ -21,10 +21,10 @@ import (
"testing"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apiserver/pkg/storage/storagebackend"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/apis/extensions"
"k8s.io/kubernetes/pkg/genericapiserver/server/options"
"k8s.io/kubernetes/pkg/storage/storagebackend"
)
func TestUpdateEtcdOverrides(t *testing.T) {

2
pkg/kubeapiserver/BUILD
View File

@ -18,9 +18,9 @@ go_library(
deps = [
"//pkg/api:go_default_library",
"//pkg/genericapiserver/server:go_default_library",
"//pkg/storage/storagebackend:go_default_library",
"//vendor:k8s.io/apimachinery/pkg/runtime",
"//vendor:k8s.io/apimachinery/pkg/runtime/schema",
"//vendor:k8s.io/apiserver/pkg/storage/storagebackend",
"//vendor:k8s.io/apiserver/pkg/util/flag",
],
)

2
pkg/kubeapiserver/default_storage_factory_builder.go
View File

@ -23,10 +23,10 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apiserver/pkg/storage/storagebackend"
utilflag "k8s.io/apiserver/pkg/util/flag"
"k8s.io/kubernetes/pkg/api"
genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server"
"k8s.io/kubernetes/pkg/storage/storagebackend"
)
// Builds the DefaultStorageFactory.

2
pkg/master/thirdparty/BUILD vendored
View File

@ -22,13 +22,13 @@ go_library(
"//pkg/registry/extensions/rest:go_default_library",
"//pkg/registry/extensions/thirdpartyresourcedata:go_default_library",
"//pkg/registry/extensions/thirdpartyresourcedata/storage:go_default_library",
"//pkg/storage/storagebackend:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:k8s.io/apimachinery/pkg/api/meta",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
"//vendor:k8s.io/apimachinery/pkg/runtime",
"//vendor:k8s.io/apimachinery/pkg/runtime/schema",
"//vendor:k8s.io/apiserver/pkg/endpoints/request",
"//vendor:k8s.io/apiserver/pkg/storage/storagebackend",
],
)

2
pkg/master/thirdparty/thirdparty.go vendored
View File

@ -28,6 +28,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/apiserver/pkg/storage/storagebackend"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/apis/extensions"
genericapi "k8s.io/kubernetes/pkg/genericapiserver/endpoints"
@ -38,7 +39,6 @@ import (
extensionsrest "k8s.io/kubernetes/pkg/registry/extensions/rest"
"k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata"
thirdpartyresourcedatastore "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata/storage"
"k8s.io/kubernetes/pkg/storage/storagebackend"
)
// dynamicLister is used to list resources for dynamic third party

2
pkg/registry/core/rest/BUILD
View File

@ -14,8 +14,8 @@ go_test(
library = ":go_default_library",
tags = ["automanaged"],
deps = [
"//pkg/storage/storagebackend:go_default_library",
"//vendor:k8s.io/apimachinery/pkg/runtime/schema",
"//vendor:k8s.io/apiserver/pkg/storage/storagebackend",
],
)

2
pkg/registry/core/rest/storage_core_test.go
View File

@ -20,7 +20,7 @@ import (
"testing"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kubernetes/pkg/storage/storagebackend"
"k8s.io/apiserver/pkg/storage/storagebackend"
)
func TestGetServersToValidate(t *testing.T) {

4
pkg/registry/core/service/allocator/storage/BUILD
View File

@ -18,8 +18,8 @@ go_test(
"//pkg/registry/core/service/allocator:go_default_library",
"//pkg/registry/registrytest:go_default_library",
"//pkg/storage/etcd/testing:go_default_library",
"//pkg/storage/storagebackend:go_default_library",
"//vendor:golang.org/x/net/context",
"//vendor:k8s.io/apiserver/pkg/storage/storagebackend",
],
)
@ -34,11 +34,11 @@ go_library(
"//pkg/registry/core/rangeallocation:go_default_library",
"//pkg/registry/core/service/allocator:go_default_library",
"//pkg/storage:go_default_library",
"//pkg/storage/storagebackend:go_default_library",
"//vendor:golang.org/x/net/context",
"//vendor:k8s.io/apimachinery/pkg/api/errors",
"//vendor:k8s.io/apimachinery/pkg/runtime",
"//vendor:k8s.io/apimachinery/pkg/runtime/schema",
"//vendor:k8s.io/apiserver/pkg/storage/storagebackend",
],
)

2
pkg/registry/core/service/allocator/storage/storage.go
View File

@ -24,13 +24,13 @@ import (
k8serr "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apiserver/pkg/storage/storagebackend"
"k8s.io/kubernetes/pkg/api"
storeerr "k8s.io/kubernetes/pkg/api/errors/storage"
"k8s.io/kubernetes/pkg/genericapiserver/registry/generic"
"k8s.io/kubernetes/pkg/registry/core/rangeallocation"
"k8s.io/kubernetes/pkg/registry/core/service/allocator"
"k8s.io/kubernetes/pkg/storage"
"k8s.io/kubernetes/pkg/storage/storagebackend"
"golang.org/x/net/context"
)

2
pkg/registry/core/service/allocator/storage/storage_test.go
View File

@ -20,11 +20,11 @@ import (
"strings"
"testing"
"k8s.io/apiserver/pkg/storage/storagebackend"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/registry/core/service/allocator"
"k8s.io/kubernetes/pkg/registry/registrytest"
etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/storage/storagebackend"
"golang.org/x/net/context"
)

2
pkg/registry/registrytest/BUILD
View File

@ -24,7 +24,6 @@ go_library(
"//pkg/genericapiserver/registry/rest/resttest:go_default_library",
"//pkg/storage/etcd:go_default_library",
"//pkg/storage/etcd/testing:go_default_library",
"//pkg/storage/storagebackend:go_default_library",
"//pkg/storage/testing:go_default_library",
"//vendor:k8s.io/apimachinery/pkg/api/errors",
"//vendor:k8s.io/apimachinery/pkg/api/meta",
@ -35,6 +34,7 @@ go_library(
"//vendor:k8s.io/apimachinery/pkg/runtime",
"//vendor:k8s.io/apimachinery/pkg/watch",
"//vendor:k8s.io/apiserver/pkg/endpoints/request",
"//vendor:k8s.io/apiserver/pkg/storage/storagebackend",
],
)

2
pkg/registry/registrytest/etcd.go
View File

@ -27,13 +27,13 @@ import (
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime"
genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/apiserver/pkg/storage/storagebackend"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi"
genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry"
"k8s.io/kubernetes/pkg/genericapiserver/registry/rest/resttest"
etcdstorage "k8s.io/kubernetes/pkg/storage/etcd"
etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/storage/storagebackend"
storagetesting "k8s.io/kubernetes/pkg/storage/testing"
)

2
pkg/storage/BUILD
View File

@ -111,7 +111,7 @@ filegroup(
":package-srcs",
"//pkg/storage/etcd:all-srcs",
"//pkg/storage/etcd3:all-srcs",
"//pkg/storage/storagebackend:all-srcs",
"//pkg/storage/storagebackend/factory:all-srcs",
"//pkg/storage/testing:all-srcs",
],
tags = ["automanaged"],

2
pkg/storage/etcd/testing/BUILD
View File

@ -14,7 +14,6 @@ go_library(
deps = [
"//pkg/storage/etcd/etcdtest:go_default_library",
"//pkg/storage/etcd/testing/testingcert:go_default_library",
"//pkg/storage/storagebackend:go_default_library",
"//vendor:github.com/coreos/etcd/client",
"//vendor:github.com/coreos/etcd/clientv3",
"//vendor:github.com/coreos/etcd/etcdserver",
@ -26,6 +25,7 @@ go_library(
"//vendor:github.com/golang/glog",
"//vendor:golang.org/x/net/context",
"//vendor:k8s.io/apimachinery/pkg/util/wait",
"//vendor:k8s.io/apiserver/pkg/storage/storagebackend",
],
)

2
pkg/storage/etcd/testing/utils.go
View File

@ -28,9 +28,9 @@ import (
"time"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apiserver/pkg/storage/storagebackend"
"k8s.io/kubernetes/pkg/storage/etcd/etcdtest"
"k8s.io/kubernetes/pkg/storage/etcd/testing/testingcert"
"k8s.io/kubernetes/pkg/storage/storagebackend"
etcd "github.com/coreos/etcd/client"
"github.com/coreos/etcd/clientv3"

31
pkg/storage/storagebackend/BUILD
View File

@ -1,31 +0,0 @@
package(default_visibility = ["//visibility:public"])
licenses(["notice"])
load(
"@io_bazel_rules_go//go:def.bzl",
"go_library",
)
go_library(
name = "go_default_library",
srcs = ["config.go"],
tags = ["automanaged"],
deps = ["//vendor:k8s.io/apimachinery/pkg/runtime"],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//pkg/storage/storagebackend/factory:all-srcs",
],
tags = ["automanaged"],
)

4
pkg/storage/storagebackend/factory/BUILD
View File

@ -20,12 +20,12 @@ go_library(
"//pkg/storage:go_default_library",
"//pkg/storage/etcd:go_default_library",
"//pkg/storage/etcd3:go_default_library",
"//pkg/storage/storagebackend:go_default_library",
"//vendor:github.com/coreos/etcd/client",
"//vendor:github.com/coreos/etcd/clientv3",
"//vendor:github.com/coreos/etcd/pkg/transport",
"//vendor:golang.org/x/net/context",
"//vendor:k8s.io/apimachinery/pkg/util/net",
"//vendor:k8s.io/apiserver/pkg/storage/storagebackend",
],
)
@ -38,10 +38,10 @@ go_test(
"//pkg/api:go_default_library",
"//pkg/api/testapi:go_default_library",
"//pkg/storage/etcd/testing/testingcert:go_default_library",
"//pkg/storage/storagebackend:go_default_library",
"//vendor:github.com/coreos/etcd/integration",
"//vendor:github.com/coreos/etcd/pkg/transport",
"//vendor:golang.org/x/net/context",
"//vendor:k8s.io/apiserver/pkg/storage/storagebackend",
],
)

2
pkg/storage/storagebackend/factory/etcd2.go
View File

@ -25,9 +25,9 @@ import (
"github.com/coreos/etcd/pkg/transport"
utilnet "k8s.io/apimachinery/pkg/util/net"
"k8s.io/apiserver/pkg/storage/storagebackend"
"k8s.io/kubernetes/pkg/storage"
"k8s.io/kubernetes/pkg/storage/etcd"
"k8s.io/kubernetes/pkg/storage/storagebackend"
)
func newETCD2Storage(c storagebackend.Config) (storage.Interface, DestroyFunc, error) {

2
pkg/storage/storagebackend/factory/etcd3.go
View File

@ -17,9 +17,9 @@ limitations under the License.
package factory
import (
"k8s.io/apiserver/pkg/storage/storagebackend"
"k8s.io/kubernetes/pkg/storage"
"k8s.io/kubernetes/pkg/storage/etcd3"
"k8s.io/kubernetes/pkg/storage/storagebackend"
"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/pkg/transport"

2
pkg/storage/storagebackend/factory/factory.go
View File

@ -19,8 +19,8 @@ package factory
import (
"fmt"
"k8s.io/apiserver/pkg/storage/storagebackend"
"k8s.io/kubernetes/pkg/storage"
"k8s.io/kubernetes/pkg/storage/storagebackend"
)
// DestroyFunc is to destroy any resources used by the storage returned in Create() together.

2
pkg/storage/storagebackend/factory/tls_test.go
View File

@ -25,10 +25,10 @@ import (
"golang.org/x/net/context"
"k8s.io/apiserver/pkg/storage/storagebackend"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/storage/etcd/testing/testingcert"
"k8s.io/kubernetes/pkg/storage/storagebackend"
"github.com/coreos/etcd/integration"
"github.com/coreos/etcd/pkg/transport"

0
pkg/storage/storagebackend/OWNERS → staging/src/k8s.io/apiserver/pkg/storage/storagebackend/OWNERS
View File

0
pkg/storage/storagebackend/config.go → staging/src/k8s.io/apiserver/pkg/storage/storagebackend/config.go
View File

2
test/integration/framework/BUILD
View File

@ -39,7 +39,6 @@ go_library(
"//pkg/kubectl:go_default_library",
"//pkg/kubelet/client:go_default_library",
"//pkg/master:go_default_library",
"//pkg/storage/storagebackend:go_default_library",
"//pkg/util/env:go_default_library",
"//pkg/version:go_default_library",
"//plugin/pkg/admission/admit:go_default_library",
@ -61,6 +60,7 @@ go_library(
"//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
"//vendor:k8s.io/apiserver/pkg/authorization/authorizerfactory",
"//vendor:k8s.io/apiserver/pkg/authorization/union",
"//vendor:k8s.io/apiserver/pkg/storage/storagebackend",
"//vendor:k8s.io/client-go/rest",
],
)

2
test/integration/framework/master_utils.go
View File

@ -39,6 +39,7 @@ import (
authauthorizer "k8s.io/apiserver/pkg/authorization/authorizer"
"k8s.io/apiserver/pkg/authorization/authorizerfactory"
authorizerunion "k8s.io/apiserver/pkg/authorization/union"
"k8s.io/apiserver/pkg/storage/storagebackend"
restclient "k8s.io/client-go/rest"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi"
@ -62,7 +63,6 @@ import (
"k8s.io/kubernetes/pkg/kubectl"
kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
"k8s.io/kubernetes/pkg/master"
"k8s.io/kubernetes/pkg/storage/storagebackend"
"k8s.io/kubernetes/pkg/util/env"
"k8s.io/kubernetes/pkg/version"
"k8s.io/kubernetes/plugin/pkg/admission/admit"

7
vendor/BUILD vendored
View File

@ -13814,3 +13814,10 @@ go_library(
"//vendor:k8s.io/apiserver/pkg/server/httplog",
],
)
go_library(
name = "k8s.io/apiserver/pkg/storage/storagebackend",
srcs = ["k8s.io/apiserver/pkg/storage/storagebackend/config.go"],
tags = ["automanaged"],
deps = ["//vendor:k8s.io/apimachinery/pkg/runtime"],
)