diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 6b62ecde..93dbd2cf 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -244,331 +244,331 @@
 		},
 		{
 			"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
-			"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
+			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
 		},
 		{
 			"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
-			"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
+			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1",
-			"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
+			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1beta1",
-			"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
+			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1beta2",
-			"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
+			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
 		},
 		{
 			"ImportPath": "k8s.io/api/authentication/v1",
-			"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
+			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
 		},
 		{
 			"ImportPath": "k8s.io/api/authentication/v1beta1",
-			"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
+			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
 		},
 		{
 			"ImportPath": "k8s.io/api/authorization/v1",
-			"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
+			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
 		},
 		{
 			"ImportPath": "k8s.io/api/authorization/v1beta1",
-			"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
+			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
 		},
 		{
 			"ImportPath": "k8s.io/api/autoscaling/v1",
-			"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
+			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
 		},
 		{
 			"ImportPath": "k8s.io/api/autoscaling/v2beta1",
-			"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
+			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v1",
-			"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
+			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v1beta1",
-			"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
+			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v2alpha1",
-			"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
+			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
 		},
 		{
 			"ImportPath": "k8s.io/api/certificates/v1beta1",
-			"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
+			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
 		},
 		{
 			"ImportPath": "k8s.io/api/core/v1",
-			"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
+			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
 		},
 		{
 			"ImportPath": "k8s.io/api/events/v1beta1",
-			"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
+			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
 		},
 		{
 			"ImportPath": "k8s.io/api/extensions/v1beta1",
-			"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
+			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
 		},
 		{
 			"ImportPath": "k8s.io/api/imagepolicy/v1alpha1",
-			"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
+			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
 		},
 		{
 			"ImportPath": "k8s.io/api/networking/v1",
-			"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
+			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
 		},
 		{
 			"ImportPath": "k8s.io/api/policy/v1beta1",
-			"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
+			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1",
-			"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
+			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1alpha1",
-			"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
+			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1beta1",
-			"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
+			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
 		},
 		{
 			"ImportPath": "k8s.io/api/scheduling/v1alpha1",
-			"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
+			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
 		},
 		{
 			"ImportPath": "k8s.io/api/settings/v1alpha1",
-			"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
+			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1",
-			"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
+			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1alpha1",
-			"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
+			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1beta1",
-			"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
+			"Rev": "6ef9db38b7d4d02a221e7af3e7f508ff19706fc6"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
+			"Rev": "8cd82ca9c2ecc1799da600b08af6c04a112490aa"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
diff --git a/dynamic/dynamic_util.go b/dynamic/dynamic_util.go
index c2cf0dae..782c7047 100644
--- a/dynamic/dynamic_util.go
+++ b/dynamic/dynamic_util.go
@@ -26,15 +26,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
-// VersionInterfaces provides an object converter and metadata
-// accessor appropriate for use with unstructured objects.
-func VersionInterfaces(schema.GroupVersion) (*meta.VersionInterfaces, error) {
-	return &meta.VersionInterfaces{
-		ObjectConvertor:  &unstructured.UnstructuredObjectConverter{},
-		MetadataAccessor: meta.NewAccessor(),
-	}, nil
-}
-
 // NewDiscoveryRESTMapper returns a RESTMapper based on discovery information.
 func NewDiscoveryRESTMapper(resources []*metav1.APIResourceList, versionFunc meta.VersionInterfacesFunc) (*meta.DefaultRESTMapper, error) {
 	rm := meta.NewDefaultRESTMapper(nil, versionFunc)
diff --git a/dynamic/dynamic_util_test.go b/dynamic/dynamic_util_test.go
index cdc68e01..82a2dd8b 100644
--- a/dynamic/dynamic_util_test.go
+++ b/dynamic/dynamic_util_test.go
@@ -19,7 +19,9 @@ package dynamic
 import (
 	"testing"
 
+	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
@@ -43,7 +45,7 @@ func TestDiscoveryRESTMapper(t *testing.T) {
 		Kind:    "test_kind",
 	}
 
-	mapper, err := NewDiscoveryRESTMapper(resources, VersionInterfaces)
+	mapper, err := NewDiscoveryRESTMapper(resources, versionInterfaces)
 	if err != nil {
 		t.Fatalf("unexpected error creating mapper: %s", err)
 	}
@@ -77,3 +79,11 @@ func TestDiscoveryRESTMapper(t *testing.T) {
 		}
 	}
 }
+
+// VersionInterfaces provides an object converter and metadata
+// accessor appropriate for use with unstructured objects.
+func versionInterfaces(schema.GroupVersion) (*meta.VersionInterfaces, error) {
+	return &meta.VersionInterfaces{
+		ObjectConvertor: &unstructured.UnstructuredObjectConverter{},
+	}, nil
+}