@@ -22,15 +22,13 @@ import (
2222
2323 . "github.com/onsi/ginkgo/v2"
2424 . "github.com/onsi/gomega"
25+ batchv1 "k8s.io/api/batch/v1"
2526 corev1 "k8s.io/api/core/v1"
27+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2628 "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
2729 "k8s.io/apimachinery/pkg/runtime"
2830 "k8s.io/apimachinery/pkg/runtime/schema"
2931 "sigs.k8s.io/controller-runtime/pkg/client"
30- "sigs.k8s.io/controller-runtime/pkg/scheme"
31-
32- batchv1 "k8s.io/api/batch/v1"
33- metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3432
3533 crFake "sigs.k8s.io/controller-runtime/pkg/client/fake"
3634)
@@ -631,11 +629,17 @@ func createDatedResources() []client.Object {
631629// createSchemes is a helper function to set up the schemes needed to run
632630// our tests utilizing controller-runtime's fake client
633631func createSchemes () (* runtime.Scheme , error ) {
634- corev1SchemeBuilder := & scheme.Builder {GroupVersion : corev1 .SchemeGroupVersion }
635- corev1SchemeBuilder .Register (& corev1.Pod {}, & corev1.PodList {})
632+ corev1SchemeBuilder := runtime .NewSchemeBuilder (func (scheme * runtime.Scheme ) error {
633+ scheme .AddKnownTypes (corev1 .SchemeGroupVersion , & corev1.Pod {}, & corev1.PodList {})
634+ metav1 .AddToGroupVersion (scheme , corev1 .SchemeGroupVersion )
635+ return nil
636+ })
636637
637- batchv1SchemeBuilder := & scheme.Builder {GroupVersion : batchv1 .SchemeGroupVersion }
638- batchv1SchemeBuilder .Register (& batchv1.Job {}, & batchv1.JobList {})
638+ batchv1SchemeBuilder := runtime .NewSchemeBuilder (func (scheme * runtime.Scheme ) error {
639+ scheme .AddKnownTypes (batchv1 .SchemeGroupVersion , & batchv1.Job {}, & batchv1.JobList {})
640+ metav1 .AddToGroupVersion (scheme , batchv1 .SchemeGroupVersion )
641+ return nil
642+ })
639643
640644 outScheme := runtime .NewScheme ()
641645
0 commit comments