LIGGITT: stop auto-registering the non-groupified versions

openshift · Jun 25, 2018 · 488d534 · 488d534
1 parent 857b8e8
commit 488d534
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/pkg/security/registry/securitycontextconstraints/etcd/etcd_test.go b/pkg/security/registry/securitycontextconstraints/etcd/etcd_test.go
@@ -3,20 +3,21 @@ package etcd
 import (
 	"testing"
 
+	securityapi "github.com/openshift/origin/pkg/security/apis/security"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apiserver/pkg/registry/generic"
 	genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
 	etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
-	"k8s.io/kubernetes/pkg/registry/registrytest"
-
-	securityapi "github.com/openshift/origin/pkg/security/apis/security"
+	"k8s.io/kubernetes/pkg/api/legacyscheme"
 
 	_ "github.com/openshift/origin/pkg/api/install"
 )
 
 func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) {
-	etcdStorage, server := registrytest.NewEtcdStorage(t, "")
+	server, etcdStorage := etcdtesting.NewUnsecuredEtcd3TestClientServer(t)
+	etcdStorage.Codec = legacyscheme.Codecs.LegacyCodec(schema.GroupVersion{Group: "security.openshift.io", Version: "v1"})
 	restOptions := generic.RESTOptions{
 		StorageConfig:           etcdStorage,
 		Decorator:               generic.UndecoratedStorage,