Update dependencies to v0.20.10-rc.0 tag

dynamic/fake/simple.go

@@ -35,35 +35,7 @@ import (
 )
 
 func NewSimpleDynamicClient(scheme *runtime.Scheme, objects ...runtime.Object) *FakeDynamicClient {
-	unstructuredScheme := runtime.NewScheme()
-	for gvk := range scheme.AllKnownTypes() {
-		if unstructuredScheme.Recognizes(gvk) {
-			continue
-		}
-		if strings.HasSuffix(gvk.Kind, "List") {
-			unstructuredScheme.AddKnownTypeWithName(gvk, &unstructured.UnstructuredList{})
-			continue
-		}
-		unstructuredScheme.AddKnownTypeWithName(gvk, &unstructured.Unstructured{})
-	}
-
-	objects, err := convertObjectsToUnstructured(scheme, objects)
-	if err != nil {
-		panic(err)
-	}
-
-	for _, obj := range objects {
-		gvk := obj.GetObjectKind().GroupVersionKind()
-		if !unstructuredScheme.Recognizes(gvk) {
-			unstructuredScheme.AddKnownTypeWithName(gvk, &unstructured.Unstructured{})
-		}
-		gvk.Kind += "List"
-		if !unstructuredScheme.Recognizes(gvk) {
-			unstructuredScheme.AddKnownTypeWithName(gvk, &unstructured.UnstructuredList{})
-		}
-	}
-
-	return NewSimpleDynamicClientWithCustomListKinds(unstructuredScheme, nil, objects...)
+	return NewSimpleDynamicClientWithCustomListKinds(scheme, nil, objects...)
 }
 
 // NewSimpleDynamicClientWithCustomListKinds try not to use this.  In general you want to have the scheme have the List types registered
@@ -445,41 +417,3 @@ func (c *dynamicResourceClient) Patch(ctx context.Context, name string, pt types
 	}
 	return ret, err
 }
-
-func convertObjectsToUnstructured(s *runtime.Scheme, objs []runtime.Object) ([]runtime.Object, error) {
-	ul := make([]runtime.Object, 0, len(objs))
-
-	for _, obj := range objs {
-		u, err := convertToUnstructured(s, obj)
-		if err != nil {
-			return nil, err
-		}
-
-		ul = append(ul, u)
-	}
-	return ul, nil
-}
-
-func convertToUnstructured(s *runtime.Scheme, obj runtime.Object) (runtime.Object, error) {
-	var (
-		err error
-		u   unstructured.Unstructured
-	)
-
-	u.Object, err = runtime.DefaultUnstructuredConverter.ToUnstructured(obj)
-	if err != nil {
-		return nil, fmt.Errorf("failed to convert to unstructured: %w", err)
-	}
-
-	gvk := u.GroupVersionKind()
-	if gvk.Group == "" || gvk.Kind == "" {
-		gvks, _, err := s.ObjectKinds(obj)
-		if err != nil {
-			return nil, fmt.Errorf("failed to convert to unstructured - unable to get GVK %w", err)
-		}
-		apiv, k := gvks[0].ToAPIVersionAndKind()
-		u.SetAPIVersion(apiv)
-		u.SetKind(k)
-	}
-	return &u, nil
-}

dynamic/fake/simple_test.go

@@ -21,7 +21,6 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/google/go-cmp/cmp"
 	"k8s.io/apimachinery/pkg/api/equality"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -304,166 +303,3 @@ func TestPatch(t *testing.T) {
 		t.Run(tc.name, tc.runner)
 	}
 }
