github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

pkg/storage/storagebackend/factory: cut off pkg/api dependency

Browse Source
This commit is contained in:
Dr. Stefan Schimanski 2017-02-01 16:27:57 +01:00
parent 0e2b2048b2
commit 9180de9072
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,28 +23,31 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"golang.org/x/net/context"
"k8s.io/apimachinery/pkg/runtime/schema"
runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/apiserver/pkg/storage/storagebackend"
clientapi "k8s.io/client-go/pkg/api"
clientapiv1 "k8s.io/client-go/pkg/api/v1"
"k8s.io/kubernetes/pkg/storage/etcd/testing/testingcert"
"github.com/coreos/etcd/integration" "github.com/coreos/etcd/integration"
"github.com/coreos/etcd/pkg/transport" "github.com/coreos/etcd/pkg/transport"
"golang.org/x/net/context"
apitesting "k8s.io/apimachinery/pkg/api/testing"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/apiserver/pkg/apis/example"
examplev1 "k8s.io/apiserver/pkg/apis/example/v1"
"k8s.io/apiserver/pkg/storage/storagebackend"
"k8s.io/kubernetes/pkg/storage/etcd/testing/testingcert"
) )
func TestTLSConnection(t *testing.T) { var scheme = runtime.NewScheme()
scheme := runtime.NewScheme() var codecs = serializer.NewCodecFactory(scheme)
codecs := runtimeserializer.NewCodecFactory(scheme)
codec := codecs.LegacyCodec(schema.GroupVersion{Version: "v1"})
// TODO: use k8s.io/apiserver internal type instead of borrowing it from client-go func init() {
clientapi.AddToScheme(scheme) metav1.AddToGroupVersion(scheme, metav1.SchemeGroupVersion)
clientapiv1.AddToScheme(scheme) example.AddToScheme(scheme)
examplev1.AddToScheme(scheme)
}
func TestTLSConnection(t *testing.T) {
codec := apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion)
certFile, keyFile, caFile := configureTLSCerts(t) certFile, keyFile, caFile := configureTLSCerts(t)
defer os.RemoveAll(filepath.Dir(certFile)) defer os.RemoveAll(filepath.Dir(certFile))
@ -68,13 +71,14 @@ func TestTLSConnection(t *testing.T) {
KeyFile: keyFile, KeyFile: keyFile,
CAFile: caFile, CAFile: caFile,
Codec: codec, Codec: codec,
Copier: scheme,
} }
storage, destroyFunc, err := newETCD3Storage(cfg) storage, destroyFunc, err := newETCD3Storage(cfg)
defer destroyFunc() defer destroyFunc()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
err = storage.Create(context.TODO(), "/abc", &clientapi.Pod{}, nil, 0) err = storage.Create(context.TODO(), "/abc", &example.Pod{}, nil, 0)
if err != nil { if err != nil {
t.Fatalf("Create failed: %v", err) t.Fatalf("Create failed: %v", err)
} }