Merge pull request kubernetes-sigs#2267 from k8s-infra-cherrypick-robot/cherry-pick-2256-to-release-0.14

k8s-ci-robot · web-flow · commit d9f8c4755c3f · 2023-04-10T07:27:16.000-07:00
[release-0.14] 🐛 type print will always &lt;nil&gt;
diff --git a/pkg/cache/internal/cache_reader.go b/pkg/cache/internal/cache_reader.go
@@ -27,9 +27,9 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/tools/cache"
-	"sigs.k8s.io/controller-runtime/pkg/internal/field/selector"
 
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/internal/field/selector"
 )
 
 // CacheReader is a client.Reader.
@@ -147,7 +147,7 @@ func (c *CacheReader) List(_ context.Context, out client.ObjectList, opts ...cli
 		}
 		obj, isObj := item.(runtime.Object)
 		if !isObj {
-			return fmt.Errorf("cache contained %T, which is not an Object", obj)
+			return fmt.Errorf("cache contained %T, which is not an Object", item)
 		}
 		meta, err := apimeta.Accessor(obj)
 		if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,9 @@ import (`
`27`	`27`	`"k8s.io/apimachinery/pkg/runtime"`
`28`	`28`	`"k8s.io/apimachinery/pkg/runtime/schema"`
`29`	`29`	`"k8s.io/client-go/tools/cache"`
`30`		`- "sigs.k8s.io/controller-runtime/pkg/internal/field/selector"`
`31`	`30`
`32`	`31`	`"sigs.k8s.io/controller-runtime/pkg/client"`
	`32`	`+ "sigs.k8s.io/controller-runtime/pkg/internal/field/selector"`
`33`	`33`	`)`
`34`	`34`
`35`	`35`	`// CacheReader is a client.Reader.`
`@@ -147,7 +147,7 @@ func (c *CacheReader) List(_ context.Context, out client.ObjectList, opts ...cli`
`147`	`147`	`}`
`148`	`148`	`obj, isObj := item.(runtime.Object)`
`149`	`149`	`if !isObj {`
`150`		`- return fmt.Errorf("cache contained %T, which is not an Object", obj)`
	`150`	`+ return fmt.Errorf("cache contained %T, which is not an Object", item)`
`151`	`151`	`}`
`152`	`152`	`meta, err := apimeta.Accessor(obj)`
`153`	`153`	`if err != nil {`