fix test

statnett · May 27, 2023 · 5c41724 · 5c41724
1 parent de5b433
commit 5c41724
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/internal/resources/mapper_test.go b/internal/resources/mapper_test.go
@@ -14,7 +14,7 @@ var _ = Describe("ResourceKindMapper", func() {
 	})
 
 	It("should map GRs to GVKs", func() {
-		kinds, err := mapper.NamespacedKindsForResources("deployments.apps", "jobs.batch")
+		kinds, err := mapper.NamespacedKindsForResources("deployments", "jobs")
 		Expect(err).ToNot(HaveOccurred())
 		expectedGVKs := []schema.GroupVersionKind{
 			{Group: "apps", Version: "v1", Kind: "Deployment"},

diff --git a/internal/resources/suite_test.go b/internal/resources/suite_test.go
@@ -7,11 +7,10 @@ import (
 	. "github.com/onsi/gomega"
 	appsv1 "k8s.io/api/apps/v1"
 	batchv1 "k8s.io/api/batch/v1"
-	"k8s.io/client-go/discovery"
-	memcached "k8s.io/client-go/discovery/cached/memory"
 	"k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/client-go/restmapper"
+	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 	"sigs.k8s.io/controller-runtime/pkg/envtest/komega"
 
@@ -38,8 +37,11 @@ var _ = BeforeSuite(func() {
 	Expect(appsv1.AddToScheme(scheme.Scheme)).To(Succeed())
 	Expect(batchv1.AddToScheme(scheme.Scheme)).To(Succeed())
 
-	discoveryClient := memcached.NewMemCacheClient(discovery.NewDiscoveryClientForConfigOrDie(restCfg))
-	mapper := restmapper.NewDeferredDiscoveryRESTMapper(discoveryClient)
+	httpClient, err := rest.HTTPClientFor(restCfg)
+	Expect(err).NotTo(HaveOccurred())
+
+	mapper, err := apiutil.NewDiscoveryRESTMapper(restCfg, httpClient)
+	Expect(err).NotTo(HaveOccurred())
 
 	k8sClient, err = client.New(restCfg, client.Options{Scheme: scheme.Scheme, Mapper: mapper})
 	Expect(err).NotTo(HaveOccurred())