fix unit tests

Author: jcantrill

Makefile

@@ -11,6 +11,7 @@ export PATH:=$(GOBIN):$(PATH)
 
 include .bingo/Variables.mk
 
+export GOTOOLCHAIN=auto
 export GOROOT=$(shell go env GOROOT)
 export GOFLAGS=
 export GO111MODULE=on

internal/metrics/dashboard/dashboards_test.go

@@ -6,34 +6,43 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 )
 
 var _ = Describe("ReconcileForDashboards", func() {
 	var (
 		fakeClient client.Client
+		scheme     *runtime.Scheme
 
 		GetDashboard = func() *corev1.ConfigMap {
 			key := client.ObjectKeyFromObject(newDashboardConfigMap())
 			actual := &corev1.ConfigMap{}
 			Expect(fakeClient.Get(context.TODO(), key, actual)).To(Succeed(), "Exp the configmap to exist")
 			actual.ResourceVersion = ""
+			actual.TypeMeta = corev1.ConfigMap{}.TypeMeta
 			return actual
 		}
 
 		setup = func(cm *corev1.ConfigMap) {
 			if cm != nil {
-				fakeClient = fake.NewFakeClient(cm)
+				fakeClient = fake.NewClientBuilder().WithScheme(scheme).WithObjects(cm).Build()
+			} else {
+				fakeClient = fake.NewClientBuilder().WithScheme(scheme).Build()
 			}
 		}
 		exp     = newDashboardConfigMap()
 		initial *corev1.ConfigMap
 	)
 
 	BeforeEach(func() {
-		fakeClient = fake.NewFakeClient()
+		scheme = runtime.NewScheme()
+		Expect(corev1.AddToScheme(scheme)).To(Succeed())
+		fakeClient = fake.NewClientBuilder().WithScheme(scheme).Build()
 		initial = newDashboardConfigMap()
+		exp = newDashboardConfigMap()
+		exp.TypeMeta = corev1.ConfigMap{}.TypeMeta
 	})
 
 	Context("when the configmap does not exist", func() {

internal/reconcile/scc_test.go

@@ -7,6 +7,7 @@ import (
 	"github.com/openshift/cluster-logging-operator/internal/reconcile"
 	"github.com/openshift/cluster-logging-operator/internal/runtime"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	k8sruntime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
@@ -34,12 +35,15 @@ var _ = Describe("reconciling ", func() {
 
 	var _ = DescribeTable("SCC", func(initial *security.SecurityContextConstraints, desired security.SecurityContextConstraints) {
 
-		globalScheme := scheme.Scheme
+		globalScheme := k8sruntime.NewScheme()
+		Expect(scheme.AddToScheme(globalScheme)).To(Succeed())
 		Expect(security.Install(globalScheme)).To(Succeed())
 
-		k8sClient := fake.NewFakeClient()
+		var k8sClient client.Client
 		if initial != nil {
-			k8sClient = fake.NewFakeClient(initial)
+			k8sClient = fake.NewClientBuilder().WithScheme(globalScheme).WithObjects(initial).Build()
+		} else {
+			k8sClient = fake.NewClientBuilder().WithScheme(globalScheme).Build()
 		}
 		reader := k8sClient.(client.Reader)
 
@@ -51,6 +55,8 @@ var _ = Describe("reconciling ", func() {
 
 		act.ResourceVersion = "" //dont care here
 		desired.ResourceVersion = ""
+		act.TypeMeta = metav1.TypeMeta{} //dont care here
+		desired.TypeMeta = metav1.TypeMeta{}
 
 		Expect(cmp.Diff(act, &desired)).To(BeEmpty(), "Exp. the spec to be the same")
 		Expect(cmp.Diff(act, initial)).To(Not(BeEmpty()), "Exp. the spec to have been updated")