fix(controller-runtime): Adjust RESTClientForGVK function and cache.

The required fixes are the following:
 * The function RESTClientForGVK has introduced the
`forceDisableProtoBuf` field. The code base has been adjusted to set
this field as `false` where is used.

 * Fake client now strips the TypeMeta fields
kubernetes-sigs/controller-runtime#3229.
Therefore, it is required to adjust how the cache gets the `Kind` field,
otherwise, the field is empty and objects are not cached.

Signed-off-by: Javier Cano Cano <[email protected]>

Author: jcanocan

internal/common/cache.go

@@ -3,6 +3,7 @@ package common
 import (
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
 )
 
 type cacheKey struct {
@@ -35,8 +36,8 @@ func (v VersionCache) Contains(obj client.Object) bool {
 }
 
 func (v VersionCache) Add(obj client.Object) {
-	kind := obj.GetObjectKind().GroupVersionKind().Kind
-	if kind == "" {
+	gvk, _ := apiutil.GVKForObject(obj, Scheme)
+	if gvk.Kind == "" {
 		// Do not cache objects without kind
 		return
 	}
@@ -52,8 +53,9 @@ func (v VersionCache) RemoveObj(obj client.Object) {
 }
 
 func cacheKeyFromObj(obj client.Object) cacheKey {
+	gvk, _ := apiutil.GVKForObject(obj, Scheme)
 	return cacheKey{
-		Kind:      obj.GetObjectKind().GroupVersionKind().Kind,
+		Kind:      gvk.Kind,
 		Name:      obj.GetName(),
 		Namespace: obj.GetNamespace(),
 	}

internal/common/resource_test.go

@@ -2,10 +2,8 @@ package common
 
 import (
 	"context"
-
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-
 	libhandler "github.com/operator-framework/operator-lib/handler"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -304,10 +302,6 @@ func createOrUpdateTestResource(request *Request) (ReconcileResult, error) {
 
 func newTestResource(namespace string) *v1.Service {
 	return &v1.Service{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "Service",
-			APIVersion: "v1",
-		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "testservice",
 			Namespace: namespace,

internal/template-validator/virtinformers/informers.go

@@ -139,7 +139,7 @@ func restClientForObject(obj runtime.Object, restConfig *rest.Config, scheme *ru
 		return nil, err
 	}
 
-	restClient, err := apiutil.RESTClientForGVK(gvk, false, restConfig, serializer.NewCodecFactory(scheme), httpClient)
+	restClient, err := apiutil.RESTClientForGVK(gvk, false, false, restConfig, serializer.NewCodecFactory(scheme), httpClient)
 	if err != nil {
 		logger.Log.Error(err, "error creating client")
 		return nil, err

tests/tests_suite_test.go

@@ -464,7 +464,7 @@ func createSspListerWatcher(cfg *rest.Config) cache.ListerWatcherWithContext {
 	httpClient, err := rest.HTTPClientFor(cfg)
 	Expect(err).ToNot(HaveOccurred())
 
-	restClient, err := apiutil.RESTClientForGVK(sspGvk, false, cfg, serializer.NewCodecFactory(testScheme), httpClient)
+	restClient, err := apiutil.RESTClientForGVK(sspGvk, false, false, cfg, serializer.NewCodecFactory(testScheme), httpClient)
 	Expect(err).ToNot(HaveOccurred())
 
 	return cache.NewListWatchFromClient(restClient, "ssps", strategy.GetNamespace(), fields.Everything())