github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

pkg/storage/storagebackend/factory: cut off from testapi

Browse Source
This commit is contained in:
Dr. Stefan Schimanski 2017-01-30 09:31:31 +01:00
parent f975be679c
commit 668f74b96e
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,15 +26,26 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
"k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/apiserver/pkg/storage/storagebackend"
"k8s.io/kubernetes/pkg/api" clientapi "k8s.io/client-go/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi" clientapiv1 "k8s.io/client-go/pkg/api/v1"
"k8s.io/kubernetes/pkg/storage/etcd/testing/testingcert" "k8s.io/kubernetes/pkg/storage/etcd/testing/testingcert"
runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/apimachinery/pkg/runtime/schema"
"github.com/coreos/etcd/integration" "github.com/coreos/etcd/integration"
"github.com/coreos/etcd/pkg/transport" "github.com/coreos/etcd/pkg/transport"
"k8s.io/apimachinery/pkg/runtime"
) )
func TestTLSConnection(t *testing.T) { func TestTLSConnection(t *testing.T) {
scheme := runtime.NewScheme()
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
clientapi.AddToScheme(scheme)
clientapiv1.AddToScheme(scheme)
certFile, keyFile, caFile := configureTLSCerts(t) certFile, keyFile, caFile := configureTLSCerts(t)
defer os.RemoveAll(filepath.Dir(certFile)) defer os.RemoveAll(filepath.Dir(certFile))
@ -56,14 +67,14 @@ func TestTLSConnection(t *testing.T) {
CertFile: certFile, CertFile: certFile,
KeyFile: keyFile, KeyFile: keyFile,
CAFile: caFile, CAFile: caFile,
Codec: testapi.Default.Codec(), Codec: codec,
} }
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", &api.Pod{}, nil, 0) err = storage.Create(context.TODO(), "/abc", &clientapi.Pod{}, nil, 0)
if err != nil { if err != nil {
t.Fatalf("Create failed: %v", err) t.Fatalf("Create failed: %v", err)
} }