-
-// This test ensures list works when the fake dynamic client is seeded with a typed scheme and
-// unstructured type fixtures
-func TestListWithUnstructuredObjectsAndTypedScheme(t *testing.T) {
-	gvr := schema.GroupVersionResource{Group: testGroup, Version: testVersion, Resource: testResource}
-	gvk := gvr.GroupVersion().WithKind(testKind)
-
-	listGVK := gvk
-	listGVK.Kind += "List"
-
-	u := unstructured.Unstructured{}
-	u.SetGroupVersionKind(gvk)
-	u.SetName("name")
-	u.SetNamespace("namespace")
-
-	typedScheme := runtime.NewScheme()
-	typedScheme.AddKnownTypeWithName(gvk, &mockResource{})
-	typedScheme.AddKnownTypeWithName(listGVK, &mockResourceList{})
-
-	client := NewSimpleDynamicClient(typedScheme, &u)
-	list, err := client.Resource(gvr).Namespace("namespace").List(context.Background(), metav1.ListOptions{})
-
-	if err != nil {
-		t.Error("error listing", err)
-	}
-
-	expectedList := &unstructured.UnstructuredList{}
-	expectedList.SetGroupVersionKind(listGVK)
-	expectedList.SetResourceVersion("") // by product of the fake setting resource version
-	expectedList.Items = append(expectedList.Items, u)
-
-	if diff := cmp.Diff(expectedList, list); diff != "" {
-		t.Fatal("unexpected diff (-want, +got): ", diff)
-	}
-}
-
-func TestListWithNoFixturesAndTypedScheme(t *testing.T) {
-	gvr := schema.GroupVersionResource{Group: testGroup, Version: testVersion, Resource: testResource}
-	gvk := gvr.GroupVersion().WithKind(testKind)
-
-	listGVK := gvk
-	listGVK.Kind += "List"
-
-	typedScheme := runtime.NewScheme()
-	typedScheme.AddKnownTypeWithName(gvk, &mockResource{})
-	typedScheme.AddKnownTypeWithName(listGVK, &mockResourceList{})
-
-	client := NewSimpleDynamicClient(typedScheme)
-	list, err := client.Resource(gvr).Namespace("namespace").List(context.Background(), metav1.ListOptions{})
-
-	if err != nil {
-		t.Error("error listing", err)
-	}
-
-	expectedList := &unstructured.UnstructuredList{}
-	expectedList.SetGroupVersionKind(listGVK)
-	expectedList.SetResourceVersion("") // by product of the fake setting resource version
-
-	if diff := cmp.Diff(expectedList, list); diff != "" {
-		t.Fatal("unexpected diff (-want, +got): ", diff)
-	}
-}
-
-// This test ensures list works when the dynamic client is seeded with an empty scheme and
-// unstructured typed fixtures
-func TestListWithNoScheme(t *testing.T) {
-	gvr := schema.GroupVersionResource{Group: testGroup, Version: testVersion, Resource: testResource}
-	gvk := gvr.GroupVersion().WithKind(testKind)
-
-	listGVK := gvk
-	listGVK.Kind += "List"
-
-	u := unstructured.Unstructured{}
-	u.SetGroupVersionKind(gvk)
-	u.SetName("name")
-	u.SetNamespace("namespace")
-
-	emptyScheme := runtime.NewScheme()
-
-	client := NewSimpleDynamicClient(emptyScheme, &u)
-	list, err := client.Resource(gvr).Namespace("namespace").List(context.Background(), metav1.ListOptions{})
-
-	if err != nil {
-		t.Error("error listing", err)
-	}
-
-	expectedList := &unstructured.UnstructuredList{}
-	expectedList.SetGroupVersionKind(listGVK)
-	expectedList.SetResourceVersion("") // by product of the fake setting resource version
-	expectedList.Items = append(expectedList.Items, u)
-
-	if diff := cmp.Diff(expectedList, list); diff != "" {
-		t.Fatal("unexpected diff (-want, +got): ", diff)
-	}
-}
-
-// This test ensures list works when the dynamic client is seeded with an empty scheme and
-// unstructured typed fixtures
-func TestListWithTypedFixtures(t *testing.T) {
-	gvr := schema.GroupVersionResource{Group: testGroup, Version: testVersion, Resource: testResource}
-	gvk := gvr.GroupVersion().WithKind(testKind)
-
-	listGVK := gvk
-	listGVK.Kind += "List"
-
-	r := mockResource{}
-	r.SetGroupVersionKind(gvk)
-	r.SetName("name")
-	r.SetNamespace("namespace")
-
-	u := unstructured.Unstructured{}
-	u.SetGroupVersionKind(r.GetObjectKind().GroupVersionKind())
-	u.SetName(r.GetName())
-	u.SetNamespace(r.GetNamespace())
-	// Needed see: https://github.com/kubernetes/kubernetes/issues/67610
-	unstructured.SetNestedField(u.Object, nil, "metadata", "creationTimestamp")
-
-	typedScheme := runtime.NewScheme()
-	typedScheme.AddKnownTypeWithName(gvk, &mockResource{})
-	typedScheme.AddKnownTypeWithName(listGVK, &mockResourceList{})
-
-	client := NewSimpleDynamicClient(typedScheme, &r)
-	list, err := client.Resource(gvr).Namespace("namespace").List(context.Background(), metav1.ListOptions{})
-
-	if err != nil {
-		t.Error("error listing", err)
-	}
-
-	expectedList := &unstructured.UnstructuredList{}
-	expectedList.SetGroupVersionKind(listGVK)
-	expectedList.SetResourceVersion("") // by product of the fake setting resource version
-	expectedList.Items = []unstructured.Unstructured{u}
-
-	if diff := cmp.Diff(expectedList, list); diff != "" {
-		t.Fatal("unexpected diff (-want, +got): ", diff)
-	}
-}
-
-type (
-	mockResource struct {
-		metav1.TypeMeta   `json:",inline"`
-		metav1.ObjectMeta `json:"metadata"`
-	}
-	mockResourceList struct {
-		metav1.TypeMeta `json:",inline"`
-		metav1.ListMeta `json:"metadata"`
-
-		Items []mockResource
-	}
-)
-
-func (l *mockResourceList) DeepCopyObject() runtime.Object {
-	o := *l
-	return &o
-}
-
-func (r *mockResource) DeepCopyObject() runtime.Object {
-	o := *r
-	return &o
-}
-
-var _ runtime.Object = (*mockResource)(nil)
-var _ runtime.Object = (*mockResourceList)(nil)

