Revert "Merge branch 'dev/k8s-deviceid-model' into master"

This reverts commit 194c27fadf, reversing
changes made to 96d4d79d1f.

vendor/k8s.io/api/roundtrip_test.go

@@ -52,7 +52,6 @@ import (
 	storagev1alpha1 "k8s.io/api/storage/v1alpha1"
 	storagev1beta1 "k8s.io/api/storage/v1beta1"
 
-	"github.com/stretchr/testify/require"
 	"k8s.io/apimachinery/pkg/api/testing/fuzzer"
 	"k8s.io/apimachinery/pkg/api/testing/roundtrip"
 	genericfuzzer "k8s.io/apimachinery/pkg/apis/meta/fuzzer"
@@ -101,7 +100,7 @@ func TestRoundTripExternalTypes(t *testing.T) {
 		scheme := runtime.NewScheme()
 		codecs := serializer.NewCodecFactory(scheme)
 
-		require.NoError(t, builder.AddToScheme(scheme))
+		builder.AddToScheme(scheme)
 		seed := rand.Int63()
 		// I'm only using the generic fuzzer funcs, but at some point in time we might need to
 		// switch to specialized. For now we're happy with the current serialization test.
@@ -120,7 +119,7 @@ func TestFailRoundTrip(t *testing.T) {
 		metav1.AddToGroupVersion(scheme, groupVersion)
 		return nil
 	})
-	require.NoError(t, builder.AddToScheme(scheme))
+	builder.AddToScheme(scheme)
 	seed := rand.Int63()
 	fuzzer := fuzzer.FuzzerFor(genericfuzzer.Funcs, rand.NewSource(seed), codecs)
 	tmpT := new(testing.T)