diff --git a/client/applyconfiguration/utils.go b/client/applyconfiguration/utils.go index fd87ac36..44a5e7aa 100644 --- a/client/applyconfiguration/utils.go +++ b/client/applyconfiguration/utils.go @@ -19,9 +19,10 @@ limitations under the License. package applyconfiguration import ( + schema "k8s.io/apimachinery/pkg/runtime/schema" + v1alpha1 "github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" codeflarev1alpha1 "github.com/project-codeflare/codeflare-operator/client/applyconfiguration/codeflare/v1alpha1" - schema "k8s.io/apimachinery/pkg/runtime/schema" ) // ForKind returns an apply configuration type for the given GroupVersionKind, or nil if no diff --git a/client/clientset/versioned/clientset.go b/client/clientset/versioned/clientset.go index 1d91a664..ca6d68fb 100644 --- a/client/clientset/versioned/clientset.go +++ b/client/clientset/versioned/clientset.go @@ -22,10 +22,11 @@ import ( "fmt" "net/http" - codeflarev1alpha1 "github.com/project-codeflare/codeflare-operator/client/clientset/versioned/typed/codeflare/v1alpha1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" + + codeflarev1alpha1 "github.com/project-codeflare/codeflare-operator/client/clientset/versioned/typed/codeflare/v1alpha1" ) type Interface interface { diff --git a/client/clientset/versioned/fake/clientset_generated.go b/client/clientset/versioned/fake/clientset_generated.go index fbbb80dc..b3e9cbb9 100644 --- a/client/clientset/versioned/fake/clientset_generated.go +++ b/client/clientset/versioned/fake/clientset_generated.go @@ -19,14 +19,15 @@ limitations under the License. package fake import ( - clientset "github.com/project-codeflare/codeflare-operator/client/clientset/versioned" - codeflarev1alpha1 "github.com/project-codeflare/codeflare-operator/client/clientset/versioned/typed/codeflare/v1alpha1" - fakecodeflarev1alpha1 "github.com/project-codeflare/codeflare-operator/client/clientset/versioned/typed/codeflare/v1alpha1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" fakediscovery "k8s.io/client-go/discovery/fake" "k8s.io/client-go/testing" + + clientset "github.com/project-codeflare/codeflare-operator/client/clientset/versioned" + codeflarev1alpha1 "github.com/project-codeflare/codeflare-operator/client/clientset/versioned/typed/codeflare/v1alpha1" + fakecodeflarev1alpha1 "github.com/project-codeflare/codeflare-operator/client/clientset/versioned/typed/codeflare/v1alpha1/fake" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/client/clientset/versioned/fake/register.go b/client/clientset/versioned/fake/register.go index 4ff1cb3a..05244eb5 100644 --- a/client/clientset/versioned/fake/register.go +++ b/client/clientset/versioned/fake/register.go @@ -19,12 +19,13 @@ limitations under the License. package fake import ( - codeflarev1alpha1 "github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" + + codeflarev1alpha1 "github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" ) var scheme = runtime.NewScheme() diff --git a/client/clientset/versioned/scheme/register.go b/client/clientset/versioned/scheme/register.go index 743173ce..1a52d7da 100644 --- a/client/clientset/versioned/scheme/register.go +++ b/client/clientset/versioned/scheme/register.go @@ -19,12 +19,13 @@ limitations under the License. package scheme import ( - codeflarev1alpha1 "github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" + + codeflarev1alpha1 "github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" ) var Scheme = runtime.NewScheme() diff --git a/client/clientset/versioned/typed/codeflare/v1alpha1/codeflare_client.go b/client/clientset/versioned/typed/codeflare/v1alpha1/codeflare_client.go index 4b93fe6f..bbe38940 100644 --- a/client/clientset/versioned/typed/codeflare/v1alpha1/codeflare_client.go +++ b/client/clientset/versioned/typed/codeflare/v1alpha1/codeflare_client.go @@ -21,9 +21,10 @@ package v1alpha1 import ( "net/http" + rest "k8s.io/client-go/rest" + v1alpha1 "github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" "github.com/project-codeflare/codeflare-operator/client/clientset/versioned/scheme" - rest "k8s.io/client-go/rest" ) type CodeflareV1alpha1Interface interface { diff --git a/client/clientset/versioned/typed/codeflare/v1alpha1/fake/fake_codeflare_client.go b/client/clientset/versioned/typed/codeflare/v1alpha1/fake/fake_codeflare_client.go index 9e234aca..0a18ef5d 100644 --- a/client/clientset/versioned/typed/codeflare/v1alpha1/fake/fake_codeflare_client.go +++ b/client/clientset/versioned/typed/codeflare/v1alpha1/fake/fake_codeflare_client.go @@ -19,9 +19,10 @@ limitations under the License. package fake import ( - v1alpha1 "github.com/project-codeflare/codeflare-operator/client/clientset/versioned/typed/codeflare/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" + + v1alpha1 "github.com/project-codeflare/codeflare-operator/client/clientset/versioned/typed/codeflare/v1alpha1" ) type FakeCodeflareV1alpha1 struct { diff --git a/client/clientset/versioned/typed/codeflare/v1alpha1/fake/fake_instascale.go b/client/clientset/versioned/typed/codeflare/v1alpha1/fake/fake_instascale.go index 8abbdc79..fd6bced0 100644 --- a/client/clientset/versioned/typed/codeflare/v1alpha1/fake/fake_instascale.go +++ b/client/clientset/versioned/typed/codeflare/v1alpha1/fake/fake_instascale.go @@ -23,13 +23,14 @@ import ( json "encoding/json" "fmt" - v1alpha1 "github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" - codeflarev1alpha1 "github.com/project-codeflare/codeflare-operator/client/applyconfiguration/codeflare/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + + v1alpha1 "github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" + codeflarev1alpha1 "github.com/project-codeflare/codeflare-operator/client/applyconfiguration/codeflare/v1alpha1" ) // FakeInstaScales implements InstaScaleInterface diff --git a/client/clientset/versioned/typed/codeflare/v1alpha1/fake/fake_mcad.go b/client/clientset/versioned/typed/codeflare/v1alpha1/fake/fake_mcad.go index 027f2817..a06c229a 100644 --- a/client/clientset/versioned/typed/codeflare/v1alpha1/fake/fake_mcad.go +++ b/client/clientset/versioned/typed/codeflare/v1alpha1/fake/fake_mcad.go @@ -23,13 +23,14 @@ import ( json "encoding/json" "fmt" - v1alpha1 "github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" - codeflarev1alpha1 "github.com/project-codeflare/codeflare-operator/client/applyconfiguration/codeflare/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + + v1alpha1 "github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" + codeflarev1alpha1 "github.com/project-codeflare/codeflare-operator/client/applyconfiguration/codeflare/v1alpha1" ) // FakeMCADs implements MCADInterface diff --git a/client/clientset/versioned/typed/codeflare/v1alpha1/instascale.go b/client/clientset/versioned/typed/codeflare/v1alpha1/instascale.go index c146a98d..73cc95d3 100644 --- a/client/clientset/versioned/typed/codeflare/v1alpha1/instascale.go +++ b/client/clientset/versioned/typed/codeflare/v1alpha1/instascale.go @@ -24,13 +24,14 @@ import ( "fmt" "time" - v1alpha1 "github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" - codeflarev1alpha1 "github.com/project-codeflare/codeflare-operator/client/applyconfiguration/codeflare/v1alpha1" - scheme "github.com/project-codeflare/codeflare-operator/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + + v1alpha1 "github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" + codeflarev1alpha1 "github.com/project-codeflare/codeflare-operator/client/applyconfiguration/codeflare/v1alpha1" + scheme "github.com/project-codeflare/codeflare-operator/client/clientset/versioned/scheme" ) // InstaScalesGetter has a method to return a InstaScaleInterface. diff --git a/client/clientset/versioned/typed/codeflare/v1alpha1/mcad.go b/client/clientset/versioned/typed/codeflare/v1alpha1/mcad.go index 7d70e403..23587f12 100644 --- a/client/clientset/versioned/typed/codeflare/v1alpha1/mcad.go +++ b/client/clientset/versioned/typed/codeflare/v1alpha1/mcad.go @@ -24,13 +24,14 @@ import ( "fmt" "time" - v1alpha1 "github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" - codeflarev1alpha1 "github.com/project-codeflare/codeflare-operator/client/applyconfiguration/codeflare/v1alpha1" - scheme "github.com/project-codeflare/codeflare-operator/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + + v1alpha1 "github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" + codeflarev1alpha1 "github.com/project-codeflare/codeflare-operator/client/applyconfiguration/codeflare/v1alpha1" + scheme "github.com/project-codeflare/codeflare-operator/client/clientset/versioned/scheme" ) // MCADsGetter has a method to return a MCADInterface. diff --git a/client/informer/externalversions/codeflare/v1alpha1/instascale.go b/client/informer/externalversions/codeflare/v1alpha1/instascale.go index 70346e65..79d6c7ac 100644 --- a/client/informer/externalversions/codeflare/v1alpha1/instascale.go +++ b/client/informer/externalversions/codeflare/v1alpha1/instascale.go @@ -22,14 +22,15 @@ import ( "context" time "time" - codeflarev1alpha1 "github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" - versioned "github.com/project-codeflare/codeflare-operator/client/clientset/versioned" - internalinterfaces "github.com/project-codeflare/codeflare-operator/client/informer/externalversions/internalinterfaces" - v1alpha1 "github.com/project-codeflare/codeflare-operator/client/listers/codeflare/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + + codeflarev1alpha1 "github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" + versioned "github.com/project-codeflare/codeflare-operator/client/clientset/versioned" + internalinterfaces "github.com/project-codeflare/codeflare-operator/client/informer/externalversions/internalinterfaces" + v1alpha1 "github.com/project-codeflare/codeflare-operator/client/listers/codeflare/v1alpha1" ) // InstaScaleInformer provides access to a shared informer and lister for diff --git a/client/informer/externalversions/codeflare/v1alpha1/mcad.go b/client/informer/externalversions/codeflare/v1alpha1/mcad.go index 2fe4d5a3..4cda692b 100644 --- a/client/informer/externalversions/codeflare/v1alpha1/mcad.go +++ b/client/informer/externalversions/codeflare/v1alpha1/mcad.go @@ -22,14 +22,15 @@ import ( "context" time "time" - codeflarev1alpha1 "github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" - versioned "github.com/project-codeflare/codeflare-operator/client/clientset/versioned" - internalinterfaces "github.com/project-codeflare/codeflare-operator/client/informer/externalversions/internalinterfaces" - v1alpha1 "github.com/project-codeflare/codeflare-operator/client/listers/codeflare/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + + codeflarev1alpha1 "github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" + versioned "github.com/project-codeflare/codeflare-operator/client/clientset/versioned" + internalinterfaces "github.com/project-codeflare/codeflare-operator/client/informer/externalversions/internalinterfaces" + v1alpha1 "github.com/project-codeflare/codeflare-operator/client/listers/codeflare/v1alpha1" ) // MCADInformer provides access to a shared informer and lister for diff --git a/client/informer/externalversions/factory.go b/client/informer/externalversions/factory.go index e1f7f14a..0d3733cb 100644 --- a/client/informer/externalversions/factory.go +++ b/client/informer/externalversions/factory.go @@ -23,13 +23,14 @@ import ( sync "sync" time "time" - versioned "github.com/project-codeflare/codeflare-operator/client/clientset/versioned" - codeflare "github.com/project-codeflare/codeflare-operator/client/informer/externalversions/codeflare" - internalinterfaces "github.com/project-codeflare/codeflare-operator/client/informer/externalversions/internalinterfaces" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" + + versioned "github.com/project-codeflare/codeflare-operator/client/clientset/versioned" + codeflare "github.com/project-codeflare/codeflare-operator/client/informer/externalversions/codeflare" + internalinterfaces "github.com/project-codeflare/codeflare-operator/client/informer/externalversions/internalinterfaces" ) // SharedInformerOption defines the functional option type for SharedInformerFactory. diff --git a/client/informer/externalversions/generic.go b/client/informer/externalversions/generic.go index 9eea54eb..6fa936ba 100644 --- a/client/informer/externalversions/generic.go +++ b/client/informer/externalversions/generic.go @@ -21,9 +21,10 @@ package externalversions import ( "fmt" - v1alpha1 "github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" + + v1alpha1 "github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" ) // GenericInformer is type of SharedIndexInformer which will locate and delegate to other diff --git a/client/informer/externalversions/internalinterfaces/factory_interfaces.go b/client/informer/externalversions/internalinterfaces/factory_interfaces.go index b380f668..0e89555b 100644 --- a/client/informer/externalversions/internalinterfaces/factory_interfaces.go +++ b/client/informer/externalversions/internalinterfaces/factory_interfaces.go @@ -21,10 +21,11 @@ package internalinterfaces import ( time "time" - versioned "github.com/project-codeflare/codeflare-operator/client/clientset/versioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" + + versioned "github.com/project-codeflare/codeflare-operator/client/clientset/versioned" ) // NewInformerFunc takes versioned.Interface and time.Duration to return a SharedIndexInformer. diff --git a/client/listers/codeflare/v1alpha1/instascale.go b/client/listers/codeflare/v1alpha1/instascale.go index ee5c2284..c2519af5 100644 --- a/client/listers/codeflare/v1alpha1/instascale.go +++ b/client/listers/codeflare/v1alpha1/instascale.go @@ -19,10 +19,11 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + + v1alpha1 "github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" ) // InstaScaleLister helps list InstaScales. diff --git a/client/listers/codeflare/v1alpha1/mcad.go b/client/listers/codeflare/v1alpha1/mcad.go index 8ac44bfc..e2f47832 100644 --- a/client/listers/codeflare/v1alpha1/mcad.go +++ b/client/listers/codeflare/v1alpha1/mcad.go @@ -19,10 +19,11 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + + v1alpha1 "github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" ) // MCADLister helps list MCADs. diff --git a/controllers/config/manifest.go b/controllers/config/manifest.go index 2360100d..bfff07c9 100644 --- a/controllers/config/manifest.go +++ b/controllers/config/manifest.go @@ -4,6 +4,7 @@ import ( "github.com/go-logr/logr" mfc "github.com/manifestival/controller-runtime-client" mf "github.com/manifestival/manifestival" + "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/controllers/instascale_controller.go b/controllers/instascale_controller.go index 80e38a53..5fba37e9 100644 --- a/controllers/instascale_controller.go +++ b/controllers/instascale_controller.go @@ -21,6 +21,9 @@ import ( "fmt" "path" + "github.com/go-logr/logr" + mf "github.com/manifestival/manifestival" + appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" authv1 "k8s.io/api/rbac/v1" @@ -28,7 +31,6 @@ import ( apierrs "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" - ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" @@ -36,9 +38,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - "github.com/go-logr/logr" - mf "github.com/manifestival/manifestival" - "github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" "github.com/project-codeflare/codeflare-operator/controllers/config" "github.com/project-codeflare/codeflare-operator/controllers/util" diff --git a/controllers/instascale_controller_test.go b/controllers/instascale_controller_test.go index 4071c515..1e880190 100644 --- a/controllers/instascale_controller_test.go +++ b/controllers/instascale_controller_test.go @@ -3,11 +3,10 @@ package controllers import ( "context" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - mfc "github.com/manifestival/controller-runtime-client" mf "github.com/manifestival/manifestival" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" codeflarev1alpha1 "github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" ) diff --git a/controllers/mcad_controller.go b/controllers/mcad_controller.go index 01f83060..906bb7bc 100644 --- a/controllers/mcad_controller.go +++ b/controllers/mcad_controller.go @@ -29,7 +29,6 @@ import ( apierrs "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" - ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" diff --git a/controllers/mcad_controller_test.go b/controllers/mcad_controller_test.go index 35e892c3..7ffd30cc 100644 --- a/controllers/mcad_controller_test.go +++ b/controllers/mcad_controller_test.go @@ -3,11 +3,10 @@ package controllers import ( "context" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - mfc "github.com/manifestival/controller-runtime-client" mf "github.com/manifestival/manifestival" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" codeflarev1alpha1 "github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" ) diff --git a/controllers/mcad_params.go b/controllers/mcad_params.go index 5992bede..846e4c73 100644 --- a/controllers/mcad_params.go +++ b/controllers/mcad_params.go @@ -18,6 +18,7 @@ package controllers import ( mf "github.com/manifestival/manifestival" + mcadv1alpha1 "github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" ) diff --git a/controllers/suite_test.go b/controllers/suite_test.go index 07442278..5ee347ba 100644 --- a/controllers/suite_test.go +++ b/controllers/suite_test.go @@ -22,10 +22,9 @@ import ( "testing" "time" + mf "github.com/manifestival/manifestival" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - - mf "github.com/manifestival/manifestival" "go.uber.org/zap/zapcore" appsv1 "k8s.io/api/apps/v1" @@ -36,7 +35,6 @@ import ( "k8s.io/client-go/kubernetes/scheme" clientgoscheme "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" - ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/envtest" diff --git a/main.go b/main.go index 5358e04b..51d4dbc9 100644 --- a/main.go +++ b/main.go @@ -23,20 +23,18 @@ import ( "go.uber.org/zap/zapcore" - // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) - // to ensure that exec-entrypoint and run can make use of them. - _ "k8s.io/client-go/plugin/pkg/client/auth" - "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" - + _ "k8s.io/client-go/plugin/pkg/client/auth" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/healthz" "sigs.k8s.io/controller-runtime/pkg/log/zap" codeflarev1alpha1 "github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" "github.com/project-codeflare/codeflare-operator/controllers" + // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) + // to ensure that exec-entrypoint and run can make use of them. // +kubebuilder:scaffold:imports ) diff --git a/test/e2e/mnist_pytorch_mcad_job_test.go b/test/e2e/mnist_pytorch_mcad_job_test.go index 168c7b13..88eca341 100644 --- a/test/e2e/mnist_pytorch_mcad_job_test.go +++ b/test/e2e/mnist_pytorch_mcad_job_test.go @@ -20,6 +20,7 @@ import ( "testing" . "github.com/onsi/gomega" + mcadv1beta1 "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" @@ -27,7 +28,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" . "github.com/project-codeflare/codeflare-operator/test/support" - mcadv1beta1 "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1" ) // Trains the MNIST dataset as a batch Job managed by MCAD, and asserts successful completion of the training job. diff --git a/test/e2e/mnist_raycluster_sdk_test.go b/test/e2e/mnist_raycluster_sdk_test.go index e8bb1f5c..56385b8f 100644 --- a/test/e2e/mnist_raycluster_sdk_test.go +++ b/test/e2e/mnist_raycluster_sdk_test.go @@ -20,16 +20,15 @@ import ( "testing" . "github.com/onsi/gomega" + mcadv1beta1 "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1" + rayv1alpha1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1alpha1" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - rayv1alpha1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1alpha1" - . "github.com/project-codeflare/codeflare-operator/test/support" - mcadv1beta1 "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1" ) // Creates a Ray cluster, and trains the MNIST dataset using the CodeFlare SDK. diff --git a/test/e2e/mnist_rayjob_mcad_raycluster_test.go b/test/e2e/mnist_rayjob_mcad_raycluster_test.go index 958b3047..72645d5b 100644 --- a/test/e2e/mnist_rayjob_mcad_raycluster_test.go +++ b/test/e2e/mnist_rayjob_mcad_raycluster_test.go @@ -21,14 +21,14 @@ import ( "testing" . "github.com/onsi/gomega" + mcadv1beta1 "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1" + rayv1alpha1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1alpha1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" . "github.com/project-codeflare/codeflare-operator/test/support" - mcadv1beta1 "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1" - rayv1alpha1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1alpha1" ) // Trains the MNIST dataset as a RayJob, executed by a Ray cluster managed by MCAD, diff --git a/test/support/client.go b/test/support/client.go index 73931d64..c3c4433e 100644 --- a/test/support/client.go +++ b/test/support/client.go @@ -17,18 +17,18 @@ limitations under the License. package support import ( - // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) - // to ensure that exec-entrypoint and run can make use of them. - _ "k8s.io/client-go/plugin/pkg/client/auth" + mcadclient "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/client/clientset/controller-versioned" + rayclient "github.com/ray-project/kuberay/ray-operator/pkg/client/clientset/versioned" "k8s.io/client-go/kubernetes" + _ "k8s.io/client-go/plugin/pkg/client/auth" "k8s.io/client-go/tools/clientcmd" routev1 "github.com/openshift/client-go/route/clientset/versioned" codeflareclient "github.com/project-codeflare/codeflare-operator/client/clientset/versioned" - mcadclient "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/client/clientset/controller-versioned" - rayclient "github.com/ray-project/kuberay/ray-operator/pkg/client/clientset/versioned" + // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) + // to ensure that exec-entrypoint and run can make use of them. ) type Client interface {