go.mod

@@ -26,14 +26,14 @@ require (
 	golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
 	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
-	k8s.io/api v0.20.11-rc.0
-	k8s.io/apimachinery v0.20.11-rc.0
+	k8s.io/api v0.20.10-rc.0
+	k8s.io/apimachinery v0.20.10-rc.0
 	k8s.io/klog/v2 v2.4.0
 	k8s.io/utils v0.0.0-20201110183641-67b214c5f920
 	sigs.k8s.io/yaml v1.2.0
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.20.11-rc.0
-	k8s.io/apimachinery => k8s.io/apimachinery v0.20.11-rc.0
+	k8s.io/api => k8s.io/api v0.20.10-rc.0
+	k8s.io/apimachinery => k8s.io/apimachinery v0.20.10-rc.0
 )

go.sum

@@ -425,10 +425,10 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-k8s.io/api v0.20.11-rc.0 h1:eqSkA2wntm3Eyjt3K7KGv+rWa1f8iGx0eTDrJOa88jg=
-k8s.io/api v0.20.11-rc.0/go.mod h1:YJswim3LqbBWkYyBRvtatBfMsQUC3I1OlBG9OGt8Aqg=
-k8s.io/apimachinery v0.20.11-rc.0 h1:266wHtxQDUkZWM/diFeVFH+gbibJCSFYC0asEQF0YA8=
-k8s.io/apimachinery v0.20.11-rc.0/go.mod h1:kQa//VOAwyVwJ2+L9kOREbsnryfsGSkSM1przND4+mw=
+k8s.io/api v0.20.10-rc.0 h1:Dzywi1gDFY6aHfFAKXMUxwf6kofn7sAZk9TyH3cjkiQ=
+k8s.io/api v0.20.10-rc.0/go.mod h1:kkNjbH1Wn07+8i4dG29JGg9SEJtgzdBONXN6E0p8lq0=
+k8s.io/apimachinery v0.20.10-rc.0 h1:Su9ZLaxqsBgP413gFrurTGjBN9LET/xvNsu0sZOHvsY=
+k8s.io/apimachinery v0.20.10-rc.0/go.mod h1:kQa//VOAwyVwJ2+L9kOREbsnryfsGSkSM1przND4+mw=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=