describe

openshift · Aug 14, 2018 · ea2ce08 · ea2ce08
1 parent 24d12c2
commit ea2ce08
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/pkg/oc/lib/describe/chaindescriber_test.go b/pkg/oc/lib/describe/chaindescriber_test.go
@@ -10,7 +10,6 @@ import (
 
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/sets"
-	"k8s.io/kubernetes/pkg/api/legacyscheme"
 
 	fakebuildclient "github.com/openshift/client-go/build/clientset/versioned/fake"
 	fakebuildv1client "github.com/openshift/client-go/build/clientset/versioned/typed/build/v1/fake"
@@ -204,7 +203,7 @@ func TestChainDescriber(t *testing.T) {
 			objs := []runtime.Object{}
 			if len(test.path) > 0 {
 				var err error
-				objs, err = readObjectsFromPath(test.path, test.defaultNamespace, legacyscheme.Codecs.UniversalDecoder(), legacyscheme.Scheme)
+				objs, err = readObjectsFromPath(test.path, test.defaultNamespace)
 				if err != nil {
 					t.Fatal(err)
 				}

diff --git a/pkg/oc/lib/describe/projectstatus_test.go b/pkg/oc/lib/describe/projectstatus_test.go
@@ -13,12 +13,15 @@ import (
 	"k8s.io/apimachinery/pkg/api/meta/testrestmapper"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/serializer"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	fakekubernetes "k8s.io/client-go/kubernetes/fake"
+	kubernetesscheme "k8s.io/client-go/kubernetes/scheme"
 	clientgotesting "k8s.io/client-go/testing"
 	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	kubeclientscheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme"
 
+	"github.com/openshift/api"
 	appsv1 "github.com/openshift/api/apps/v1"
 	projectv1 "github.com/openshift/api/project/v1"
 	fakeappsclient "github.com/openshift/client-go/apps/clientset/versioned/fake"
@@ -484,8 +487,7 @@ func TestProjectStatus(t *testing.T) {
 			if len(test.File) > 0 {
 				// Load data from a folder dedicated to mock data, which is never loaded into the API during tests
 				var err error
-				objs, err = readObjectsFromPath("../../../../pkg/oc/lib/graph/genericgraph/test/"+test.File, "example",
-					legacyscheme.Codecs.LegacyCodec(legacyscheme.Scheme.PrioritizedVersionsAllGroups()...), legacyscheme.Scheme)
+				objs, err = readObjectsFromPath("../../../../pkg/oc/lib/graph/genericgraph/test/"+test.File, "example")
 				if err != nil {
 					t.Errorf("%s: unexpected error: %v", k, err)
 				}
@@ -663,17 +665,21 @@ func TestPrintMarkerSuggestions(t *testing.T) {
 }
 
 // ReadObjectsFromPath reads objects from the specified file for testing.
-func readObjectsFromPath(path, namespace string, decoder runtime.Decoder, typer runtime.ObjectTyper) ([]runtime.Object, error) {
+func readObjectsFromPath(path, namespace string) ([]runtime.Object, error) {
 	data, err := ioutil.ReadFile(path)
 	if err != nil {
 		return nil, err
 	}
-	obj, err := runtime.Decode(decoder, data)
+	scheme := runtime.NewScheme()
+	kubernetesscheme.AddToScheme(scheme)
+	api.Install(scheme)
+	codecs := serializer.NewCodecFactory(scheme)
+	obj, err := runtime.Decode(codecs.UniversalDeserializer(), data)
 	if err != nil {
 		return nil, err
 	}
 	if !meta.IsListType(obj) {
-		if err := setNamespace(typer, obj, namespace); err != nil {
+		if err := setNamespace(scheme, obj, namespace); err != nil {
 			return nil, err
 		}
 		return []runtime.Object{obj}, nil
@@ -682,12 +688,12 @@ func readObjectsFromPath(path, namespace string, decoder runtime.Decoder, typer
 	if err != nil {
 		return nil, err
 	}
-	errs := runtime.DecodeList(list, decoder)
+	errs := runtime.DecodeList(list, codecs.UniversalDeserializer())
 	if len(errs) > 0 {
 		return nil, errs[0]
 	}
 	for _, o := range list {
-		if err := setNamespace(typer, o, namespace); err != nil {
+		if err := setNamespace(scheme, o, namespace); err != nil {
 			return nil, err
 		}
 	}