kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mechanical import fixup: pkg/storage

This commit is contained in:
Dr. Stefan Schimanski 2017-02-02 10:10:32 +01:00 committed by deads2k
parent 4a2fe15be7
commit 4b46da7a0d
14 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/storage/etcd/api_object_versioner_test.go
View File

@ -20,7 +20,7 @@ import (
"testing" "testing"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
storagetesting "k8s.io/kubernetes/pkg/storage/testing" storagetesting "k8s.io/apiserver/pkg/storage/testing"
) )
func TestObjectVersioner(t *testing.T) { func TestObjectVersioner(t *testing.T) {

2
pkg/storage/etcd/doc.go
View File

@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package etcd // import "k8s.io/kubernetes/pkg/storage/etcd" package etcd // import "k8s.io/apiserver/pkg/storage/etcd"

2
pkg/storage/etcd/etcd_helper.go
View File

@ -36,7 +36,7 @@ import (
"k8s.io/apiserver/pkg/storage/etcd/metrics" "k8s.io/apiserver/pkg/storage/etcd/metrics"
utilcache "k8s.io/apiserver/pkg/util/cache" utilcache "k8s.io/apiserver/pkg/util/cache"
utiltrace "k8s.io/apiserver/pkg/util/trace" utiltrace "k8s.io/apiserver/pkg/util/trace"
etcdutil "k8s.io/kubernetes/pkg/storage/etcd/util" etcdutil "k8s.io/apiserver/pkg/storage/etcd/util"
) )
// Creates a new storage interface from the client // Creates a new storage interface from the client

8
pkg/storage/etcd/etcd_helper_test.go
View File

@ -36,10 +36,10 @@ import (
"k8s.io/apiserver/pkg/apis/example" "k8s.io/apiserver/pkg/apis/example"
examplev1 "k8s.io/apiserver/pkg/apis/example/v1" examplev1 "k8s.io/apiserver/pkg/apis/example/v1"
"k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage"
"k8s.io/kubernetes/pkg/storage/etcd/etcdtest" "k8s.io/apiserver/pkg/storage/etcd/etcdtest"
etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
storagetesting "k8s.io/kubernetes/pkg/storage/testing" storagetesting "k8s.io/apiserver/pkg/storage/testing"
storagetests "k8s.io/kubernetes/pkg/storage/tests" storagetests "k8s.io/apiserver/pkg/storage/tests"
) )
func testScheme(t *testing.T) (*runtime.Scheme, serializer.CodecFactory) { func testScheme(t *testing.T) (*runtime.Scheme, serializer.CodecFactory) {

2
pkg/storage/etcd/etcd_watcher.go
View File

@ -28,7 +28,7 @@ import (
utilruntime "k8s.io/apimachinery/pkg/util/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
"k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage"
etcdutil "k8s.io/kubernetes/pkg/storage/etcd/util" etcdutil "k8s.io/apiserver/pkg/storage/etcd/util"
etcd "github.com/coreos/etcd/client" etcd "github.com/coreos/etcd/client"
"github.com/golang/glog" "github.com/golang/glog"

4
pkg/storage/etcd/etcd_watcher_test.go
View File

@ -29,8 +29,8 @@ import (
"k8s.io/apiserver/pkg/apis/example" "k8s.io/apiserver/pkg/apis/example"
examplev1 "k8s.io/apiserver/pkg/apis/example/v1" examplev1 "k8s.io/apiserver/pkg/apis/example/v1"
"k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage"
"k8s.io/kubernetes/pkg/storage/etcd/etcdtest" "k8s.io/apiserver/pkg/storage/etcd/etcdtest"
etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
etcd "github.com/coreos/etcd/client" etcd "github.com/coreos/etcd/client"
"golang.org/x/net/context" "golang.org/x/net/context"

2
pkg/storage/etcd/etcdtest/doc.go
View File

@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package etcdtest // import "k8s.io/kubernetes/pkg/storage/etcd/etcdtest" package etcdtest // import "k8s.io/apiserver/pkg/storage/etcd/etcdtest"

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

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

2
pkg/storage/etcd/util/doc.go
View File

@ -16,4 +16,4 @@ limitations under the License.
// Package util holds generic etcd-related utility functions that any user of ectd might want to // Package util holds generic etcd-related utility functions that any user of ectd might want to
// use, without pulling in kubernetes-specific code. // use, without pulling in kubernetes-specific code.
package util // import "k8s.io/kubernetes/pkg/storage/etcd/util" package util // import "k8s.io/apiserver/pkg/storage/etcd/util"

2
pkg/storage/etcd3/store.go
View File

@ -36,7 +36,7 @@ import (
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
"k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage"
utiltrace "k8s.io/apiserver/pkg/util/trace" utiltrace "k8s.io/apiserver/pkg/util/trace"
"k8s.io/kubernetes/pkg/storage/etcd" "k8s.io/apiserver/pkg/storage/etcd"
) )
type store struct { type store struct {

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

@ -27,7 +27,7 @@ import (
utilnet "k8s.io/apimachinery/pkg/util/net" utilnet "k8s.io/apimachinery/pkg/util/net"
"k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage"
"k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/apiserver/pkg/storage/storagebackend"
"k8s.io/kubernetes/pkg/storage/etcd" "k8s.io/apiserver/pkg/storage/etcd"
) )
func newETCD2Storage(c storagebackend.Config) (storage.Interface, DestroyFunc, error) { func newETCD2Storage(c storagebackend.Config) (storage.Interface, DestroyFunc, error) {

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

@ -19,7 +19,7 @@ package factory
import ( import (
"k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage"
"k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/apiserver/pkg/storage/storagebackend"
"k8s.io/kubernetes/pkg/storage/etcd3" "k8s.io/apiserver/pkg/storage/etcd3"
"github.com/coreos/etcd/clientv3" "github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/pkg/transport" "github.com/coreos/etcd/pkg/transport"

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

@ -34,7 +34,7 @@ import (
"k8s.io/apiserver/pkg/apis/example" "k8s.io/apiserver/pkg/apis/example"
examplev1 "k8s.io/apiserver/pkg/apis/example/v1" examplev1 "k8s.io/apiserver/pkg/apis/example/v1"
"k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/apiserver/pkg/storage/storagebackend"
"k8s.io/kubernetes/pkg/storage/etcd/testing/testingcert" "k8s.io/apiserver/pkg/storage/etcd/testing/testingcert"
) )
var scheme = runtime.NewScheme() var scheme = runtime.NewScheme()

8
pkg/storage/tests/cacher_test.go
View File

@ -38,10 +38,10 @@ import (
"k8s.io/apiserver/pkg/apis/example" "k8s.io/apiserver/pkg/apis/example"
examplev1 "k8s.io/apiserver/pkg/apis/example/v1" examplev1 "k8s.io/apiserver/pkg/apis/example/v1"
"k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage"
etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" etcdstorage "k8s.io/apiserver/pkg/storage/etcd"
"k8s.io/kubernetes/pkg/storage/etcd/etcdtest" "k8s.io/apiserver/pkg/storage/etcd/etcdtest"
etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/storage/etcd3" "k8s.io/apiserver/pkg/storage/etcd3"
"golang.org/x/net/context" "golang.org/x/net/context"