diff --git a/.github/workflows/pre.yml b/.github/workflows/pre.yml index efb63158e..fe44be40e 100644 --- a/.github/workflows/pre.yml +++ b/.github/workflows/pre.yml @@ -29,19 +29,10 @@ jobs: go-version: ${{ env.GO_VERSION }} - name: verify run: make verify - - verify-deps: - name: verify-deps - runs-on: ubuntu-latest - steps: - - name: checkout code - uses: actions/checkout@v3 - - name: install Go - uses: actions/setup-go@v3 - with: - go-version: ${{ env.GO_VERSION }} - name: verify-deps run: make verify-deps + - name: verify-fmt-imports + run: make verify-fmt-imports build: name: build diff --git a/Makefile b/Makefile index b7e8faa5a..4d3b5828a 100644 --- a/Makefile +++ b/Makefile @@ -68,6 +68,21 @@ verify-gocilint: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.45.2 golangci-lint run --timeout=3m --modules-download-mode vendor ./... +install-golang-gci: + go install github.com/daixiang0/gci@v0.10.1 + +fmt-imports: install-golang-gci + gci write --skip-generated -s standard -s default -s "prefix(open-cluster-management.io)" -s "prefix(open-cluster-management.io/ocm)" cmd pkg test dependencymagnet + +verify-fmt-imports: install-golang-gci + @output=$$(gci diff --skip-generated -s standard -s default -s "prefix(open-cluster-management.io)" -s "prefix(open-cluster-management.io/ocm)" cmd pkg test dependencymagnet); \ + if [ -n "$$output" ]; then \ + echo "Diff output is not empty: $$output"; \ + exit 1; \ + else \ + echo "Diff output is empty"; \ + fi + verify: verify-crds ensure-operator-sdk: diff --git a/cmd/placement/main.go b/cmd/placement/main.go index c1d2f7322..15e00bbd4 100644 --- a/cmd/placement/main.go +++ b/cmd/placement/main.go @@ -4,16 +4,15 @@ import ( goflag "flag" "fmt" "math/rand" - "open-cluster-management.io/ocm/pkg/cmd/hub" "os" "time" "github.com/spf13/cobra" "github.com/spf13/pflag" - utilflag "k8s.io/component-base/cli/flag" "k8s.io/component-base/logs" + "open-cluster-management.io/ocm/pkg/cmd/hub" "open-cluster-management.io/ocm/pkg/version" ) diff --git a/cmd/registration-operator/main.go b/cmd/registration-operator/main.go index 8cccbcd76..b69f843bb 100644 --- a/cmd/registration-operator/main.go +++ b/cmd/registration-operator/main.go @@ -4,17 +4,16 @@ import ( goflag "flag" "fmt" "math/rand" - "open-cluster-management.io/ocm/pkg/cmd/hub" - "open-cluster-management.io/ocm/pkg/cmd/spoke" "os" "time" "github.com/spf13/cobra" "github.com/spf13/pflag" - utilflag "k8s.io/component-base/cli/flag" "k8s.io/component-base/logs" + "open-cluster-management.io/ocm/pkg/cmd/hub" + "open-cluster-management.io/ocm/pkg/cmd/spoke" "open-cluster-management.io/ocm/pkg/version" ) diff --git a/cmd/registration/main.go b/cmd/registration/main.go index 2eec834de..cbff78fe2 100644 --- a/cmd/registration/main.go +++ b/cmd/registration/main.go @@ -4,17 +4,16 @@ import ( goflag "flag" "fmt" "math/rand" - "open-cluster-management.io/ocm/pkg/cmd/hub" - "open-cluster-management.io/ocm/pkg/cmd/spoke" "os" "time" "github.com/spf13/cobra" "github.com/spf13/pflag" - utilflag "k8s.io/component-base/cli/flag" "k8s.io/component-base/logs" + "open-cluster-management.io/ocm/pkg/cmd/hub" + "open-cluster-management.io/ocm/pkg/cmd/spoke" "open-cluster-management.io/ocm/pkg/cmd/webhook" "open-cluster-management.io/ocm/pkg/version" ) diff --git a/cmd/work/main.go b/cmd/work/main.go index 6b8afc591..a7a467272 100644 --- a/cmd/work/main.go +++ b/cmd/work/main.go @@ -4,17 +4,16 @@ import ( goflag "flag" "fmt" "math/rand" - "open-cluster-management.io/ocm/pkg/cmd/hub" - "open-cluster-management.io/ocm/pkg/cmd/spoke" "os" "time" "github.com/spf13/cobra" "github.com/spf13/pflag" - utilflag "k8s.io/component-base/cli/flag" "k8s.io/component-base/logs" + "open-cluster-management.io/ocm/pkg/cmd/hub" + "open-cluster-management.io/ocm/pkg/cmd/spoke" "open-cluster-management.io/ocm/pkg/cmd/webhook" "open-cluster-management.io/ocm/pkg/version" ) diff --git a/dependencymagnet/doc.go b/dependencymagnet/doc.go index 6bc698f28..516a5f98b 100644 --- a/dependencymagnet/doc.go +++ b/dependencymagnet/doc.go @@ -7,6 +7,7 @@ package dependencymagnet import ( _ "github.com/openshift/build-machinery-go" + _ "open-cluster-management.io/api/addon/v1alpha1" _ "open-cluster-management.io/api/cluster/v1" _ "open-cluster-management.io/api/cluster/v1alpha1" diff --git a/pkg/cmd/hub/operator.go b/pkg/cmd/hub/operator.go index fd2862040..3f58e3dfb 100644 --- a/pkg/cmd/hub/operator.go +++ b/pkg/cmd/hub/operator.go @@ -1,9 +1,8 @@ package hub import ( - "github.com/spf13/cobra" - "github.com/openshift/library-go/pkg/controller/controllercmd" + "github.com/spf13/cobra" "open-cluster-management.io/ocm/pkg/operator/operators/clustermanager" "open-cluster-management.io/ocm/pkg/version" diff --git a/pkg/cmd/hub/placement.go b/pkg/cmd/hub/placement.go index 1f3a9197a..fdb370b4b 100644 --- a/pkg/cmd/hub/placement.go +++ b/pkg/cmd/hub/placement.go @@ -1,9 +1,8 @@ package hub import ( - "github.com/spf13/cobra" - "github.com/openshift/library-go/pkg/controller/controllercmd" + "github.com/spf13/cobra" controllers "open-cluster-management.io/ocm/pkg/placement/controllers" "open-cluster-management.io/ocm/pkg/version" diff --git a/pkg/cmd/hub/registration.go b/pkg/cmd/hub/registration.go index e4f743f51..00243bc29 100644 --- a/pkg/cmd/hub/registration.go +++ b/pkg/cmd/hub/registration.go @@ -3,9 +3,8 @@ package hub import ( "time" - "github.com/spf13/cobra" - "github.com/openshift/library-go/pkg/controller/controllercmd" + "github.com/spf13/cobra" "open-cluster-management.io/ocm/pkg/registration/hub" "open-cluster-management.io/ocm/pkg/version" diff --git a/pkg/cmd/hub/work.go b/pkg/cmd/hub/work.go index 64e48ef17..02ddd8e97 100644 --- a/pkg/cmd/hub/work.go +++ b/pkg/cmd/hub/work.go @@ -1,9 +1,8 @@ package hub import ( - "github.com/spf13/cobra" - "github.com/openshift/library-go/pkg/controller/controllercmd" + "github.com/spf13/cobra" "open-cluster-management.io/ocm/pkg/version" "open-cluster-management.io/ocm/pkg/work/hub" diff --git a/pkg/cmd/spoke/operator.go b/pkg/cmd/spoke/operator.go index d52d73529..878529897 100644 --- a/pkg/cmd/spoke/operator.go +++ b/pkg/cmd/spoke/operator.go @@ -1,9 +1,8 @@ package spoke import ( - "github.com/spf13/cobra" - "github.com/openshift/library-go/pkg/controller/controllercmd" + "github.com/spf13/cobra" "open-cluster-management.io/ocm/pkg/operator/operators/klusterlet" "open-cluster-management.io/ocm/pkg/version" diff --git a/pkg/cmd/spoke/registration.go b/pkg/cmd/spoke/registration.go index 3ac46b150..618f5ed66 100644 --- a/pkg/cmd/spoke/registration.go +++ b/pkg/cmd/spoke/registration.go @@ -1,9 +1,8 @@ package spoke import ( - "github.com/spf13/cobra" - "github.com/openshift/library-go/pkg/controller/controllercmd" + "github.com/spf13/cobra" "open-cluster-management.io/ocm/pkg/registration/spoke" "open-cluster-management.io/ocm/pkg/version" diff --git a/pkg/cmd/spoke/work.go b/pkg/cmd/spoke/work.go index 7a167e32d..3e4a385d6 100644 --- a/pkg/cmd/spoke/work.go +++ b/pkg/cmd/spoke/work.go @@ -1,9 +1,8 @@ package spoke import ( - "github.com/spf13/cobra" - "github.com/openshift/library-go/pkg/controller/controllercmd" + "github.com/spf13/cobra" "open-cluster-management.io/ocm/pkg/version" "open-cluster-management.io/ocm/pkg/work/spoke" diff --git a/pkg/cmd/webhook/registration.go b/pkg/cmd/webhook/registration.go index be6bfc17e..8c60ca29b 100644 --- a/pkg/cmd/webhook/registration.go +++ b/pkg/cmd/webhook/registration.go @@ -2,6 +2,7 @@ package webhook import ( "github.com/spf13/cobra" + "open-cluster-management.io/ocm/pkg/features" "open-cluster-management.io/ocm/pkg/registration/webhook" ) diff --git a/pkg/cmd/webhook/work.go b/pkg/cmd/webhook/work.go index deaf1173b..31a7d5405 100644 --- a/pkg/cmd/webhook/work.go +++ b/pkg/cmd/webhook/work.go @@ -2,6 +2,7 @@ package webhook import ( "github.com/spf13/cobra" + "open-cluster-management.io/ocm/pkg/features" _ "open-cluster-management.io/ocm/pkg/features" "open-cluster-management.io/ocm/pkg/work/webhook" diff --git a/pkg/common/options/options.go b/pkg/common/options/options.go index b282d6c0b..6dce3a13b 100644 --- a/pkg/common/options/options.go +++ b/pkg/common/options/options.go @@ -2,12 +2,13 @@ package options import ( "fmt" + "strings" + "github.com/openshift/library-go/pkg/controller/controllercmd" "github.com/spf13/pflag" apimachineryvalidation "k8s.io/apimachinery/pkg/api/validation" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - "strings" ) // AgentOptions is the common agent options diff --git a/pkg/common/patcher/patcher.go b/pkg/common/patcher/patcher.go index 4796548ea..a52919c29 100644 --- a/pkg/common/patcher/patcher.go +++ b/pkg/common/patcher/patcher.go @@ -4,6 +4,7 @@ import ( "context" "encoding/json" "fmt" + jsonpatch "github.com/evanphx/json-patch" "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/meta" diff --git a/pkg/common/patcher/patcher_test.go b/pkg/common/patcher/patcher_test.go index 4631dfdec..213b6a68d 100644 --- a/pkg/common/patcher/patcher_test.go +++ b/pkg/common/patcher/patcher_test.go @@ -3,14 +3,17 @@ package patcher import ( "context" "encoding/json" + "testing" + "k8s.io/apimachinery/pkg/api/equality" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clienttesting "k8s.io/client-go/testing" + clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" clusterv1 "open-cluster-management.io/api/cluster/v1" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" - "testing" ) func TestAddFinalizer(t *testing.T) { diff --git a/pkg/common/testing/assertion.go b/pkg/common/testing/assertion.go index 7afa98acf..34ec66615 100644 --- a/pkg/common/testing/assertion.go +++ b/pkg/common/testing/assertion.go @@ -1,13 +1,14 @@ package testing import ( + "strings" + "testing" + "github.com/davecgh/go-spew/spew" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" clienttesting "k8s.io/client-go/testing" - "strings" - "testing" ) // AssertError asserts the actual error representation is the same with the expected, diff --git a/pkg/common/testing/fake_sync_context.go b/pkg/common/testing/fake_sync_context.go index e6966e1d5..f242f03d3 100644 --- a/pkg/common/testing/fake_sync_context.go +++ b/pkg/common/testing/fake_sync_context.go @@ -1,10 +1,11 @@ package testing import ( + "testing" + "github.com/openshift/library-go/pkg/operator/events" "github.com/openshift/library-go/pkg/operator/events/eventstesting" "k8s.io/client-go/util/workqueue" - "testing" ) type FakeSyncContext struct { diff --git a/pkg/features/feature.go b/pkg/features/feature.go index 0939f4ed9..627dc73ed 100644 --- a/pkg/features/feature.go +++ b/pkg/features/feature.go @@ -6,6 +6,7 @@ package features import ( "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/component-base/featuregate" + ocmfeature "open-cluster-management.io/api/feature" ) diff --git a/pkg/operator/certrotation/cabundle.go b/pkg/operator/certrotation/cabundle.go index 4d2593437..a110c1ba8 100644 --- a/pkg/operator/certrotation/cabundle.go +++ b/pkg/operator/certrotation/cabundle.go @@ -6,6 +6,9 @@ import ( "fmt" "reflect" + "github.com/openshift/library-go/pkg/crypto" + "github.com/openshift/library-go/pkg/operator/events" + "github.com/openshift/library-go/pkg/operator/resource/resourceapply" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/equality" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -13,10 +16,6 @@ import ( corev1client "k8s.io/client-go/kubernetes/typed/core/v1" corev1listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/util/cert" - - "github.com/openshift/library-go/pkg/crypto" - "github.com/openshift/library-go/pkg/operator/events" - "github.com/openshift/library-go/pkg/operator/resource/resourceapply" ) // CABundleRotation maintains a CA bundle config map, but adding new CA certs and removing expired old ones. diff --git a/pkg/operator/certrotation/target.go b/pkg/operator/certrotation/target.go index f58c104ff..f2aa0b727 100644 --- a/pkg/operator/certrotation/target.go +++ b/pkg/operator/certrotation/target.go @@ -6,15 +6,14 @@ import ( "fmt" "time" - corev1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/util/sets" - "github.com/openshift/library-go/pkg/certs" "github.com/openshift/library-go/pkg/crypto" "github.com/openshift/library-go/pkg/operator/events" "github.com/openshift/library-go/pkg/operator/resource/resourceapply" + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/sets" corev1client "k8s.io/client-go/kubernetes/typed/core/v1" corev1listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/util/cert" diff --git a/pkg/operator/helpers/helpers.go b/pkg/operator/helpers/helpers.go index fddbb2a87..4415378f0 100644 --- a/pkg/operator/helpers/helpers.go +++ b/pkg/operator/helpers/helpers.go @@ -36,6 +36,7 @@ import ( "k8s.io/klog/v2" apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" apiregistrationclient "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1" + operatorv1client "open-cluster-management.io/api/client/operator/clientset/versioned/typed/operator/v1" operatorapiv1 "open-cluster-management.io/api/operator/v1" ) diff --git a/pkg/operator/helpers/helpers_test.go b/pkg/operator/helpers/helpers_test.go index 0d31a0d71..988a0320d 100644 --- a/pkg/operator/helpers/helpers_test.go +++ b/pkg/operator/helpers/helpers_test.go @@ -9,9 +9,6 @@ import ( "testing" "time" - "k8s.io/component-base/featuregate" - ocmfeature "open-cluster-management.io/api/feature" - "github.com/google/go-cmp/cmp" "github.com/openshift/library-go/pkg/assets" "github.com/openshift/library-go/pkg/operator/events" @@ -33,9 +30,13 @@ import ( clienttesting "k8s.io/client-go/testing" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" clientcmdlatest "k8s.io/client-go/tools/clientcmd/api/latest" + "k8s.io/component-base/featuregate" fakeapiregistration "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake" + opereatorfake "open-cluster-management.io/api/client/operator/clientset/versioned/fake" + ocmfeature "open-cluster-management.io/api/feature" operatorapiv1 "open-cluster-management.io/api/operator/v1" + "open-cluster-management.io/ocm/manifests" ) diff --git a/pkg/operator/helpers/queuekey.go b/pkg/operator/helpers/queuekey.go index 63e9f3da5..4703362d7 100644 --- a/pkg/operator/helpers/queuekey.go +++ b/pkg/operator/helpers/queuekey.go @@ -4,12 +4,11 @@ import ( "fmt" "strings" + "github.com/openshift/library-go/pkg/controller/factory" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" - "github.com/openshift/library-go/pkg/controller/factory" - operatorlister "open-cluster-management.io/api/client/operator/listers/operator/v1" operatorapiv1 "open-cluster-management.io/api/operator/v1" ) diff --git a/pkg/operator/helpers/testing/assertion.go b/pkg/operator/helpers/testing/assertion.go index 4fce8a1b4..c83410ce6 100644 --- a/pkg/operator/helpers/testing/assertion.go +++ b/pkg/operator/helpers/testing/assertion.go @@ -8,7 +8,9 @@ import ( "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + opratorapiv1 "open-cluster-management.io/api/operator/v1" + "open-cluster-management.io/ocm/pkg/operator/helpers" ) diff --git a/pkg/operator/operators/clustermanager/controllers/certrotationcontroller/certrotation_controller.go b/pkg/operator/operators/clustermanager/controllers/certrotationcontroller/certrotation_controller.go index 22301b97e..d579d8d5f 100644 --- a/pkg/operator/operators/clustermanager/controllers/certrotationcontroller/certrotation_controller.go +++ b/pkg/operator/operators/clustermanager/controllers/certrotationcontroller/certrotation_controller.go @@ -21,6 +21,7 @@ import ( operatorinformer "open-cluster-management.io/api/client/operator/informers/externalversions/operator/v1" operatorlister "open-cluster-management.io/api/client/operator/listers/operator/v1" operatorv1 "open-cluster-management.io/api/operator/v1" + "open-cluster-management.io/ocm/pkg/operator/certrotation" "open-cluster-management.io/ocm/pkg/operator/helpers" ) diff --git a/pkg/operator/operators/clustermanager/controllers/certrotationcontroller/certrotation_controller_test.go b/pkg/operator/operators/clustermanager/controllers/certrotationcontroller/certrotation_controller_test.go index 9ee4c9910..7cc1daadf 100644 --- a/pkg/operator/operators/clustermanager/controllers/certrotationcontroller/certrotation_controller_test.go +++ b/pkg/operator/operators/clustermanager/controllers/certrotationcontroller/certrotation_controller_test.go @@ -5,15 +5,14 @@ import ( "testing" "time" - "k8s.io/apimachinery/pkg/fields" - corev1informers "k8s.io/client-go/informers/core/v1" - "github.com/openshift/library-go/pkg/controller/factory" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/runtime" kubeinformers "k8s.io/client-go/informers" + corev1informers "k8s.io/client-go/informers/core/v1" "k8s.io/client-go/kubernetes" fakekube "k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/util/cert" @@ -21,6 +20,7 @@ import ( fakeoperatorclient "open-cluster-management.io/api/client/operator/clientset/versioned/fake" operatorinformers "open-cluster-management.io/api/client/operator/informers/externalversions" operatorapiv1 "open-cluster-management.io/api/operator/v1" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" "open-cluster-management.io/ocm/pkg/operator/helpers" ) diff --git a/pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_controller.go b/pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_controller.go index 23bc3cde1..9452575d7 100644 --- a/pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_controller.go +++ b/pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_controller.go @@ -3,38 +3,36 @@ package clustermanagercontroller import ( "context" "encoding/base64" - "strings" - - utilerrors "k8s.io/apimachinery/pkg/util/errors" - errorhelpers "errors" + "strings" "time" - apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" - "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/api/meta" - "k8s.io/client-go/kubernetes" - "k8s.io/client-go/rest" - "k8s.io/klog/v2" - "github.com/openshift/library-go/pkg/assets" "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" "github.com/openshift/library-go/pkg/operator/resource/resourceapply" + apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" + "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + utilerrors "k8s.io/apimachinery/pkg/util/errors" appsinformer "k8s.io/client-go/informers/apps/v1" corev1informers "k8s.io/client-go/informers/core/v1" + "k8s.io/client-go/kubernetes" corev1listers "k8s.io/client-go/listers/core/v1" + "k8s.io/client-go/rest" + "k8s.io/klog/v2" + migrationclient "sigs.k8s.io/kube-storage-version-migrator/pkg/clients/clientset/typed/migration/v1alpha1" operatorv1client "open-cluster-management.io/api/client/operator/clientset/versioned/typed/operator/v1" operatorinformer "open-cluster-management.io/api/client/operator/informers/externalversions/operator/v1" operatorlister "open-cluster-management.io/api/client/operator/listers/operator/v1" ocmfeature "open-cluster-management.io/api/feature" operatorapiv1 "open-cluster-management.io/api/operator/v1" + "open-cluster-management.io/ocm/manifests" "open-cluster-management.io/ocm/pkg/operator/helpers" - migrationclient "sigs.k8s.io/kube-storage-version-migrator/pkg/clients/clientset/typed/migration/v1alpha1" ) const ( diff --git a/pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_controller_test.go b/pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_controller_test.go index 36cc300d7..fcdaf795e 100644 --- a/pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_controller_test.go +++ b/pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_controller_test.go @@ -2,7 +2,6 @@ package clustermanagercontroller import ( "context" - testingcommon "open-cluster-management.io/ocm/pkg/common/testing" "strings" "testing" "time" @@ -24,12 +23,14 @@ import ( fakekube "k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/rest" clienttesting "k8s.io/client-go/testing" - fakeoperatorlient "open-cluster-management.io/api/client/operator/clientset/versioned/fake" - operatorinformers "open-cluster-management.io/api/client/operator/informers/externalversions" - operatorapiv1 "open-cluster-management.io/api/operator/v1" fakemigrationclient "sigs.k8s.io/kube-storage-version-migrator/pkg/clients/clientset/fake" migrationclient "sigs.k8s.io/kube-storage-version-migrator/pkg/clients/clientset/typed/migration/v1alpha1" + fakeoperatorlient "open-cluster-management.io/api/client/operator/clientset/versioned/fake" + operatorinformers "open-cluster-management.io/api/client/operator/informers/externalversions" + operatorapiv1 "open-cluster-management.io/api/operator/v1" + + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" "open-cluster-management.io/ocm/pkg/operator/helpers" ) diff --git a/pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_crd_reconcile.go b/pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_crd_reconcile.go index a0326e152..5edfba03f 100644 --- a/pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_crd_reconcile.go +++ b/pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_crd_reconcile.go @@ -15,11 +15,13 @@ import ( apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + migrationclient "sigs.k8s.io/kube-storage-version-migrator/pkg/clients/clientset/typed/migration/v1alpha1" + operatorapiv1 "open-cluster-management.io/api/operator/v1" + "open-cluster-management.io/ocm/manifests" "open-cluster-management.io/ocm/pkg/operator/helpers" "open-cluster-management.io/ocm/pkg/operator/operators/crdmanager" - migrationclient "sigs.k8s.io/kube-storage-version-migrator/pkg/clients/clientset/typed/migration/v1alpha1" ) var ( diff --git a/pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_hub_reconcile.go b/pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_hub_reconcile.go index 09eda2cc5..74f15ce68 100644 --- a/pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_hub_reconcile.go +++ b/pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_hub_reconcile.go @@ -15,7 +15,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/client-go/kubernetes" + operatorapiv1 "open-cluster-management.io/api/operator/v1" + "open-cluster-management.io/ocm/manifests" "open-cluster-management.io/ocm/pkg/operator/helpers" ) diff --git a/pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_runtime_reconcile.go b/pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_runtime_reconcile.go index 6964b88b8..58e70d58d 100644 --- a/pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_runtime_reconcile.go +++ b/pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_runtime_reconcile.go @@ -17,7 +17,9 @@ import ( utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" + operatorapiv1 "open-cluster-management.io/api/operator/v1" + "open-cluster-management.io/ocm/manifests" "open-cluster-management.io/ocm/pkg/operator/helpers" ) diff --git a/pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_webhook_reconcile.go b/pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_webhook_reconcile.go index 8199e9d27..bf48e478b 100644 --- a/pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_webhook_reconcile.go +++ b/pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_webhook_reconcile.go @@ -15,7 +15,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/client-go/kubernetes" + operatorapiv1 "open-cluster-management.io/api/operator/v1" + "open-cluster-management.io/ocm/manifests" "open-cluster-management.io/ocm/pkg/operator/helpers" ) diff --git a/pkg/operator/operators/clustermanager/controllers/crdstatuccontroller/crd_status_controller.go b/pkg/operator/operators/clustermanager/controllers/crdstatuccontroller/crd_status_controller.go index 219120d36..88ae84ae0 100644 --- a/pkg/operator/operators/clustermanager/controllers/crdstatuccontroller/crd_status_controller.go +++ b/pkg/operator/operators/clustermanager/controllers/crdstatuccontroller/crd_status_controller.go @@ -8,20 +8,20 @@ import ( "context" "reflect" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - operatorinformer "open-cluster-management.io/api/client/operator/informers/externalversions/operator/v1" - operatorlister "open-cluster-management.io/api/client/operator/listers/operator/v1" - "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "k8s.io/klog/v2" + + operatorinformer "open-cluster-management.io/api/client/operator/informers/externalversions/operator/v1" + operatorlister "open-cluster-management.io/api/client/operator/listers/operator/v1" + "open-cluster-management.io/ocm/pkg/operator/helpers" "open-cluster-management.io/ocm/pkg/operator/operators/clustermanager/controllers/migrationcontroller" ) diff --git a/pkg/operator/operators/clustermanager/controllers/crdstatuccontroller/crd_status_controller_test.go b/pkg/operator/operators/clustermanager/controllers/crdstatuccontroller/crd_status_controller_test.go index 92d7064af..e0815c432 100644 --- a/pkg/operator/operators/clustermanager/controllers/crdstatuccontroller/crd_status_controller_test.go +++ b/pkg/operator/operators/clustermanager/controllers/crdstatuccontroller/crd_status_controller_test.go @@ -15,9 +15,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/rest" + fakeoperatorlient "open-cluster-management.io/api/client/operator/clientset/versioned/fake" operatorinformers "open-cluster-management.io/api/client/operator/informers/externalversions" operatorapiv1 "open-cluster-management.io/api/operator/v1" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" "open-cluster-management.io/ocm/pkg/operator/operators/clustermanager/controllers/migrationcontroller" ) diff --git a/pkg/operator/operators/clustermanager/controllers/migrationcontroller/migration_controller.go b/pkg/operator/operators/clustermanager/controllers/migrationcontroller/migration_controller.go index a6e1863cc..6c77e0e5a 100644 --- a/pkg/operator/operators/clustermanager/controllers/migrationcontroller/migration_controller.go +++ b/pkg/operator/operators/clustermanager/controllers/migrationcontroller/migration_controller.go @@ -4,15 +4,6 @@ import ( "context" "fmt" - apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" - "k8s.io/apimachinery/pkg/api/equality" - "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/api/meta" - "k8s.io/apimachinery/pkg/runtime/serializer" - "k8s.io/client-go/kubernetes" - "k8s.io/client-go/rest" - "k8s.io/klog/v2" - "github.com/openshift/library-go/pkg/assets" "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" @@ -21,15 +12,25 @@ import ( "github.com/openshift/library-go/pkg/operator/resource/resourcemerge" operatorhelpers "github.com/openshift/library-go/pkg/operator/v1helpers" corev1 "k8s.io/api/core/v1" + apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" + "k8s.io/apimachinery/pkg/api/equality" + "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime/serializer" + "k8s.io/client-go/kubernetes" + "k8s.io/client-go/rest" + "k8s.io/klog/v2" + migrationv1alpha1 "sigs.k8s.io/kube-storage-version-migrator/pkg/apis/migration/v1alpha1" + migrationv1alpha1client "sigs.k8s.io/kube-storage-version-migrator/pkg/clients/clientset/typed/migration/v1alpha1" + operatorv1client "open-cluster-management.io/api/client/operator/clientset/versioned/typed/operator/v1" operatorinformer "open-cluster-management.io/api/client/operator/informers/externalversions/operator/v1" operatorlister "open-cluster-management.io/api/client/operator/listers/operator/v1" + "open-cluster-management.io/ocm/manifests" "open-cluster-management.io/ocm/pkg/operator/helpers" - migrationv1alpha1 "sigs.k8s.io/kube-storage-version-migrator/pkg/apis/migration/v1alpha1" - migrationv1alpha1client "sigs.k8s.io/kube-storage-version-migrator/pkg/clients/clientset/typed/migration/v1alpha1" ) var ( diff --git a/pkg/operator/operators/clustermanager/controllers/migrationcontroller/migration_controller_test.go b/pkg/operator/operators/clustermanager/controllers/migrationcontroller/migration_controller_test.go index 6d4f20a2f..20210af91 100644 --- a/pkg/operator/operators/clustermanager/controllers/migrationcontroller/migration_controller_test.go +++ b/pkg/operator/operators/clustermanager/controllers/migrationcontroller/migration_controller_test.go @@ -6,10 +6,6 @@ import ( "testing" "time" - fakeoperatorlient "open-cluster-management.io/api/client/operator/clientset/versioned/fake" - operatorinformers "open-cluster-management.io/api/client/operator/informers/externalversions" - operatorapiv1 "open-cluster-management.io/api/operator/v1" - "github.com/openshift/library-go/pkg/operator/events/eventstesting" v1 "k8s.io/api/core/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" @@ -21,10 +17,15 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/rest" clienttesting "k8s.io/client-go/testing" - testingcommon "open-cluster-management.io/ocm/pkg/common/testing" migrationv1alpha1 "sigs.k8s.io/kube-storage-version-migrator/pkg/apis/migration/v1alpha1" fakemigrationclient "sigs.k8s.io/kube-storage-version-migrator/pkg/clients/clientset/fake" migrationv1alpha1client "sigs.k8s.io/kube-storage-version-migrator/pkg/clients/clientset/typed/migration/v1alpha1" + + fakeoperatorlient "open-cluster-management.io/api/client/operator/clientset/versioned/fake" + operatorinformers "open-cluster-management.io/api/client/operator/informers/externalversions" + operatorapiv1 "open-cluster-management.io/api/operator/v1" + + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" ) func TestSupportStorageVersionMigration(t *testing.T) { diff --git a/pkg/operator/operators/clustermanager/controllers/statuscontroller/clustermanager_status_controller.go b/pkg/operator/operators/clustermanager/controllers/statuscontroller/clustermanager_status_controller.go index c6ecde79b..c753a211e 100644 --- a/pkg/operator/operators/clustermanager/controllers/statuscontroller/clustermanager_status_controller.go +++ b/pkg/operator/operators/clustermanager/controllers/statuscontroller/clustermanager_status_controller.go @@ -4,6 +4,8 @@ import ( "context" "fmt" + "github.com/openshift/library-go/pkg/controller/factory" + "github.com/openshift/library-go/pkg/operator/events" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -15,10 +17,8 @@ import ( operatorv1client "open-cluster-management.io/api/client/operator/clientset/versioned/typed/operator/v1" operatorinformer "open-cluster-management.io/api/client/operator/informers/externalversions/operator/v1" operatorlister "open-cluster-management.io/api/client/operator/listers/operator/v1" - "open-cluster-management.io/ocm/pkg/operator/helpers" - "github.com/openshift/library-go/pkg/controller/factory" - "github.com/openshift/library-go/pkg/operator/events" + "open-cluster-management.io/ocm/pkg/operator/helpers" ) const registrationDegraded = "HubRegistrationDegraded" diff --git a/pkg/operator/operators/clustermanager/controllers/statuscontroller/clustermanager_status_controller_test.go b/pkg/operator/operators/clustermanager/controllers/statuscontroller/clustermanager_status_controller_test.go index f5d8f1d7d..3cdabdfe1 100644 --- a/pkg/operator/operators/clustermanager/controllers/statuscontroller/clustermanager_status_controller_test.go +++ b/pkg/operator/operators/clustermanager/controllers/statuscontroller/clustermanager_status_controller_test.go @@ -16,6 +16,7 @@ import ( fakeoperatorclient "open-cluster-management.io/api/client/operator/clientset/versioned/fake" operatorinformers "open-cluster-management.io/api/client/operator/informers/externalversions" operatorapiv1 "open-cluster-management.io/api/operator/v1" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" testinghelper "open-cluster-management.io/ocm/pkg/operator/helpers/testing" ) diff --git a/pkg/operator/operators/clustermanager/options.go b/pkg/operator/operators/clustermanager/options.go index 4e2db0568..a0c1568e4 100644 --- a/pkg/operator/operators/clustermanager/options.go +++ b/pkg/operator/operators/clustermanager/options.go @@ -4,16 +4,17 @@ import ( "context" "time" + "github.com/openshift/library-go/pkg/controller/controllercmd" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" - corev1informers "k8s.io/client-go/informers/core/v1" - "open-cluster-management.io/ocm/pkg/operator/helpers" - - "github.com/openshift/library-go/pkg/controller/controllercmd" "k8s.io/client-go/informers" + corev1informers "k8s.io/client-go/informers/core/v1" "k8s.io/client-go/kubernetes" + operatorclient "open-cluster-management.io/api/client/operator/clientset/versioned" operatorinformer "open-cluster-management.io/api/client/operator/informers/externalversions" + + "open-cluster-management.io/ocm/pkg/operator/helpers" "open-cluster-management.io/ocm/pkg/operator/operators/clustermanager/controllers/certrotationcontroller" "open-cluster-management.io/ocm/pkg/operator/operators/clustermanager/controllers/clustermanagercontroller" "open-cluster-management.io/ocm/pkg/operator/operators/clustermanager/controllers/crdstatuccontroller" diff --git a/pkg/operator/operators/crdmanager/manager.go b/pkg/operator/operators/crdmanager/manager.go index bdb690bfb..59732f765 100644 --- a/pkg/operator/operators/crdmanager/manager.go +++ b/pkg/operator/operators/crdmanager/manager.go @@ -6,10 +6,8 @@ import ( "fmt" "strings" - "github.com/openshift/library-go/pkg/operator/resource/resourcemerge" - "k8s.io/utils/pointer" - "github.com/openshift/library-go/pkg/operator/resource/resourceapply" + "github.com/openshift/library-go/pkg/operator/resource/resourcemerge" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -21,6 +19,8 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" versionutil "k8s.io/apimachinery/pkg/util/version" "k8s.io/klog/v2" + "k8s.io/utils/pointer" + "open-cluster-management.io/ocm/pkg/version" ) diff --git a/pkg/operator/operators/crdmanager/manager_test.go b/pkg/operator/operators/crdmanager/manager_test.go index 8dfe61c31..64d15c4f9 100644 --- a/pkg/operator/operators/crdmanager/manager_test.go +++ b/pkg/operator/operators/crdmanager/manager_test.go @@ -19,6 +19,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" versionutil "k8s.io/apimachinery/pkg/util/version" clienttesting "k8s.io/client-go/testing" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" ) diff --git a/pkg/operator/operators/klusterlet/controllers/addonsecretcontroller/controller.go b/pkg/operator/operators/klusterlet/controllers/addonsecretcontroller/controller.go index 83f20b37b..902954aa5 100644 --- a/pkg/operator/operators/klusterlet/controllers/addonsecretcontroller/controller.go +++ b/pkg/operator/operators/klusterlet/controllers/addonsecretcontroller/controller.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" coreinformer "k8s.io/client-go/informers/core/v1" "k8s.io/client-go/kubernetes" + "open-cluster-management.io/ocm/pkg/operator/helpers" ) diff --git a/pkg/operator/operators/klusterlet/controllers/addonsecretcontroller/controller_test.go b/pkg/operator/operators/klusterlet/controllers/addonsecretcontroller/controller_test.go index 746989509..9d2a7769a 100644 --- a/pkg/operator/operators/klusterlet/controllers/addonsecretcontroller/controller_test.go +++ b/pkg/operator/operators/klusterlet/controllers/addonsecretcontroller/controller_test.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/informers" kubefake "k8s.io/client-go/kubernetes/fake" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" ) diff --git a/pkg/operator/operators/klusterlet/controllers/bootstrapcontroller/bootstrapcontroller.go b/pkg/operator/operators/klusterlet/controllers/bootstrapcontroller/bootstrapcontroller.go index a90836609..f5687182a 100644 --- a/pkg/operator/operators/klusterlet/controllers/bootstrapcontroller/bootstrapcontroller.go +++ b/pkg/operator/operators/klusterlet/controllers/bootstrapcontroller/bootstrapcontroller.go @@ -6,13 +6,8 @@ import ( "fmt" "time" - operatorinformer "open-cluster-management.io/api/client/operator/informers/externalversions/operator/v1" - operatorlister "open-cluster-management.io/api/client/operator/listers/operator/v1" - "open-cluster-management.io/ocm/pkg/operator/helpers" - "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" - corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" @@ -27,6 +22,11 @@ import ( clientcmdapi "k8s.io/client-go/tools/clientcmd/api" certutil "k8s.io/client-go/util/cert" "k8s.io/klog/v2" + + operatorinformer "open-cluster-management.io/api/client/operator/informers/externalversions/operator/v1" + operatorlister "open-cluster-management.io/api/client/operator/listers/operator/v1" + + "open-cluster-management.io/ocm/pkg/operator/helpers" ) const tlsCertFile = "tls.crt" diff --git a/pkg/operator/operators/klusterlet/controllers/bootstrapcontroller/bootstrapcontroller_test.go b/pkg/operator/operators/klusterlet/controllers/bootstrapcontroller/bootstrapcontroller_test.go index c3fb3b0cc..1f5abc216 100644 --- a/pkg/operator/operators/klusterlet/controllers/bootstrapcontroller/bootstrapcontroller_test.go +++ b/pkg/operator/operators/klusterlet/controllers/bootstrapcontroller/bootstrapcontroller_test.go @@ -21,9 +21,11 @@ import ( clientcmdapi "k8s.io/client-go/tools/clientcmd/api" clientcmdlatest "k8s.io/client-go/tools/clientcmd/api/latest" certutil "k8s.io/client-go/util/cert" + fakeoperatorclient "open-cluster-management.io/api/client/operator/clientset/versioned/fake" operatorinformers "open-cluster-management.io/api/client/operator/informers/externalversions" operatorapiv1 "open-cluster-management.io/api/operator/v1" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" ) diff --git a/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/client_builder.go b/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/client_builder.go index 0ea3dcfbb..f159ed79b 100644 --- a/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/client_builder.go +++ b/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/client_builder.go @@ -6,9 +6,11 @@ package klusterletcontroller import ( "context" + apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" + workclientset "open-cluster-management.io/api/client/work/clientset/versioned" workv1client "open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1" operatorapiv1 "open-cluster-management.io/api/operator/v1" diff --git a/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_cleanup_controller.go b/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_cleanup_controller.go index 523a83242..34deb9fc3 100644 --- a/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_cleanup_controller.go +++ b/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_cleanup_controller.go @@ -20,6 +20,7 @@ import ( coreinformer "k8s.io/client-go/informers/core/v1" "k8s.io/client-go/kubernetes" "k8s.io/klog/v2" + operatorv1client "open-cluster-management.io/api/client/operator/clientset/versioned/typed/operator/v1" operatorinformer "open-cluster-management.io/api/client/operator/informers/externalversions/operator/v1" operatorlister "open-cluster-management.io/api/client/operator/listers/operator/v1" diff --git a/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_cleanup_controller_test.go b/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_cleanup_controller_test.go index f9d37e204..286297ce8 100644 --- a/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_cleanup_controller_test.go +++ b/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_cleanup_controller_test.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" clienttesting "k8s.io/client-go/testing" "k8s.io/klog/v2" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" "open-cluster-management.io/ocm/pkg/operator/helpers" ) diff --git a/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_controller.go b/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_controller.go index 17b271070..bc3f323a0 100644 --- a/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_controller.go +++ b/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_controller.go @@ -5,9 +5,6 @@ import ( "fmt" "strings" - utilerrors "k8s.io/apimachinery/pkg/util/errors" - ocmfeature "open-cluster-management.io/api/feature" - "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" "github.com/openshift/library-go/pkg/operator/resource/resourceapply" @@ -17,16 +14,19 @@ import ( "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apimachinery/pkg/util/version" appsinformer "k8s.io/client-go/informers/apps/v1" coreinformer "k8s.io/client-go/informers/core/v1" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "k8s.io/klog/v2" + operatorv1client "open-cluster-management.io/api/client/operator/clientset/versioned/typed/operator/v1" operatorinformer "open-cluster-management.io/api/client/operator/informers/externalversions/operator/v1" operatorlister "open-cluster-management.io/api/client/operator/listers/operator/v1" workv1client "open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1" + ocmfeature "open-cluster-management.io/api/feature" operatorapiv1 "open-cluster-management.io/api/operator/v1" "open-cluster-management.io/ocm/pkg/operator/helpers" diff --git a/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_controller_test.go b/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_controller_test.go index 0441665b6..0c0942b8e 100644 --- a/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_controller_test.go +++ b/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_controller_test.go @@ -8,8 +8,6 @@ import ( "testing" "time" - "k8s.io/client-go/rest" - "github.com/openshift/library-go/pkg/operator/resource/resourceapply" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" @@ -22,6 +20,7 @@ import ( "k8s.io/apimachinery/pkg/util/rand" "k8s.io/apimachinery/pkg/util/version" fakekube "k8s.io/client-go/kubernetes/fake" + "k8s.io/client-go/rest" clienttesting "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" @@ -33,6 +32,7 @@ import ( fakeworkclient "open-cluster-management.io/api/client/work/clientset/versioned/fake" operatorapiv1 "open-cluster-management.io/api/operator/v1" workapiv1 "open-cluster-management.io/api/work/v1" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" "open-cluster-management.io/ocm/pkg/operator/helpers" testinghelper "open-cluster-management.io/ocm/pkg/operator/helpers/testing" diff --git a/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_crd_reconcile.go b/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_crd_reconcile.go index 1ae157179..64bf34011 100644 --- a/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_crd_reconcile.go +++ b/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_crd_reconcile.go @@ -15,7 +15,9 @@ import ( "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/version" + operatorapiv1 "open-cluster-management.io/api/operator/v1" + "open-cluster-management.io/ocm/manifests" "open-cluster-management.io/ocm/pkg/operator/helpers" "open-cluster-management.io/ocm/pkg/operator/operators/crdmanager" diff --git a/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_managed_reconcile.go b/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_managed_reconcile.go index 9f945ce89..9041bb30c 100644 --- a/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_managed_reconcile.go +++ b/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_managed_reconcile.go @@ -17,6 +17,7 @@ import ( utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apimachinery/pkg/util/version" "k8s.io/client-go/kubernetes" + operatorapiv1 "open-cluster-management.io/api/operator/v1" "open-cluster-management.io/ocm/manifests" diff --git a/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_management_recocile.go b/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_management_recocile.go index 333c46515..cbafdd951 100644 --- a/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_management_recocile.go +++ b/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_management_recocile.go @@ -16,7 +16,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/client-go/kubernetes" + operatorapiv1 "open-cluster-management.io/api/operator/v1" + "open-cluster-management.io/ocm/manifests" "open-cluster-management.io/ocm/pkg/operator/helpers" ) diff --git a/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_runtime_reconcile.go b/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_runtime_reconcile.go index fac6d97ec..3fa9a0e7a 100644 --- a/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_runtime_reconcile.go +++ b/pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_runtime_reconcile.go @@ -16,7 +16,9 @@ import ( "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" + operatorapiv1 "open-cluster-management.io/api/operator/v1" + "open-cluster-management.io/ocm/manifests" "open-cluster-management.io/ocm/pkg/operator/helpers" ) diff --git a/pkg/operator/operators/klusterlet/controllers/ssarcontroller/klusterlet_ssar_controller.go b/pkg/operator/operators/klusterlet/controllers/ssarcontroller/klusterlet_ssar_controller.go index 622b80cd3..1da349760 100644 --- a/pkg/operator/operators/klusterlet/controllers/ssarcontroller/klusterlet_ssar_controller.go +++ b/pkg/operator/operators/klusterlet/controllers/ssarcontroller/klusterlet_ssar_controller.go @@ -6,6 +6,8 @@ import ( "sync" "time" + "github.com/openshift/library-go/pkg/controller/factory" + "github.com/openshift/library-go/pkg/operator/events" authorizationv1 "k8s.io/api/authorization/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -17,12 +19,10 @@ import ( corelister "k8s.io/client-go/listers/core/v1" "k8s.io/klog/v2" - "github.com/openshift/library-go/pkg/controller/factory" - "github.com/openshift/library-go/pkg/operator/events" - operatorv1client "open-cluster-management.io/api/client/operator/clientset/versioned/typed/operator/v1" operatorinformer "open-cluster-management.io/api/client/operator/informers/externalversions/operator/v1" operatorlister "open-cluster-management.io/api/client/operator/listers/operator/v1" + "open-cluster-management.io/ocm/pkg/operator/helpers" ) diff --git a/pkg/operator/operators/klusterlet/controllers/ssarcontroller/klusterlet_ssar_controller_test.go b/pkg/operator/operators/klusterlet/controllers/ssarcontroller/klusterlet_ssar_controller_test.go index d1e18e79c..00fca08d5 100644 --- a/pkg/operator/operators/klusterlet/controllers/ssarcontroller/klusterlet_ssar_controller_test.go +++ b/pkg/operator/operators/klusterlet/controllers/ssarcontroller/klusterlet_ssar_controller_test.go @@ -22,6 +22,7 @@ import ( fakeoperatorclient "open-cluster-management.io/api/client/operator/clientset/versioned/fake" operatorinformers "open-cluster-management.io/api/client/operator/informers/externalversions" operatorapiv1 "open-cluster-management.io/api/operator/v1" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" "open-cluster-management.io/ocm/pkg/operator/helpers" testinghelper "open-cluster-management.io/ocm/pkg/operator/helpers/testing" diff --git a/pkg/operator/operators/klusterlet/controllers/statuscontroller/klusterlet_status_controller.go b/pkg/operator/operators/klusterlet/controllers/statuscontroller/klusterlet_status_controller.go index 30f27bdb9..75e768b39 100644 --- a/pkg/operator/operators/klusterlet/controllers/statuscontroller/klusterlet_status_controller.go +++ b/pkg/operator/operators/klusterlet/controllers/statuscontroller/klusterlet_status_controller.go @@ -5,6 +5,8 @@ import ( "fmt" "strings" + "github.com/openshift/library-go/pkg/controller/factory" + "github.com/openshift/library-go/pkg/operator/events" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" appsinformer "k8s.io/client-go/informers/apps/v1" @@ -12,12 +14,10 @@ import ( appslister "k8s.io/client-go/listers/apps/v1" "k8s.io/klog/v2" - "github.com/openshift/library-go/pkg/controller/factory" - "github.com/openshift/library-go/pkg/operator/events" - operatorv1client "open-cluster-management.io/api/client/operator/clientset/versioned/typed/operator/v1" operatorinformer "open-cluster-management.io/api/client/operator/informers/externalversions/operator/v1" operatorlister "open-cluster-management.io/api/client/operator/listers/operator/v1" + "open-cluster-management.io/ocm/pkg/operator/helpers" ) diff --git a/pkg/operator/operators/klusterlet/controllers/statuscontroller/klusterlet_status_controller_test.go b/pkg/operator/operators/klusterlet/controllers/statuscontroller/klusterlet_status_controller_test.go index c2428a28a..1c41d14a6 100644 --- a/pkg/operator/operators/klusterlet/controllers/statuscontroller/klusterlet_status_controller_test.go +++ b/pkg/operator/operators/klusterlet/controllers/statuscontroller/klusterlet_status_controller_test.go @@ -15,6 +15,7 @@ import ( fakeoperatorclient "open-cluster-management.io/api/client/operator/clientset/versioned/fake" operatorinformers "open-cluster-management.io/api/client/operator/informers/externalversions" operatorapiv1 "open-cluster-management.io/api/operator/v1" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" testinghelper "open-cluster-management.io/ocm/pkg/operator/helpers/testing" ) diff --git a/pkg/operator/operators/klusterlet/options.go b/pkg/operator/operators/klusterlet/options.go index 3e85aefc4..984e14cfd 100644 --- a/pkg/operator/operators/klusterlet/options.go +++ b/pkg/operator/operators/klusterlet/options.go @@ -14,6 +14,7 @@ import ( operatorclient "open-cluster-management.io/api/client/operator/clientset/versioned" operatorinformer "open-cluster-management.io/api/client/operator/informers/externalversions" workclientset "open-cluster-management.io/api/client/work/clientset/versioned" + "open-cluster-management.io/ocm/pkg/operator/operators/klusterlet/controllers/addonsecretcontroller" "open-cluster-management.io/ocm/pkg/operator/operators/klusterlet/controllers/bootstrapcontroller" "open-cluster-management.io/ocm/pkg/operator/operators/klusterlet/controllers/klusterletcontroller" diff --git a/pkg/placement/controllers/manager.go b/pkg/placement/controllers/manager.go index cc7541406..a951584a2 100644 --- a/pkg/placement/controllers/manager.go +++ b/pkg/placement/controllers/manager.go @@ -9,9 +9,11 @@ import ( "k8s.io/apiserver/pkg/server/mux" "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/events" + clusterclient "open-cluster-management.io/api/client/cluster/clientset/versioned" clusterscheme "open-cluster-management.io/api/client/cluster/clientset/versioned/scheme" clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" + scheduling "open-cluster-management.io/ocm/pkg/placement/controllers/scheduling" "open-cluster-management.io/ocm/pkg/placement/debugger" ) diff --git a/pkg/placement/controllers/scheduling/cluster_event_handler.go b/pkg/placement/controllers/scheduling/cluster_event_handler.go index d690ae371..f80dc7cc2 100644 --- a/pkg/placement/controllers/scheduling/cluster_event_handler.go +++ b/pkg/placement/controllers/scheduling/cluster_event_handler.go @@ -6,6 +6,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" cache "k8s.io/client-go/tools/cache" + clusterapiv1 "open-cluster-management.io/api/cluster/v1" ) diff --git a/pkg/placement/controllers/scheduling/cluster_event_handler_test.go b/pkg/placement/controllers/scheduling/cluster_event_handler_test.go index 5490d0b56..2b6b8212c 100644 --- a/pkg/placement/controllers/scheduling/cluster_event_handler_test.go +++ b/pkg/placement/controllers/scheduling/cluster_event_handler_test.go @@ -4,12 +4,11 @@ import ( "strings" "testing" - "k8s.io/client-go/util/workqueue" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/tools/cache" + "k8s.io/client-go/util/workqueue" clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" clusterapiv1beta2 "open-cluster-management.io/api/cluster/v1beta2" diff --git a/pkg/placement/controllers/scheduling/enqueue.go b/pkg/placement/controllers/scheduling/enqueue.go index 67fee1a97..c714818e4 100644 --- a/pkg/placement/controllers/scheduling/enqueue.go +++ b/pkg/placement/controllers/scheduling/enqueue.go @@ -8,6 +8,7 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" + clusterinformerv1 "open-cluster-management.io/api/client/cluster/informers/externalversions/cluster/v1" clusterinformerv1beta1 "open-cluster-management.io/api/client/cluster/informers/externalversions/cluster/v1beta1" clusterinformerv1beta2 "open-cluster-management.io/api/client/cluster/informers/externalversions/cluster/v1beta2" diff --git a/pkg/placement/controllers/scheduling/enqueue_test.go b/pkg/placement/controllers/scheduling/enqueue_test.go index 736a8fcd4..f2b4efe83 100644 --- a/pkg/placement/controllers/scheduling/enqueue_test.go +++ b/pkg/placement/controllers/scheduling/enqueue_test.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" + clusterclient "open-cluster-management.io/api/client/cluster/clientset/versioned" clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" @@ -17,6 +18,7 @@ import ( clusterapiv1alpha1 "open-cluster-management.io/api/cluster/v1alpha1" clusterapiv1beta1 "open-cluster-management.io/api/cluster/v1beta1" clusterapiv1beta2 "open-cluster-management.io/api/cluster/v1beta2" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" testinghelpers "open-cluster-management.io/ocm/pkg/placement/helpers/testing" ) diff --git a/pkg/placement/controllers/scheduling/schedule.go b/pkg/placement/controllers/scheduling/schedule.go index 0bc45c371..a257f32ff 100644 --- a/pkg/placement/controllers/scheduling/schedule.go +++ b/pkg/placement/controllers/scheduling/schedule.go @@ -9,12 +9,14 @@ import ( kevents "k8s.io/client-go/tools/events" "k8s.io/klog/v2" + clusterclient "open-cluster-management.io/api/client/cluster/clientset/versioned" clusterlisterv1 "open-cluster-management.io/api/client/cluster/listers/cluster/v1" clusterlisterv1alpha1 "open-cluster-management.io/api/client/cluster/listers/cluster/v1alpha1" clusterlisterv1beta1 "open-cluster-management.io/api/client/cluster/listers/cluster/v1beta1" clusterapiv1 "open-cluster-management.io/api/cluster/v1" clusterapiv1beta1 "open-cluster-management.io/api/cluster/v1beta1" + "open-cluster-management.io/ocm/pkg/placement/controllers/framework" "open-cluster-management.io/ocm/pkg/placement/plugins" "open-cluster-management.io/ocm/pkg/placement/plugins/addon" diff --git a/pkg/placement/controllers/scheduling/schedule_test.go b/pkg/placement/controllers/scheduling/schedule_test.go index c5b957664..69872ec80 100644 --- a/pkg/placement/controllers/scheduling/schedule_test.go +++ b/pkg/placement/controllers/scheduling/schedule_test.go @@ -8,13 +8,14 @@ import ( "sort" "testing" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" clusterapiv1 "open-cluster-management.io/api/cluster/v1" clusterapiv1beta1 "open-cluster-management.io/api/cluster/v1beta1" clusterlisterv1beta1 "open-cluster-management.io/api/cluster/v1beta1" + "open-cluster-management.io/ocm/pkg/placement/controllers/framework" testinghelpers "open-cluster-management.io/ocm/pkg/placement/helpers/testing" ) diff --git a/pkg/placement/controllers/scheduling/scheduling_controller.go b/pkg/placement/controllers/scheduling/scheduling_controller.go index 161bc456a..f4252f9c3 100644 --- a/pkg/placement/controllers/scheduling/scheduling_controller.go +++ b/pkg/placement/controllers/scheduling/scheduling_controller.go @@ -24,12 +24,12 @@ import ( cache "k8s.io/client-go/tools/cache" kevents "k8s.io/client-go/tools/events" "k8s.io/klog/v2" + clusterclient "open-cluster-management.io/api/client/cluster/clientset/versioned" clusterinformerv1 "open-cluster-management.io/api/client/cluster/informers/externalversions/cluster/v1" clusterinformerv1alpha1 "open-cluster-management.io/api/client/cluster/informers/externalversions/cluster/v1alpha1" clusterinformerv1beta1 "open-cluster-management.io/api/client/cluster/informers/externalversions/cluster/v1beta1" clusterinformerv1beta2 "open-cluster-management.io/api/client/cluster/informers/externalversions/cluster/v1beta2" - clusterlisterv1 "open-cluster-management.io/api/client/cluster/listers/cluster/v1" clusterlisterv1beta1 "open-cluster-management.io/api/client/cluster/listers/cluster/v1beta1" clusterlisterv1beta2 "open-cluster-management.io/api/client/cluster/listers/cluster/v1beta2" diff --git a/pkg/placement/controllers/scheduling/scheduling_controller_test.go b/pkg/placement/controllers/scheduling/scheduling_controller_test.go index 1530cbe6f..aa79ca336 100644 --- a/pkg/placement/controllers/scheduling/scheduling_controller_test.go +++ b/pkg/placement/controllers/scheduling/scheduling_controller_test.go @@ -3,8 +3,6 @@ package scheduling import ( "context" "fmt" - testingcommon "open-cluster-management.io/ocm/pkg/common/testing" - "open-cluster-management.io/ocm/test/integration/util" "sort" "strings" "testing" @@ -15,13 +13,16 @@ import ( "k8s.io/apimachinery/pkg/util/sets" clienttesting "k8s.io/client-go/testing" kevents "k8s.io/client-go/tools/events" + clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" clusterapiv1 "open-cluster-management.io/api/cluster/v1" clusterapiv1beta1 "open-cluster-management.io/api/cluster/v1beta1" clusterapiv1beta2 "open-cluster-management.io/api/cluster/v1beta2" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" "open-cluster-management.io/ocm/pkg/placement/controllers/framework" testinghelpers "open-cluster-management.io/ocm/pkg/placement/helpers/testing" + "open-cluster-management.io/ocm/test/integration/util" ) type testScheduler struct { diff --git a/pkg/placement/debugger/debugger.go b/pkg/placement/debugger/debugger.go index 3ce89c67b..f814f6c33 100644 --- a/pkg/placement/debugger/debugger.go +++ b/pkg/placement/debugger/debugger.go @@ -7,10 +7,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + clusterinformerv1 "open-cluster-management.io/api/client/cluster/informers/externalversions/cluster/v1" clusterinformerv1beta1 "open-cluster-management.io/api/client/cluster/informers/externalversions/cluster/v1beta1" clusterlisterv1 "open-cluster-management.io/api/client/cluster/listers/cluster/v1" clusterlisterv1beta1 "open-cluster-management.io/api/client/cluster/listers/cluster/v1beta1" + scheduling "open-cluster-management.io/ocm/pkg/placement/controllers/scheduling" ) diff --git a/pkg/placement/debugger/debugger_test.go b/pkg/placement/debugger/debugger_test.go index c40a5b847..e498295b9 100644 --- a/pkg/placement/debugger/debugger_test.go +++ b/pkg/placement/debugger/debugger_test.go @@ -12,9 +12,11 @@ import ( "time" "k8s.io/apimachinery/pkg/runtime" + clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" clusterapiv1 "open-cluster-management.io/api/cluster/v1" clusterapiv1beta1 "open-cluster-management.io/api/cluster/v1beta1" + "open-cluster-management.io/ocm/pkg/placement/controllers/framework" scheduling "open-cluster-management.io/ocm/pkg/placement/controllers/scheduling" testinghelpers "open-cluster-management.io/ocm/pkg/placement/helpers/testing" diff --git a/pkg/placement/helpers/testing/helpers.go b/pkg/placement/helpers/testing/helpers.go index e47262a34..ddc3c9657 100644 --- a/pkg/placement/helpers/testing/helpers.go +++ b/pkg/placement/helpers/testing/helpers.go @@ -5,6 +5,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" kevents "k8s.io/client-go/tools/events" + clusterclient "open-cluster-management.io/api/client/cluster/clientset/versioned" clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" clusterlisterv1 "open-cluster-management.io/api/client/cluster/listers/cluster/v1" diff --git a/pkg/placement/helpers/testing/informer.go b/pkg/placement/helpers/testing/informer.go index eadc0afdc..259dbc164 100644 --- a/pkg/placement/helpers/testing/informer.go +++ b/pkg/placement/helpers/testing/informer.go @@ -4,6 +4,7 @@ import ( "time" "k8s.io/apimachinery/pkg/runtime" + clusterclient "open-cluster-management.io/api/client/cluster/clientset/versioned" clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" clusterapiv1 "open-cluster-management.io/api/cluster/v1" diff --git a/pkg/placement/plugins/addon/addon.go b/pkg/placement/plugins/addon/addon.go index 67b73c59e..64c0c529e 100644 --- a/pkg/placement/plugins/addon/addon.go +++ b/pkg/placement/plugins/addon/addon.go @@ -6,8 +6,10 @@ import ( "k8s.io/klog/v2" "k8s.io/utils/clock" + clusterapiv1 "open-cluster-management.io/api/cluster/v1" clusterapiv1beta1 "open-cluster-management.io/api/cluster/v1beta1" + "open-cluster-management.io/ocm/pkg/placement/controllers/framework" "open-cluster-management.io/ocm/pkg/placement/plugins" ) diff --git a/pkg/placement/plugins/addon/addon_test.go b/pkg/placement/plugins/addon/addon_test.go index d339bdd11..270effc78 100644 --- a/pkg/placement/plugins/addon/addon_test.go +++ b/pkg/placement/plugins/addon/addon_test.go @@ -9,8 +9,10 @@ import ( apiequality "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/runtime" testingclock "k8s.io/utils/clock/testing" + clusterapiv1 "open-cluster-management.io/api/cluster/v1" clusterapivbeta1 "open-cluster-management.io/api/cluster/v1beta1" + testinghelpers "open-cluster-management.io/ocm/pkg/placement/helpers/testing" ) diff --git a/pkg/placement/plugins/balance/balance.go b/pkg/placement/plugins/balance/balance.go index b86534847..1a47ac5d9 100644 --- a/pkg/placement/plugins/balance/balance.go +++ b/pkg/placement/plugins/balance/balance.go @@ -5,8 +5,10 @@ import ( "reflect" "k8s.io/apimachinery/pkg/labels" + clusterapiv1 "open-cluster-management.io/api/cluster/v1" clusterapiv1beta1 "open-cluster-management.io/api/cluster/v1beta1" + "open-cluster-management.io/ocm/pkg/placement/controllers/framework" "open-cluster-management.io/ocm/pkg/placement/plugins" ) diff --git a/pkg/placement/plugins/balance/balance_test.go b/pkg/placement/plugins/balance/balance_test.go index a5889b068..be43f04e6 100644 --- a/pkg/placement/plugins/balance/balance_test.go +++ b/pkg/placement/plugins/balance/balance_test.go @@ -6,8 +6,10 @@ import ( apiequality "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/runtime" + clusterapiv1 "open-cluster-management.io/api/cluster/v1" clusterapiv1beta1 "open-cluster-management.io/api/cluster/v1beta1" + testinghelpers "open-cluster-management.io/ocm/pkg/placement/helpers/testing" ) diff --git a/pkg/placement/plugins/interface.go b/pkg/placement/plugins/interface.go index 2c0d0099c..13e9aaf1f 100644 --- a/pkg/placement/plugins/interface.go +++ b/pkg/placement/plugins/interface.go @@ -6,12 +6,14 @@ import ( "time" "k8s.io/client-go/tools/events" + clusterclient "open-cluster-management.io/api/client/cluster/clientset/versioned" clusterlisterv1 "open-cluster-management.io/api/client/cluster/listers/cluster/v1" clusterlisterv1alpha1 "open-cluster-management.io/api/client/cluster/listers/cluster/v1alpha1" clusterlisterv1beta1 "open-cluster-management.io/api/client/cluster/listers/cluster/v1beta1" clusterapiv1 "open-cluster-management.io/api/cluster/v1" clusterapiv1beta1 "open-cluster-management.io/api/cluster/v1beta1" + "open-cluster-management.io/ocm/pkg/placement/controllers/framework" ) diff --git a/pkg/placement/plugins/predicate/predicate.go b/pkg/placement/plugins/predicate/predicate.go index a889c7d07..3bd93d672 100644 --- a/pkg/placement/plugins/predicate/predicate.go +++ b/pkg/placement/plugins/predicate/predicate.go @@ -9,6 +9,7 @@ import ( clusterapiv1 "open-cluster-management.io/api/cluster/v1" clusterapiv1beta1 "open-cluster-management.io/api/cluster/v1beta1" + "open-cluster-management.io/ocm/pkg/placement/controllers/framework" "open-cluster-management.io/ocm/pkg/placement/plugins" ) diff --git a/pkg/placement/plugins/predicate/predicate_test.go b/pkg/placement/plugins/predicate/predicate_test.go index 66ab606d6..6b6541db9 100644 --- a/pkg/placement/plugins/predicate/predicate_test.go +++ b/pkg/placement/plugins/predicate/predicate_test.go @@ -10,6 +10,7 @@ import ( clusterapiv1 "open-cluster-management.io/api/cluster/v1" clusterapiv1beta1 "open-cluster-management.io/api/cluster/v1beta1" + testinghelpers "open-cluster-management.io/ocm/pkg/placement/helpers/testing" ) diff --git a/pkg/placement/plugins/resource/resource.go b/pkg/placement/plugins/resource/resource.go index 6590cbeea..88bd7a945 100644 --- a/pkg/placement/plugins/resource/resource.go +++ b/pkg/placement/plugins/resource/resource.go @@ -8,6 +8,7 @@ import ( clusterapiv1 "open-cluster-management.io/api/cluster/v1" clusterapiv1beta1 "open-cluster-management.io/api/cluster/v1beta1" + "open-cluster-management.io/ocm/pkg/placement/controllers/framework" "open-cluster-management.io/ocm/pkg/placement/plugins" ) diff --git a/pkg/placement/plugins/resource/resource_test.go b/pkg/placement/plugins/resource/resource_test.go index bc5285b0e..454eb4c35 100644 --- a/pkg/placement/plugins/resource/resource_test.go +++ b/pkg/placement/plugins/resource/resource_test.go @@ -6,8 +6,10 @@ import ( apiequality "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/runtime" + clusterapiv1 "open-cluster-management.io/api/cluster/v1" clusterapiv1beta1 "open-cluster-management.io/api/cluster/v1beta1" + testinghelpers "open-cluster-management.io/ocm/pkg/placement/helpers/testing" ) diff --git a/pkg/placement/plugins/steady/steady.go b/pkg/placement/plugins/steady/steady.go index df877de7e..9c78382cb 100644 --- a/pkg/placement/plugins/steady/steady.go +++ b/pkg/placement/plugins/steady/steady.go @@ -7,8 +7,10 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/selection" "k8s.io/apimachinery/pkg/util/sets" + clusterapiv1 "open-cluster-management.io/api/cluster/v1" clusterapiv1beta1 "open-cluster-management.io/api/cluster/v1beta1" + "open-cluster-management.io/ocm/pkg/placement/controllers/framework" "open-cluster-management.io/ocm/pkg/placement/plugins" ) diff --git a/pkg/placement/plugins/steady/steady_test.go b/pkg/placement/plugins/steady/steady_test.go index ac1b77b32..a752744ff 100644 --- a/pkg/placement/plugins/steady/steady_test.go +++ b/pkg/placement/plugins/steady/steady_test.go @@ -6,8 +6,10 @@ import ( apiequality "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/runtime" + clusterapiv1 "open-cluster-management.io/api/cluster/v1" clusterapiv1beta1 "open-cluster-management.io/api/cluster/v1beta1" + testinghelpers "open-cluster-management.io/ocm/pkg/placement/helpers/testing" ) diff --git a/pkg/placement/plugins/tainttoleration/taint_toleration.go b/pkg/placement/plugins/tainttoleration/taint_toleration.go index df8a3880d..04baadcc2 100644 --- a/pkg/placement/plugins/tainttoleration/taint_toleration.go +++ b/pkg/placement/plugins/tainttoleration/taint_toleration.go @@ -11,8 +11,10 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/klog/v2" "k8s.io/utils/clock" + clusterapiv1 "open-cluster-management.io/api/cluster/v1" clusterapiv1beta1 "open-cluster-management.io/api/cluster/v1beta1" + "open-cluster-management.io/ocm/pkg/placement/controllers/framework" "open-cluster-management.io/ocm/pkg/placement/plugins" ) diff --git a/pkg/placement/plugins/tainttoleration/taint_toleration_test.go b/pkg/placement/plugins/tainttoleration/taint_toleration_test.go index 6b38cd328..355fbef90 100644 --- a/pkg/placement/plugins/tainttoleration/taint_toleration_test.go +++ b/pkg/placement/plugins/tainttoleration/taint_toleration_test.go @@ -11,8 +11,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" testingclock "k8s.io/utils/clock/testing" + clusterapiv1 "open-cluster-management.io/api/cluster/v1" clusterapiv1beta1 "open-cluster-management.io/api/cluster/v1beta1" + testinghelpers "open-cluster-management.io/ocm/pkg/placement/helpers/testing" "open-cluster-management.io/ocm/pkg/placement/plugins" ) diff --git a/pkg/registration/clientcert/cert_controller.go b/pkg/registration/clientcert/cert_controller.go index af4227f2c..13008206b 100644 --- a/pkg/registration/clientcert/cert_controller.go +++ b/pkg/registration/clientcert/cert_controller.go @@ -11,7 +11,6 @@ import ( "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" - corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" diff --git a/pkg/registration/clientcert/certificate.go b/pkg/registration/clientcert/certificate.go index 70373923f..6265879c7 100644 --- a/pkg/registration/clientcert/certificate.go +++ b/pkg/registration/clientcert/certificate.go @@ -22,7 +22,9 @@ import ( clientcmdapi "k8s.io/client-go/tools/clientcmd/api" certutil "k8s.io/client-go/util/cert" "k8s.io/klog/v2" + ocmfeature "open-cluster-management.io/api/feature" + "open-cluster-management.io/ocm/pkg/features" "open-cluster-management.io/ocm/pkg/registration/helpers" ) diff --git a/pkg/registration/helpers/helpers.go b/pkg/registration/helpers/helpers.go index a215aaa6c..27fed02d3 100644 --- a/pkg/registration/helpers/helpers.go +++ b/pkg/registration/helpers/helpers.go @@ -6,15 +6,12 @@ import ( "fmt" "net/url" - clusterv1 "open-cluster-management.io/api/cluster/v1" - "github.com/openshift/api" "github.com/openshift/library-go/pkg/assets" "github.com/openshift/library-go/pkg/operator/events" "github.com/openshift/library-go/pkg/operator/resource/resourceapply" "github.com/openshift/library-go/pkg/operator/resource/resourcehelper" errorhelpers "github.com/openshift/library-go/pkg/operator/v1helpers" - certificatesv1 "k8s.io/api/certificates/v1" certificatesv1beta1 "k8s.io/api/certificates/v1beta1" corev1 "k8s.io/api/core/v1" @@ -28,6 +25,8 @@ import ( "k8s.io/client-go/discovery/cached/memory" "k8s.io/client-go/kubernetes" "k8s.io/client-go/restmapper" + + clusterv1 "open-cluster-management.io/api/cluster/v1" ) var ( diff --git a/pkg/registration/helpers/helpers_test.go b/pkg/registration/helpers/helpers_test.go index 5192f6064..0a94e2358 100644 --- a/pkg/registration/helpers/helpers_test.go +++ b/pkg/registration/helpers/helpers_test.go @@ -4,20 +4,21 @@ import ( "context" "encoding/json" "fmt" - clusterv1 "open-cluster-management.io/api/cluster/v1" - testingcommon "open-cluster-management.io/ocm/pkg/common/testing" - testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" "reflect" "testing" "github.com/openshift/library-go/pkg/operator/events/eventstesting" - corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" fakekube "k8s.io/client-go/kubernetes/fake" clienttesting "k8s.io/client-go/testing" + + clusterv1 "open-cluster-management.io/api/cluster/v1" + + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" + testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" ) func TestIsValidHTTPSURL(t *testing.T) { diff --git a/pkg/registration/helpers/testing/assertion.go b/pkg/registration/helpers/testing/assertion.go index 43e5f4857..7dfc9f1e6 100644 --- a/pkg/registration/helpers/testing/assertion.go +++ b/pkg/registration/helpers/testing/assertion.go @@ -7,8 +7,6 @@ import ( "reflect" "testing" - clusterv1 "open-cluster-management.io/api/cluster/v1" - authorizationv1 "k8s.io/api/authorization/v1" certv1 "k8s.io/api/certificates/v1" certv1beta1 "k8s.io/api/certificates/v1beta1" @@ -17,6 +15,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/utils/diff" + + clusterv1 "open-cluster-management.io/api/cluster/v1" ) // AssertFinalizers asserts the given runtime object has the expected finalizers diff --git a/pkg/registration/helpers/testing/testinghelpers.go b/pkg/registration/helpers/testing/testinghelpers.go index cfb58972e..7cbe3e61b 100644 --- a/pkg/registration/helpers/testing/testinghelpers.go +++ b/pkg/registration/helpers/testing/testinghelpers.go @@ -14,9 +14,6 @@ import ( "net" "time" - clusterv1 "open-cluster-management.io/api/cluster/v1" - workapiv1 "open-cluster-management.io/api/work/v1" - certv1 "k8s.io/api/certificates/v1" certv1beta1 "k8s.io/api/certificates/v1beta1" coordv1 "k8s.io/api/coordination/v1" @@ -30,6 +27,9 @@ import ( clientcmdapi "k8s.io/client-go/tools/clientcmd/api" certutil "k8s.io/client-go/util/cert" "k8s.io/client-go/util/keyutil" + + clusterv1 "open-cluster-management.io/api/cluster/v1" + workapiv1 "open-cluster-management.io/api/work/v1" ) const ( diff --git a/pkg/registration/hub/addon/discovery_controller_test.go b/pkg/registration/hub/addon/discovery_controller_test.go index 4b1469404..5659a9577 100644 --- a/pkg/registration/hub/addon/discovery_controller_test.go +++ b/pkg/registration/hub/addon/discovery_controller_test.go @@ -16,6 +16,7 @@ import ( clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" clusterv1 "open-cluster-management.io/api/cluster/v1" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" ) diff --git a/pkg/registration/hub/addon/healthcheck_controller.go b/pkg/registration/hub/addon/healthcheck_controller.go index 8af7330ee..cf78efc97 100644 --- a/pkg/registration/hub/addon/healthcheck_controller.go +++ b/pkg/registration/hub/addon/healthcheck_controller.go @@ -2,11 +2,16 @@ package addon import ( "context" - patcher "open-cluster-management.io/ocm/pkg/common/patcher" "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" operatorhelpers "github.com/openshift/library-go/pkg/operator/v1helpers" + "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/api/meta" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/labels" + "k8s.io/apimachinery/pkg/runtime" + addonv1alpha1 "open-cluster-management.io/api/addon/v1alpha1" addonclient "open-cluster-management.io/api/client/addon/clientset/versioned" addoninformerv1alpha1 "open-cluster-management.io/api/client/addon/informers/externalversions/addon/v1alpha1" @@ -15,11 +20,7 @@ import ( clusterlisterv1 "open-cluster-management.io/api/client/cluster/listers/cluster/v1" clusterv1 "open-cluster-management.io/api/cluster/v1" - "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/api/meta" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/apimachinery/pkg/runtime" + patcher "open-cluster-management.io/ocm/pkg/common/patcher" ) // managedClusterAddonHealthCheckController udpates managed cluster addons status through watching the managed cluster status on diff --git a/pkg/registration/hub/addon/healthcheck_controller_test.go b/pkg/registration/hub/addon/healthcheck_controller_test.go index c745ac17f..c10b8d582 100644 --- a/pkg/registration/hub/addon/healthcheck_controller_test.go +++ b/pkg/registration/hub/addon/healthcheck_controller_test.go @@ -10,11 +10,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" clienttesting "k8s.io/client-go/testing" + addonv1alpha1 "open-cluster-management.io/api/addon/v1alpha1" addonfake "open-cluster-management.io/api/client/addon/clientset/versioned/fake" addoninformers "open-cluster-management.io/api/client/addon/informers/externalversions" clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" ) diff --git a/pkg/registration/hub/clusterrole/controller.go b/pkg/registration/hub/clusterrole/controller.go index 296d67308..a6617b4c0 100644 --- a/pkg/registration/hub/clusterrole/controller.go +++ b/pkg/registration/hub/clusterrole/controller.go @@ -5,20 +5,20 @@ import ( "embed" "fmt" - clusterv1informer "open-cluster-management.io/api/client/cluster/informers/externalversions/cluster/v1" - clusterv1listers "open-cluster-management.io/api/client/cluster/listers/cluster/v1" - "open-cluster-management.io/ocm/pkg/registration/helpers" - "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" "github.com/openshift/library-go/pkg/operator/resource/resourceapply" operatorhelpers "github.com/openshift/library-go/pkg/operator/v1helpers" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/sets" rbacv1informers "k8s.io/client-go/informers/rbac/v1" "k8s.io/client-go/kubernetes" + + clusterv1informer "open-cluster-management.io/api/client/cluster/informers/externalversions/cluster/v1" + clusterv1listers "open-cluster-management.io/api/client/cluster/listers/cluster/v1" + + "open-cluster-management.io/ocm/pkg/registration/helpers" ) const ( diff --git a/pkg/registration/hub/clusterrole/controller_test.go b/pkg/registration/hub/clusterrole/controller_test.go index 3f39f389f..c463de5b8 100644 --- a/pkg/registration/hub/clusterrole/controller_test.go +++ b/pkg/registration/hub/clusterrole/controller_test.go @@ -5,19 +5,19 @@ import ( "testing" "time" - "github.com/openshift/library-go/pkg/operator/resource/resourceapply" - clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" - clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" - testingcommon "open-cluster-management.io/ocm/pkg/common/testing" - testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" - "github.com/openshift/library-go/pkg/operator/events/eventstesting" - + "github.com/openshift/library-go/pkg/operator/resource/resourceapply" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" kubefake "k8s.io/client-go/kubernetes/fake" clienttesting "k8s.io/client-go/testing" + + clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" + clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" + + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" + testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" ) func TestSyncManagedClusterClusterRole(t *testing.T) { diff --git a/pkg/registration/hub/csr/controller.go b/pkg/registration/hub/csr/controller.go index 3515a6a19..5e1033b88 100644 --- a/pkg/registration/hub/csr/controller.go +++ b/pkg/registration/hub/csr/controller.go @@ -15,6 +15,7 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" + "open-cluster-management.io/ocm/pkg/registration/helpers" ) diff --git a/pkg/registration/hub/csr/controller_beta_test.go b/pkg/registration/hub/csr/controller_beta_test.go index df3e1d7bf..b653de7d3 100644 --- a/pkg/registration/hub/csr/controller_beta_test.go +++ b/pkg/registration/hub/csr/controller_beta_test.go @@ -14,6 +14,7 @@ import ( "k8s.io/client-go/informers" kubefake "k8s.io/client-go/kubernetes/fake" clienttesting "k8s.io/client-go/testing" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" "open-cluster-management.io/ocm/pkg/registration/hub/user" diff --git a/pkg/registration/hub/csr/controller_test.go b/pkg/registration/hub/csr/controller_test.go index bb20d01c8..eb9be4e8b 100644 --- a/pkg/registration/hub/csr/controller_test.go +++ b/pkg/registration/hub/csr/controller_test.go @@ -5,15 +5,7 @@ import ( "testing" "time" - clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" - clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" - clusterv1 "open-cluster-management.io/api/cluster/v1" - testingcommon "open-cluster-management.io/ocm/pkg/common/testing" - testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" - "open-cluster-management.io/ocm/pkg/registration/hub/user" - "github.com/openshift/library-go/pkg/operator/events/eventstesting" - authorizationv1 "k8s.io/api/authorization/v1" certificatesv1 "k8s.io/api/certificates/v1" corev1 "k8s.io/api/core/v1" @@ -23,6 +15,14 @@ import ( "k8s.io/client-go/informers" kubefake "k8s.io/client-go/kubernetes/fake" clienttesting "k8s.io/client-go/testing" + + clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" + clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" + clusterv1 "open-cluster-management.io/api/cluster/v1" + + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" + testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" + "open-cluster-management.io/ocm/pkg/registration/hub/user" ) var ( diff --git a/pkg/registration/hub/csr/reconciler.go b/pkg/registration/hub/csr/reconciler.go index bb47310ac..7680c3ccc 100644 --- a/pkg/registration/hub/csr/reconciler.go +++ b/pkg/registration/hub/csr/reconciler.go @@ -8,7 +8,6 @@ import ( "strings" "github.com/openshift/library-go/pkg/operator/events" - authorizationv1 "k8s.io/api/authorization/v1" certificatesv1 "k8s.io/api/certificates/v1" certificatesv1beta1 "k8s.io/api/certificates/v1beta1" @@ -22,6 +21,7 @@ import ( clusterclientset "open-cluster-management.io/api/client/cluster/clientset/versioned" clusterv1listers "open-cluster-management.io/api/client/cluster/listers/cluster/v1" clusterv1 "open-cluster-management.io/api/cluster/v1" + "open-cluster-management.io/ocm/pkg/registration/hub/user" ) diff --git a/pkg/registration/hub/lease/controller.go b/pkg/registration/hub/lease/controller.go index 37fdaa9d3..55a0d5312 100644 --- a/pkg/registration/hub/lease/controller.go +++ b/pkg/registration/hub/lease/controller.go @@ -2,16 +2,10 @@ package lease import ( "context" - "open-cluster-management.io/ocm/pkg/common/patcher" "time" "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" - clientset "open-cluster-management.io/api/client/cluster/clientset/versioned" - clusterv1informer "open-cluster-management.io/api/client/cluster/informers/externalversions/cluster/v1" - clusterv1listers "open-cluster-management.io/api/client/cluster/listers/cluster/v1" - clusterv1 "open-cluster-management.io/api/cluster/v1" - coordv1 "k8s.io/api/coordination/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" @@ -21,6 +15,13 @@ import ( "k8s.io/client-go/kubernetes" coordlisters "k8s.io/client-go/listers/coordination/v1" "k8s.io/utils/pointer" + + clientset "open-cluster-management.io/api/client/cluster/clientset/versioned" + clusterv1informer "open-cluster-management.io/api/client/cluster/informers/externalversions/cluster/v1" + clusterv1listers "open-cluster-management.io/api/client/cluster/listers/cluster/v1" + clusterv1 "open-cluster-management.io/api/cluster/v1" + + "open-cluster-management.io/ocm/pkg/common/patcher" ) const leaseDurationTimes = 5 diff --git a/pkg/registration/hub/lease/controller_test.go b/pkg/registration/hub/lease/controller_test.go index 252869b71..98e4531e2 100644 --- a/pkg/registration/hub/lease/controller_test.go +++ b/pkg/registration/hub/lease/controller_test.go @@ -4,22 +4,23 @@ import ( "context" "encoding/json" "fmt" - "open-cluster-management.io/ocm/pkg/common/patcher" "testing" "time" - clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" - clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" - clusterv1 "open-cluster-management.io/api/cluster/v1" - v1 "open-cluster-management.io/api/cluster/v1" - testingcommon "open-cluster-management.io/ocm/pkg/common/testing" - testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" kubeinformers "k8s.io/client-go/informers" kubefake "k8s.io/client-go/kubernetes/fake" clienttesting "k8s.io/client-go/testing" + + clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" + clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" + clusterv1 "open-cluster-management.io/api/cluster/v1" + v1 "open-cluster-management.io/api/cluster/v1" + + "open-cluster-management.io/ocm/pkg/common/patcher" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" + testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" ) var now = time.Now() diff --git a/pkg/registration/hub/managedcluster/controller.go b/pkg/registration/hub/managedcluster/controller.go index 9d397c1c4..370ea97e1 100644 --- a/pkg/registration/hub/managedcluster/controller.go +++ b/pkg/registration/hub/managedcluster/controller.go @@ -4,25 +4,25 @@ import ( "context" "embed" "fmt" - "open-cluster-management.io/ocm/pkg/common/patcher" - - clientset "open-cluster-management.io/api/client/cluster/clientset/versioned" - informerv1 "open-cluster-management.io/api/client/cluster/informers/externalversions/cluster/v1" - listerv1 "open-cluster-management.io/api/client/cluster/listers/cluster/v1" - v1 "open-cluster-management.io/api/cluster/v1" - "open-cluster-management.io/ocm/pkg/registration/helpers" "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" "github.com/openshift/library-go/pkg/operator/resource/resourceapply" operatorhelpers "github.com/openshift/library-go/pkg/operator/v1helpers" - "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes" "k8s.io/klog/v2" + + clientset "open-cluster-management.io/api/client/cluster/clientset/versioned" + informerv1 "open-cluster-management.io/api/client/cluster/informers/externalversions/cluster/v1" + listerv1 "open-cluster-management.io/api/client/cluster/listers/cluster/v1" + v1 "open-cluster-management.io/api/cluster/v1" + + "open-cluster-management.io/ocm/pkg/common/patcher" + "open-cluster-management.io/ocm/pkg/registration/helpers" ) const ( diff --git a/pkg/registration/hub/managedcluster/controller_test.go b/pkg/registration/hub/managedcluster/controller_test.go index ed6cf518f..0f58a2b5b 100644 --- a/pkg/registration/hub/managedcluster/controller_test.go +++ b/pkg/registration/hub/managedcluster/controller_test.go @@ -3,23 +3,23 @@ package managedcluster import ( "context" "encoding/json" - "open-cluster-management.io/ocm/pkg/common/patcher" "testing" "time" - "github.com/openshift/library-go/pkg/operator/resource/resourceapply" - clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" - clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" - v1 "open-cluster-management.io/api/cluster/v1" - testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" - "github.com/openshift/library-go/pkg/operator/events/eventstesting" - + "github.com/openshift/library-go/pkg/operator/resource/resourceapply" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" kubefake "k8s.io/client-go/kubernetes/fake" clienttesting "k8s.io/client-go/testing" + + clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" + clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" + v1 "open-cluster-management.io/api/cluster/v1" + + "open-cluster-management.io/ocm/pkg/common/patcher" testingcommon "open-cluster-management.io/ocm/pkg/common/testing" + testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" ) func TestSyncManagedCluster(t *testing.T) { diff --git a/pkg/registration/hub/managedclusterset/controller.go b/pkg/registration/hub/managedclusterset/controller.go index 018d49c83..380f290db 100644 --- a/pkg/registration/hub/managedclusterset/controller.go +++ b/pkg/registration/hub/managedclusterset/controller.go @@ -3,7 +3,6 @@ package managedclusterset import ( "context" "fmt" - "open-cluster-management.io/ocm/pkg/common/patcher" "reflect" "github.com/openshift/library-go/pkg/controller/factory" @@ -17,6 +16,7 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" + clientset "open-cluster-management.io/api/client/cluster/clientset/versioned" clusterinformerv1 "open-cluster-management.io/api/client/cluster/informers/externalversions/cluster/v1" clusterinformerv1beta2 "open-cluster-management.io/api/client/cluster/informers/externalversions/cluster/v1beta2" @@ -24,6 +24,8 @@ import ( clusterlisterv1beta2 "open-cluster-management.io/api/client/cluster/listers/cluster/v1beta2" v1 "open-cluster-management.io/api/cluster/v1" clusterv1beta2 "open-cluster-management.io/api/cluster/v1beta2" + + "open-cluster-management.io/ocm/pkg/common/patcher" ) // managedClusterSetController reconciles instances of ManagedClusterSet on the hub. diff --git a/pkg/registration/hub/managedclusterset/controller_test.go b/pkg/registration/hub/managedclusterset/controller_test.go index 3e635faa8..25d4a6e76 100644 --- a/pkg/registration/hub/managedclusterset/controller_test.go +++ b/pkg/registration/hub/managedclusterset/controller_test.go @@ -2,8 +2,6 @@ package managedclusterset import ( "context" - "open-cluster-management.io/ocm/pkg/common/patcher" - testingcommon "open-cluster-management.io/ocm/pkg/common/testing" "reflect" "testing" "time" @@ -12,10 +10,14 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" + clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" clusterv1 "open-cluster-management.io/api/cluster/v1" clusterv1beta2 "open-cluster-management.io/api/cluster/v1beta2" + + "open-cluster-management.io/ocm/pkg/common/patcher" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" ) func TestSyncClusterSet(t *testing.T) { diff --git a/pkg/registration/hub/managedclusterset/default_managedclusterset_controller.go b/pkg/registration/hub/managedclusterset/default_managedclusterset_controller.go index 6ff7cf93b..1ad80eef7 100644 --- a/pkg/registration/hub/managedclusterset/default_managedclusterset_controller.go +++ b/pkg/registration/hub/managedclusterset/default_managedclusterset_controller.go @@ -13,6 +13,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/klog/v2" + clustersetv1beta2 "open-cluster-management.io/api/client/cluster/clientset/versioned/typed/cluster/v1beta2" clusterinformerv1beta2 "open-cluster-management.io/api/client/cluster/informers/externalversions/cluster/v1beta2" clusterlisterv1beta2 "open-cluster-management.io/api/client/cluster/listers/cluster/v1beta2" diff --git a/pkg/registration/hub/managedclusterset/default_managedclusterset_controller_test.go b/pkg/registration/hub/managedclusterset/default_managedclusterset_controller_test.go index aefad0dac..debd84e29 100644 --- a/pkg/registration/hub/managedclusterset/default_managedclusterset_controller_test.go +++ b/pkg/registration/hub/managedclusterset/default_managedclusterset_controller_test.go @@ -10,9 +10,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" clienttesting "k8s.io/client-go/testing" + clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" clusterv1beta2 "open-cluster-management.io/api/cluster/v1beta2" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" ) diff --git a/pkg/registration/hub/managedclusterset/global_managedclusterset_controller.go b/pkg/registration/hub/managedclusterset/global_managedclusterset_controller.go index f7b57c538..204474a4e 100644 --- a/pkg/registration/hub/managedclusterset/global_managedclusterset_controller.go +++ b/pkg/registration/hub/managedclusterset/global_managedclusterset_controller.go @@ -13,6 +13,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/klog/v2" + clustersetv1beta2 "open-cluster-management.io/api/client/cluster/clientset/versioned/typed/cluster/v1beta2" clusterinformerv1beta2 "open-cluster-management.io/api/client/cluster/informers/externalversions/cluster/v1beta2" clusterlisterv1beta2 "open-cluster-management.io/api/client/cluster/listers/cluster/v1beta2" diff --git a/pkg/registration/hub/managedclusterset/global_managedclusterset_controller_test.go b/pkg/registration/hub/managedclusterset/global_managedclusterset_controller_test.go index ee6857b80..223e9c00e 100644 --- a/pkg/registration/hub/managedclusterset/global_managedclusterset_controller_test.go +++ b/pkg/registration/hub/managedclusterset/global_managedclusterset_controller_test.go @@ -10,9 +10,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" clienttesting "k8s.io/client-go/testing" + clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" clusterv1beta2 "open-cluster-management.io/api/cluster/v1beta2" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" ) diff --git a/pkg/registration/hub/managedclustersetbinding/controller.go b/pkg/registration/hub/managedclustersetbinding/controller.go index 402be2505..d7911e7cc 100644 --- a/pkg/registration/hub/managedclustersetbinding/controller.go +++ b/pkg/registration/hub/managedclustersetbinding/controller.go @@ -3,6 +3,7 @@ package managedclustersetbinding import ( "context" "fmt" + "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" "k8s.io/apimachinery/pkg/api/errors" @@ -13,10 +14,12 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" + clientset "open-cluster-management.io/api/client/cluster/clientset/versioned" clusterinformerv1beta2 "open-cluster-management.io/api/client/cluster/informers/externalversions/cluster/v1beta2" clusterlisterv1beta2 "open-cluster-management.io/api/client/cluster/listers/cluster/v1beta2" clusterv1beta2 "open-cluster-management.io/api/cluster/v1beta2" + "open-cluster-management.io/ocm/pkg/common/patcher" ) diff --git a/pkg/registration/hub/managedclustersetbinding/controller_test.go b/pkg/registration/hub/managedclustersetbinding/controller_test.go index 0392f07fd..9f01bb307 100644 --- a/pkg/registration/hub/managedclustersetbinding/controller_test.go +++ b/pkg/registration/hub/managedclustersetbinding/controller_test.go @@ -12,9 +12,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" clienttesting "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" + clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" clusterv1beta2 "open-cluster-management.io/api/cluster/v1beta2" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" ) diff --git a/pkg/registration/hub/manager.go b/pkg/registration/hub/manager.go index 738647790..4df45245a 100644 --- a/pkg/registration/hub/manager.go +++ b/pkg/registration/hub/manager.go @@ -4,15 +4,16 @@ import ( "context" "time" + "github.com/openshift/library-go/pkg/controller/controllercmd" + "github.com/openshift/library-go/pkg/controller/factory" + "github.com/pkg/errors" + "github.com/spf13/pflag" certv1 "k8s.io/api/certificates/v1" certv1beta1 "k8s.io/api/certificates/v1beta1" - - ocmfeature "open-cluster-management.io/api/feature" - - "open-cluster-management.io/ocm/pkg/features" - "open-cluster-management.io/ocm/pkg/registration/helpers" - "open-cluster-management.io/ocm/pkg/registration/hub/managedclustersetbinding" - "open-cluster-management.io/ocm/pkg/registration/hub/taint" + kubeinformers "k8s.io/client-go/informers" + "k8s.io/client-go/kubernetes" + "k8s.io/client-go/rest" + "k8s.io/klog/v2" addonclient "open-cluster-management.io/api/client/addon/clientset/versioned" addoninformers "open-cluster-management.io/api/client/addon/informers/externalversions" @@ -20,23 +21,19 @@ import ( clusterv1informers "open-cluster-management.io/api/client/cluster/informers/externalversions" workv1client "open-cluster-management.io/api/client/work/clientset/versioned" workv1informers "open-cluster-management.io/api/client/work/informers/externalversions" + ocmfeature "open-cluster-management.io/api/feature" + + "open-cluster-management.io/ocm/pkg/features" + "open-cluster-management.io/ocm/pkg/registration/helpers" "open-cluster-management.io/ocm/pkg/registration/hub/addon" "open-cluster-management.io/ocm/pkg/registration/hub/clusterrole" "open-cluster-management.io/ocm/pkg/registration/hub/csr" "open-cluster-management.io/ocm/pkg/registration/hub/lease" "open-cluster-management.io/ocm/pkg/registration/hub/managedcluster" "open-cluster-management.io/ocm/pkg/registration/hub/managedclusterset" + "open-cluster-management.io/ocm/pkg/registration/hub/managedclustersetbinding" "open-cluster-management.io/ocm/pkg/registration/hub/rbacfinalizerdeletion" - - "github.com/openshift/library-go/pkg/controller/controllercmd" - "github.com/openshift/library-go/pkg/controller/factory" - "github.com/pkg/errors" - "github.com/spf13/pflag" - - kubeinformers "k8s.io/client-go/informers" - "k8s.io/client-go/kubernetes" - "k8s.io/client-go/rest" - "k8s.io/klog/v2" + "open-cluster-management.io/ocm/pkg/registration/hub/taint" ) var ResyncInterval = 5 * time.Minute diff --git a/pkg/registration/hub/rbacfinalizerdeletion/controller.go b/pkg/registration/hub/rbacfinalizerdeletion/controller.go index 01a68cf54..f2fe96e50 100644 --- a/pkg/registration/hub/rbacfinalizerdeletion/controller.go +++ b/pkg/registration/hub/rbacfinalizerdeletion/controller.go @@ -5,13 +5,8 @@ import ( "fmt" "reflect" - clusterv1listers "open-cluster-management.io/api/client/cluster/listers/cluster/v1" - worklister "open-cluster-management.io/api/client/work/listers/work/v1" - clusterv1 "open-cluster-management.io/api/cluster/v1" - "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" - corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -25,6 +20,10 @@ import ( rbacv1listers "k8s.io/client-go/listers/rbac/v1" "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" + + clusterv1listers "open-cluster-management.io/api/client/cluster/listers/cluster/v1" + worklister "open-cluster-management.io/api/client/work/listers/work/v1" + clusterv1 "open-cluster-management.io/api/cluster/v1" ) const ( diff --git a/pkg/registration/hub/rbacfinalizerdeletion/controller_test.go b/pkg/registration/hub/rbacfinalizerdeletion/controller_test.go index 92d878bf3..1ca74b3e6 100644 --- a/pkg/registration/hub/rbacfinalizerdeletion/controller_test.go +++ b/pkg/registration/hub/rbacfinalizerdeletion/controller_test.go @@ -6,16 +6,7 @@ import ( "testing" "time" - fakeclusterclient "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" - clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" - fakeworkclient "open-cluster-management.io/api/client/work/clientset/versioned/fake" - workinformers "open-cluster-management.io/api/client/work/informers/externalversions" - clusterv1 "open-cluster-management.io/api/cluster/v1" - workapiv1 "open-cluster-management.io/api/work/v1" - testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" - "github.com/openshift/library-go/pkg/operator/events" - corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -23,7 +14,16 @@ import ( kubeinformers "k8s.io/client-go/informers" fakeclient "k8s.io/client-go/kubernetes/fake" clienttesting "k8s.io/client-go/testing" + + fakeclusterclient "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" + clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" + fakeworkclient "open-cluster-management.io/api/client/work/clientset/versioned/fake" + workinformers "open-cluster-management.io/api/client/work/informers/externalversions" + clusterv1 "open-cluster-management.io/api/cluster/v1" + workapiv1 "open-cluster-management.io/api/work/v1" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" + testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" ) var roleName = fmt.Sprintf("%s:spoke-work", testinghelpers.TestManagedClusterName) diff --git a/pkg/registration/hub/taint/controller.go b/pkg/registration/hub/taint/controller.go index aa6190d73..26caa34f9 100644 --- a/pkg/registration/hub/taint/controller.go +++ b/pkg/registration/hub/taint/controller.go @@ -2,7 +2,6 @@ package taint import ( "context" - "open-cluster-management.io/ocm/pkg/common/patcher" "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" @@ -11,10 +10,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/klog/v2" + clientset "open-cluster-management.io/api/client/cluster/clientset/versioned" informerv1 "open-cluster-management.io/api/client/cluster/informers/externalversions/cluster/v1" listerv1 "open-cluster-management.io/api/client/cluster/listers/cluster/v1" v1 "open-cluster-management.io/api/cluster/v1" + + "open-cluster-management.io/ocm/pkg/common/patcher" "open-cluster-management.io/ocm/pkg/registration/helpers" ) diff --git a/pkg/registration/hub/taint/controller_test.go b/pkg/registration/hub/taint/controller_test.go index 97289defb..b741368e3 100644 --- a/pkg/registration/hub/taint/controller_test.go +++ b/pkg/registration/hub/taint/controller_test.go @@ -3,22 +3,21 @@ package taint import ( "context" "encoding/json" - "open-cluster-management.io/ocm/pkg/common/patcher" "reflect" "testing" "time" - v1 "open-cluster-management.io/api/cluster/v1" + "github.com/openshift/library-go/pkg/operator/events/eventstesting" + "k8s.io/apimachinery/pkg/runtime" + clienttesting "k8s.io/client-go/testing" clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" + v1 "open-cluster-management.io/api/cluster/v1" + + "open-cluster-management.io/ocm/pkg/common/patcher" testingcommon "open-cluster-management.io/ocm/pkg/common/testing" testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" - - "github.com/openshift/library-go/pkg/operator/events/eventstesting" - - "k8s.io/apimachinery/pkg/runtime" - clienttesting "k8s.io/client-go/testing" ) func TestSyncTaintCluster(t *testing.T) { diff --git a/pkg/registration/spoke/addon/configuration.go b/pkg/registration/spoke/addon/configuration.go index 4da79b573..6e34ac986 100644 --- a/pkg/registration/spoke/addon/configuration.go +++ b/pkg/registration/spoke/addon/configuration.go @@ -9,6 +9,7 @@ import ( "strings" certificatesv1 "k8s.io/api/certificates/v1" + addonv1alpha1 "open-cluster-management.io/api/addon/v1alpha1" ) diff --git a/pkg/registration/spoke/addon/configuration_test.go b/pkg/registration/spoke/addon/configuration_test.go index bc30980b1..56975c787 100644 --- a/pkg/registration/spoke/addon/configuration_test.go +++ b/pkg/registration/spoke/addon/configuration_test.go @@ -3,10 +3,11 @@ package addon import ( "testing" - addonv1alpha1 "open-cluster-management.io/api/addon/v1alpha1" - testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + addonv1alpha1 "open-cluster-management.io/api/addon/v1alpha1" + + testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" ) func TestGetRegistrationConfigs(t *testing.T) { diff --git a/pkg/registration/spoke/addon/lease_controller.go b/pkg/registration/spoke/addon/lease_controller.go index ea5479b65..e0d4b0400 100644 --- a/pkg/registration/spoke/addon/lease_controller.go +++ b/pkg/registration/spoke/addon/lease_controller.go @@ -3,16 +3,10 @@ package addon import ( "context" "fmt" - "open-cluster-management.io/ocm/pkg/common/patcher" "time" "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" - addonv1alpha1 "open-cluster-management.io/api/addon/v1alpha1" - addonclient "open-cluster-management.io/api/client/addon/clientset/versioned" - addoninformerv1alpha1 "open-cluster-management.io/api/client/addon/informers/externalversions/addon/v1alpha1" - addonlisterv1alpha1 "open-cluster-management.io/api/client/addon/listers/addon/v1alpha1" - "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -21,6 +15,13 @@ import ( coordv1client "k8s.io/client-go/kubernetes/typed/coordination/v1" "k8s.io/client-go/tools/cache" "k8s.io/utils/clock" + + addonv1alpha1 "open-cluster-management.io/api/addon/v1alpha1" + addonclient "open-cluster-management.io/api/client/addon/clientset/versioned" + addoninformerv1alpha1 "open-cluster-management.io/api/client/addon/informers/externalversions/addon/v1alpha1" + addonlisterv1alpha1 "open-cluster-management.io/api/client/addon/listers/addon/v1alpha1" + + "open-cluster-management.io/ocm/pkg/common/patcher" ) const leaseDurationTimes = 5 diff --git a/pkg/registration/spoke/addon/lease_controller_test.go b/pkg/registration/spoke/addon/lease_controller_test.go index cd6a02f93..94b76dc87 100644 --- a/pkg/registration/spoke/addon/lease_controller_test.go +++ b/pkg/registration/spoke/addon/lease_controller_test.go @@ -3,22 +3,23 @@ package addon import ( "context" "encoding/json" - "open-cluster-management.io/ocm/pkg/common/patcher" "testing" "time" - addonv1alpha1 "open-cluster-management.io/api/addon/v1alpha1" - addonfake "open-cluster-management.io/api/client/addon/clientset/versioned/fake" - addoninformers "open-cluster-management.io/api/client/addon/informers/externalversions" - testingcommon "open-cluster-management.io/ocm/pkg/common/testing" - testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" - "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" kubefake "k8s.io/client-go/kubernetes/fake" clienttesting "k8s.io/client-go/testing" clocktesting "k8s.io/utils/clock/testing" + + addonv1alpha1 "open-cluster-management.io/api/addon/v1alpha1" + addonfake "open-cluster-management.io/api/client/addon/clientset/versioned/fake" + addoninformers "open-cluster-management.io/api/client/addon/informers/externalversions" + + "open-cluster-management.io/ocm/pkg/common/patcher" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" + testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" ) var now = time.Now() diff --git a/pkg/registration/spoke/addon/registration_controller.go b/pkg/registration/spoke/addon/registration_controller.go index e30dd88cd..42143ac3c 100644 --- a/pkg/registration/spoke/addon/registration_controller.go +++ b/pkg/registration/spoke/addon/registration_controller.go @@ -3,12 +3,8 @@ package addon import ( "context" "fmt" - "open-cluster-management.io/ocm/pkg/common/patcher" "time" - addonv1alpha1 "open-cluster-management.io/api/addon/v1alpha1" - clusterv1 "open-cluster-management.io/api/cluster/v1" - "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" operatorhelpers "github.com/openshift/library-go/pkg/operator/v1helpers" @@ -22,9 +18,14 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" + + addonv1alpha1 "open-cluster-management.io/api/addon/v1alpha1" addonclient "open-cluster-management.io/api/client/addon/clientset/versioned" addoninformerv1alpha1 "open-cluster-management.io/api/client/addon/informers/externalversions/addon/v1alpha1" addonlisterv1alpha1 "open-cluster-management.io/api/client/addon/listers/addon/v1alpha1" + clusterv1 "open-cluster-management.io/api/cluster/v1" + + "open-cluster-management.io/ocm/pkg/common/patcher" "open-cluster-management.io/ocm/pkg/registration/clientcert" ) diff --git a/pkg/registration/spoke/addon/registration_controller_test.go b/pkg/registration/spoke/addon/registration_controller_test.go index 140f11d68..1741d13a7 100644 --- a/pkg/registration/spoke/addon/registration_controller_test.go +++ b/pkg/registration/spoke/addon/registration_controller_test.go @@ -5,19 +5,19 @@ import ( "testing" "time" - clusterv1 "open-cluster-management.io/api/cluster/v1" - "github.com/openshift/library-go/pkg/controller/factory" + "github.com/openshift/library-go/pkg/operator/events/eventstesting" certificates "k8s.io/api/certificates/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" kubefake "k8s.io/client-go/kubernetes/fake" clienttesting "k8s.io/client-go/testing" - "github.com/openshift/library-go/pkg/operator/events/eventstesting" addonv1alpha1 "open-cluster-management.io/api/addon/v1alpha1" addonfake "open-cluster-management.io/api/client/addon/clientset/versioned/fake" addoninformers "open-cluster-management.io/api/client/addon/informers/externalversions" + clusterv1 "open-cluster-management.io/api/cluster/v1" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" ) diff --git a/pkg/registration/spoke/lease/lease_controller.go b/pkg/registration/spoke/lease/lease_controller.go index 1c93339e1..c1373e317 100644 --- a/pkg/registration/spoke/lease/lease_controller.go +++ b/pkg/registration/spoke/lease/lease_controller.go @@ -6,18 +6,17 @@ import ( "sync" "time" - clusterv1informer "open-cluster-management.io/api/client/cluster/informers/externalversions/cluster/v1" - clusterv1listers "open-cluster-management.io/api/client/cluster/listers/cluster/v1" - clusterv1 "open-cluster-management.io/api/cluster/v1" - "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" - "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" + + clusterv1informer "open-cluster-management.io/api/client/cluster/informers/externalversions/cluster/v1" + clusterv1listers "open-cluster-management.io/api/client/cluster/listers/cluster/v1" + clusterv1 "open-cluster-management.io/api/cluster/v1" ) const leaseUpdateJitterFactor = 0.25 diff --git a/pkg/registration/spoke/lease/lease_controller_test.go b/pkg/registration/spoke/lease/lease_controller_test.go index c39e8071e..4b12afa66 100644 --- a/pkg/registration/spoke/lease/lease_controller_test.go +++ b/pkg/registration/spoke/lease/lease_controller_test.go @@ -5,17 +5,17 @@ import ( "testing" "time" - clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" - clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" - testingcommon "open-cluster-management.io/ocm/pkg/common/testing" - testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" - "github.com/openshift/library-go/pkg/operator/events/eventstesting" - coordinationv1 "k8s.io/api/coordination/v1" "k8s.io/apimachinery/pkg/runtime" kubefake "k8s.io/client-go/kubernetes/fake" clienttesting "k8s.io/client-go/testing" + + clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" + clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" + + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" + testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" ) func TestLeaseUpdate(t *testing.T) { diff --git a/pkg/registration/spoke/managedcluster/claim_reconcile.go b/pkg/registration/spoke/managedcluster/claim_reconcile.go index 2eb901737..2e86bef1e 100644 --- a/pkg/registration/spoke/managedcluster/claim_reconcile.go +++ b/pkg/registration/spoke/managedcluster/claim_reconcile.go @@ -3,17 +3,20 @@ package managedcluster import ( "context" "fmt" + "sort" + "github.com/openshift/library-go/pkg/operator/events" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/selection" "k8s.io/apimachinery/pkg/util/sets" + clusterv1alpha1listers "open-cluster-management.io/api/client/cluster/listers/cluster/v1alpha1" clusterv1 "open-cluster-management.io/api/cluster/v1" clusterv1alpha1 "open-cluster-management.io/api/cluster/v1alpha1" ocmfeature "open-cluster-management.io/api/feature" + "open-cluster-management.io/ocm/pkg/features" - "sort" ) const labelCustomizedOnly = "open-cluster-management.io/spoke-only" diff --git a/pkg/registration/spoke/managedcluster/claim_reconcile_test.go b/pkg/registration/spoke/managedcluster/claim_reconcile_test.go index 2fa218719..9e72615f9 100644 --- a/pkg/registration/spoke/managedcluster/claim_reconcile_test.go +++ b/pkg/registration/spoke/managedcluster/claim_reconcile_test.go @@ -3,23 +3,24 @@ package managedcluster import ( "context" "encoding/json" - "github.com/openshift/library-go/pkg/operator/events/eventstesting" - kubeinformers "k8s.io/client-go/informers" - kubefake "k8s.io/client-go/kubernetes/fake" "reflect" "testing" "time" + "github.com/openshift/library-go/pkg/operator/events/eventstesting" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + kubeinformers "k8s.io/client-go/informers" + kubefake "k8s.io/client-go/kubernetes/fake" + clienttesting "k8s.io/client-go/testing" + clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" clusterv1 "open-cluster-management.io/api/cluster/v1" clusterv1alpha1 "open-cluster-management.io/api/cluster/v1alpha1" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" - - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - clienttesting "k8s.io/client-go/testing" ) func TestSync(t *testing.T) { diff --git a/pkg/registration/spoke/managedcluster/joining_controller_test.go b/pkg/registration/spoke/managedcluster/joining_controller_test.go index a777ceaf2..4482ebcf5 100644 --- a/pkg/registration/spoke/managedcluster/joining_controller_test.go +++ b/pkg/registration/spoke/managedcluster/joining_controller_test.go @@ -3,21 +3,22 @@ package managedcluster import ( "context" "encoding/json" - "github.com/openshift/library-go/pkg/operator/events/eventstesting" - kubeinformers "k8s.io/client-go/informers" - kubefake "k8s.io/client-go/kubernetes/fake" "testing" "time" + "github.com/openshift/library-go/pkg/operator/events/eventstesting" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + kubeinformers "k8s.io/client-go/informers" + kubefake "k8s.io/client-go/kubernetes/fake" + clienttesting "k8s.io/client-go/testing" + clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" clusterv1 "open-cluster-management.io/api/cluster/v1" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" - - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - clienttesting "k8s.io/client-go/testing" ) func TestSyncManagedCluster(t *testing.T) { diff --git a/pkg/registration/spoke/managedcluster/joining_reconcile.go b/pkg/registration/spoke/managedcluster/joining_reconcile.go index 870ea8c23..c5a86b9c3 100644 --- a/pkg/registration/spoke/managedcluster/joining_reconcile.go +++ b/pkg/registration/spoke/managedcluster/joining_reconcile.go @@ -2,9 +2,11 @@ package managedcluster import ( "context" + "github.com/openshift/library-go/pkg/operator/events" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + clusterv1 "open-cluster-management.io/api/cluster/v1" ) diff --git a/pkg/registration/spoke/managedcluster/resource_reconcile.go b/pkg/registration/spoke/managedcluster/resource_reconcile.go index 81114bc84..942ae6093 100644 --- a/pkg/registration/spoke/managedcluster/resource_reconcile.go +++ b/pkg/registration/spoke/managedcluster/resource_reconcile.go @@ -3,13 +3,15 @@ package managedcluster import ( "context" "fmt" + "net/http" + "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/discovery" corev1lister "k8s.io/client-go/listers/core/v1" - "net/http" + clusterv1 "open-cluster-management.io/api/cluster/v1" ) diff --git a/pkg/registration/spoke/managedcluster/resource_reconcile_test.go b/pkg/registration/spoke/managedcluster/resource_reconcile_test.go index 7523c8a20..7355ba8a2 100644 --- a/pkg/registration/spoke/managedcluster/resource_reconcile_test.go +++ b/pkg/registration/spoke/managedcluster/resource_reconcile_test.go @@ -3,18 +3,12 @@ package managedcluster import ( "context" "encoding/json" - "github.com/openshift/library-go/pkg/operator/events/eventstesting" "net/http" "net/http/httptest" "testing" "time" - clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" - clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" - clusterv1 "open-cluster-management.io/api/cluster/v1" - testingcommon "open-cluster-management.io/ocm/pkg/common/testing" - testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" - + "github.com/openshift/library-go/pkg/operator/events/eventstesting" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -25,6 +19,13 @@ import ( kubefake "k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/rest" clienttesting "k8s.io/client-go/testing" + + clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" + clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" + clusterv1 "open-cluster-management.io/api/cluster/v1" + + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" + testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" ) type serverResponse struct { diff --git a/pkg/registration/spoke/managedcluster/status_controller.go b/pkg/registration/spoke/managedcluster/status_controller.go index d8c3a12a1..f417f2cd5 100644 --- a/pkg/registration/spoke/managedcluster/status_controller.go +++ b/pkg/registration/spoke/managedcluster/status_controller.go @@ -3,20 +3,21 @@ package managedcluster import ( "context" "fmt" - "k8s.io/apimachinery/pkg/util/errors" - clusterv1alpha1informer "open-cluster-management.io/api/client/cluster/informers/externalversions/cluster/v1alpha1" - "open-cluster-management.io/ocm/pkg/common/patcher" "time" "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" + "k8s.io/apimachinery/pkg/util/errors" + discovery "k8s.io/client-go/discovery" + corev1informers "k8s.io/client-go/informers/core/v1" + clientset "open-cluster-management.io/api/client/cluster/clientset/versioned" clusterv1informer "open-cluster-management.io/api/client/cluster/informers/externalversions/cluster/v1" + clusterv1alpha1informer "open-cluster-management.io/api/client/cluster/informers/externalversions/cluster/v1alpha1" clusterv1listers "open-cluster-management.io/api/client/cluster/listers/cluster/v1" clusterv1 "open-cluster-management.io/api/cluster/v1" - discovery "k8s.io/client-go/discovery" - corev1informers "k8s.io/client-go/informers/core/v1" + "open-cluster-management.io/ocm/pkg/common/patcher" ) // managedClusterStatusController checks the kube-apiserver health on managed cluster to determine it whether is available diff --git a/pkg/registration/spoke/registration/creating_controller.go b/pkg/registration/spoke/registration/creating_controller.go index cb8a01ded..b23b45c1f 100644 --- a/pkg/registration/spoke/registration/creating_controller.go +++ b/pkg/registration/spoke/registration/creating_controller.go @@ -5,15 +5,15 @@ import ( "fmt" "time" - clientset "open-cluster-management.io/api/client/cluster/clientset/versioned" - clusterv1 "open-cluster-management.io/api/cluster/v1" - "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/klog/v2" + + clientset "open-cluster-management.io/api/client/cluster/clientset/versioned" + clusterv1 "open-cluster-management.io/api/cluster/v1" ) var ( diff --git a/pkg/registration/spoke/registration/creating_controller_test.go b/pkg/registration/spoke/registration/creating_controller_test.go index 539f3a5ba..13c42c89a 100644 --- a/pkg/registration/spoke/registration/creating_controller_test.go +++ b/pkg/registration/spoke/registration/creating_controller_test.go @@ -4,13 +4,14 @@ import ( "context" "testing" - clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" - clusterv1 "open-cluster-management.io/api/cluster/v1" - testingcommon "open-cluster-management.io/ocm/pkg/common/testing" - testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" - "k8s.io/apimachinery/pkg/runtime" clienttesting "k8s.io/client-go/testing" + + clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" + clusterv1 "open-cluster-management.io/api/cluster/v1" + + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" + testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" ) const testSpokeExternalServerUrl = "https://192.168.3.77:32769" diff --git a/pkg/registration/spoke/registration/registration.go b/pkg/registration/spoke/registration/registration.go index e4f7f99b3..8ddc63134 100644 --- a/pkg/registration/spoke/registration/registration.go +++ b/pkg/registration/spoke/registration/registration.go @@ -3,18 +3,13 @@ package registration import ( "crypto/x509/pkix" "fmt" - "k8s.io/apimachinery/pkg/api/errors" - clusterv1listers "open-cluster-management.io/api/client/cluster/listers/cluster/v1" - "open-cluster-management.io/ocm/pkg/common/patcher" "strings" - addonv1alpha1 "open-cluster-management.io/api/addon/v1alpha1" - clusterv1 "open-cluster-management.io/api/cluster/v1" - "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" "golang.org/x/net/context" certificates "k8s.io/api/certificates/v1" + "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilruntime "k8s.io/apimachinery/pkg/util/runtime" @@ -22,8 +17,13 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/cache" certutil "k8s.io/client-go/util/cert" - clientset "open-cluster-management.io/api/client/cluster/clientset/versioned" + addonv1alpha1 "open-cluster-management.io/api/addon/v1alpha1" + clientset "open-cluster-management.io/api/client/cluster/clientset/versioned" + clusterv1listers "open-cluster-management.io/api/client/cluster/listers/cluster/v1" + clusterv1 "open-cluster-management.io/api/cluster/v1" + + "open-cluster-management.io/ocm/pkg/common/patcher" "open-cluster-management.io/ocm/pkg/registration/clientcert" "open-cluster-management.io/ocm/pkg/registration/hub/user" ) diff --git a/pkg/registration/spoke/registration/secret_controller.go b/pkg/registration/spoke/registration/secret_controller.go index 3a04e7762..658f338aa 100644 --- a/pkg/registration/spoke/registration/secret_controller.go +++ b/pkg/registration/spoke/registration/secret_controller.go @@ -12,7 +12,6 @@ import ( "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" - "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/registration/spoke/registration/secret_controller_test.go b/pkg/registration/spoke/registration/secret_controller_test.go index 38932013e..7b9d0df6d 100644 --- a/pkg/registration/spoke/registration/secret_controller_test.go +++ b/pkg/registration/spoke/registration/secret_controller_test.go @@ -10,12 +10,12 @@ import ( "time" "github.com/openshift/library-go/pkg/operator/events/eventstesting" - "open-cluster-management.io/ocm/pkg/registration/clientcert" - testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" - corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/rand" kubefake "k8s.io/client-go/kubernetes/fake" + + "open-cluster-management.io/ocm/pkg/registration/clientcert" + testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" ) const ( diff --git a/pkg/registration/spoke/spokeagent.go b/pkg/registration/spoke/spokeagent.go index 7c1748f93..fecdea05b 100644 --- a/pkg/registration/spoke/spokeagent.go +++ b/pkg/registration/spoke/spokeagent.go @@ -4,32 +4,14 @@ import ( "context" "errors" "fmt" - "open-cluster-management.io/ocm/pkg/registration/spoke/lease" - "open-cluster-management.io/ocm/pkg/registration/spoke/registration" "os" "path" "time" - clusterv1 "open-cluster-management.io/api/cluster/v1" - ocmfeature "open-cluster-management.io/api/feature" - - addonclient "open-cluster-management.io/api/client/addon/clientset/versioned" - addoninformers "open-cluster-management.io/api/client/addon/informers/externalversions" - clusterv1client "open-cluster-management.io/api/client/cluster/clientset/versioned" - clusterv1informers "open-cluster-management.io/api/client/cluster/informers/externalversions" - commonoptions "open-cluster-management.io/ocm/pkg/common/options" - "open-cluster-management.io/ocm/pkg/features" - "open-cluster-management.io/ocm/pkg/registration/clientcert" - "open-cluster-management.io/ocm/pkg/registration/helpers" - "open-cluster-management.io/ocm/pkg/registration/spoke/addon" - "open-cluster-management.io/ocm/pkg/registration/spoke/managedcluster" - "github.com/openshift/library-go/pkg/controller/controllercmd" "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" - "github.com/spf13/pflag" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" utilrand "k8s.io/apimachinery/pkg/util/rand" @@ -41,6 +23,22 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" "k8s.io/klog/v2" + + addonclient "open-cluster-management.io/api/client/addon/clientset/versioned" + addoninformers "open-cluster-management.io/api/client/addon/informers/externalversions" + clusterv1client "open-cluster-management.io/api/client/cluster/clientset/versioned" + clusterv1informers "open-cluster-management.io/api/client/cluster/informers/externalversions" + clusterv1 "open-cluster-management.io/api/cluster/v1" + ocmfeature "open-cluster-management.io/api/feature" + + commonoptions "open-cluster-management.io/ocm/pkg/common/options" + "open-cluster-management.io/ocm/pkg/features" + "open-cluster-management.io/ocm/pkg/registration/clientcert" + "open-cluster-management.io/ocm/pkg/registration/helpers" + "open-cluster-management.io/ocm/pkg/registration/spoke/addon" + "open-cluster-management.io/ocm/pkg/registration/spoke/lease" + "open-cluster-management.io/ocm/pkg/registration/spoke/managedcluster" + "open-cluster-management.io/ocm/pkg/registration/spoke/registration" ) const ( diff --git a/pkg/registration/spoke/spokeagent_test.go b/pkg/registration/spoke/spokeagent_test.go index a1ebb37b3..bb501a452 100644 --- a/pkg/registration/spoke/spokeagent_test.go +++ b/pkg/registration/spoke/spokeagent_test.go @@ -3,21 +3,21 @@ package spoke import ( "bytes" "context" - commonoptions "open-cluster-management.io/ocm/pkg/common/options" "os" "path" "testing" "time" "github.com/openshift/library-go/pkg/operator/events/eventstesting" - testingcommon "open-cluster-management.io/ocm/pkg/common/testing" - "open-cluster-management.io/ocm/pkg/registration/clientcert" - testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" - corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" kubefake "k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/rest" + + commonoptions "open-cluster-management.io/ocm/pkg/common/options" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" + "open-cluster-management.io/ocm/pkg/registration/clientcert" + testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" ) func TestComplete(t *testing.T) { diff --git a/pkg/registration/webhook/start.go b/pkg/registration/webhook/start.go index 641ef61be..833835469 100644 --- a/pkg/registration/webhook/start.go +++ b/pkg/registration/webhook/start.go @@ -1,24 +1,22 @@ package webhook import ( - "k8s.io/klog/v2" - "k8s.io/apimachinery/pkg/runtime" - + utilruntime "k8s.io/apimachinery/pkg/util/runtime" + clientgoscheme "k8s.io/client-go/kubernetes/scheme" // 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" - clusterv1 "open-cluster-management.io/api/cluster/v1" - internalv1 "open-cluster-management.io/ocm/pkg/registration/webhook/v1" - internalv1beta1 "open-cluster-management.io/ocm/pkg/registration/webhook/v1beta1" - internalv1beta2 "open-cluster-management.io/ocm/pkg/registration/webhook/v1beta2" - - utilruntime "k8s.io/apimachinery/pkg/util/runtime" - clientgoscheme "k8s.io/client-go/kubernetes/scheme" - + "k8s.io/klog/v2" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/healthz" "sigs.k8s.io/controller-runtime/pkg/webhook" + + clusterv1 "open-cluster-management.io/api/cluster/v1" + + internalv1 "open-cluster-management.io/ocm/pkg/registration/webhook/v1" + internalv1beta1 "open-cluster-management.io/ocm/pkg/registration/webhook/v1beta1" + internalv1beta2 "open-cluster-management.io/ocm/pkg/registration/webhook/v1beta2" ) var ( diff --git a/pkg/registration/webhook/v1/managedcluster_mutating.go b/pkg/registration/webhook/v1/managedcluster_mutating.go index f1d894fe5..41ccfe190 100644 --- a/pkg/registration/webhook/v1/managedcluster_mutating.go +++ b/pkg/registration/webhook/v1/managedcluster_mutating.go @@ -10,13 +10,15 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "sigs.k8s.io/controller-runtime/pkg/webhook" + "sigs.k8s.io/controller-runtime/pkg/webhook/admission" + clusterv1 "open-cluster-management.io/api/cluster/v1" clusterv1beta2 "open-cluster-management.io/api/cluster/v1beta2" ocmfeature "open-cluster-management.io/api/feature" + "open-cluster-management.io/ocm/pkg/features" "open-cluster-management.io/ocm/pkg/registration/helpers" - "sigs.k8s.io/controller-runtime/pkg/webhook" - "sigs.k8s.io/controller-runtime/pkg/webhook/admission" ) var ( diff --git a/pkg/registration/webhook/v1/managedcluster_mutating_test.go b/pkg/registration/webhook/v1/managedcluster_mutating_test.go index d5a660abe..4e86a26bd 100644 --- a/pkg/registration/webhook/v1/managedcluster_mutating_test.go +++ b/pkg/registration/webhook/v1/managedcluster_mutating_test.go @@ -8,19 +8,17 @@ import ( "testing" "time" - apiruntime "k8s.io/apimachinery/pkg/runtime" - - "k8s.io/apimachinery/pkg/util/runtime" - ocmfeature "open-cluster-management.io/api/feature" - "open-cluster-management.io/ocm/pkg/features" - admissionv1 "k8s.io/api/admission/v1" - "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + apiruntime "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/runtime" + "sigs.k8s.io/controller-runtime/pkg/webhook/admission" clusterv1 "open-cluster-management.io/api/cluster/v1" clusterv1beta2 "open-cluster-management.io/api/cluster/v1beta2" + ocmfeature "open-cluster-management.io/api/feature" + + "open-cluster-management.io/ocm/pkg/features" ) func TestDefault(t *testing.T) { diff --git a/pkg/registration/webhook/v1/managedcluster_validating.go b/pkg/registration/webhook/v1/managedcluster_validating.go index 15d73c2d9..220f21248 100644 --- a/pkg/registration/webhook/v1/managedcluster_validating.go +++ b/pkg/registration/webhook/v1/managedcluster_validating.go @@ -8,19 +8,18 @@ import ( operatorhelpers "github.com/openshift/library-go/pkg/operator/v1helpers" authenticationv1 "k8s.io/api/authentication/v1" authorizationv1 "k8s.io/api/authorization/v1" + corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" apimachineryvalidation "k8s.io/apimachinery/pkg/api/validation" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - clusterv1beta2 "open-cluster-management.io/api/cluster/v1beta2" - - v1 "open-cluster-management.io/api/cluster/v1" - "open-cluster-management.io/ocm/pkg/registration/helpers" - "sigs.k8s.io/controller-runtime/pkg/webhook" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - corev1 "k8s.io/api/core/v1" + v1 "open-cluster-management.io/api/cluster/v1" + clusterv1beta2 "open-cluster-management.io/api/cluster/v1beta2" + + "open-cluster-management.io/ocm/pkg/registration/helpers" ) var _ webhook.CustomValidator = &ManagedClusterWebhook{} diff --git a/pkg/registration/webhook/v1/managedcluster_validating_test.go b/pkg/registration/webhook/v1/managedcluster_validating_test.go index 457844d4e..7139f2f99 100644 --- a/pkg/registration/webhook/v1/managedcluster_validating_test.go +++ b/pkg/registration/webhook/v1/managedcluster_validating_test.go @@ -5,18 +5,16 @@ import ( "testing" admissionv1 "k8s.io/api/admission/v1" - "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - authorizationv1 "k8s.io/api/authorization/v1" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" kubefake "k8s.io/client-go/kubernetes/fake" - clienttesting "k8s.io/client-go/testing" + "sigs.k8s.io/controller-runtime/pkg/webhook/admission" + v1 "open-cluster-management.io/api/cluster/v1" "open-cluster-management.io/api/cluster/v1beta1" - - corev1 "k8s.io/api/core/v1" ) func TestValidateCreate(t *testing.T) { diff --git a/pkg/registration/webhook/v1/webhook.go b/pkg/registration/webhook/v1/webhook.go index ae579bc4c..723953e61 100644 --- a/pkg/registration/webhook/v1/webhook.go +++ b/pkg/registration/webhook/v1/webhook.go @@ -2,8 +2,9 @@ package v1 import ( "k8s.io/client-go/kubernetes" - v1 "open-cluster-management.io/api/cluster/v1" ctrl "sigs.k8s.io/controller-runtime" + + v1 "open-cluster-management.io/api/cluster/v1" ) type ManagedClusterWebhook struct { diff --git a/pkg/registration/webhook/v1beta1/managedclustersetbinding_validating.go b/pkg/registration/webhook/v1beta1/managedclustersetbinding_validating.go index 07ae11509..3d01d18f0 100644 --- a/pkg/registration/webhook/v1beta1/managedclustersetbinding_validating.go +++ b/pkg/registration/webhook/v1beta1/managedclustersetbinding_validating.go @@ -5,17 +5,15 @@ import ( "fmt" authenticationv1 "k8s.io/api/authentication/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/client-go/kubernetes" - authorizationv1 "k8s.io/api/authorization/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - "open-cluster-management.io/api/cluster/v1beta1" - + "k8s.io/client-go/kubernetes" "sigs.k8s.io/controller-runtime/pkg/webhook" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" + + "open-cluster-management.io/api/cluster/v1beta1" ) var _ webhook.CustomValidator = &ManagedClusterSetBindingWebhook{} diff --git a/pkg/registration/webhook/v1beta1/managedclustersetbinding_validating_test.go b/pkg/registration/webhook/v1beta1/managedclustersetbinding_validating_test.go index 5456213b2..a516ff45b 100644 --- a/pkg/registration/webhook/v1beta1/managedclustersetbinding_validating_test.go +++ b/pkg/registration/webhook/v1beta1/managedclustersetbinding_validating_test.go @@ -5,14 +5,13 @@ import ( "testing" admissionv1 "k8s.io/api/admission/v1" - "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - authorizationv1 "k8s.io/api/authorization/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" kubefake "k8s.io/client-go/kubernetes/fake" - clienttesting "k8s.io/client-go/testing" + "sigs.k8s.io/controller-runtime/pkg/webhook/admission" + "open-cluster-management.io/api/cluster/v1beta1" ) diff --git a/pkg/registration/webhook/v1beta1/webhook.go b/pkg/registration/webhook/v1beta1/webhook.go index 763cb676c..7b272c38e 100644 --- a/pkg/registration/webhook/v1beta1/webhook.go +++ b/pkg/registration/webhook/v1beta1/webhook.go @@ -5,8 +5,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/kubernetes" - "open-cluster-management.io/api/cluster/v1beta1" ctrl "sigs.k8s.io/controller-runtime" + + "open-cluster-management.io/api/cluster/v1beta1" ) var ( diff --git a/pkg/registration/webhook/v1beta2/managedclusterset_conversion.go b/pkg/registration/webhook/v1beta2/managedclusterset_conversion.go index 16cc64fa3..986fe3cc5 100644 --- a/pkg/registration/webhook/v1beta2/managedclusterset_conversion.go +++ b/pkg/registration/webhook/v1beta2/managedclusterset_conversion.go @@ -2,10 +2,12 @@ package v1beta2 import ( "k8s.io/klog/v2" + "sigs.k8s.io/controller-runtime/pkg/conversion" + "open-cluster-management.io/api/cluster/v1beta1" "open-cluster-management.io/api/cluster/v1beta2" + internalv1beta1 "open-cluster-management.io/ocm/pkg/registration/webhook/v1beta1" - "sigs.k8s.io/controller-runtime/pkg/conversion" ) /* diff --git a/pkg/registration/webhook/v1beta2/managedclustersetbinding_validating.go b/pkg/registration/webhook/v1beta2/managedclustersetbinding_validating.go index 554b68ca7..2337346e9 100644 --- a/pkg/registration/webhook/v1beta2/managedclustersetbinding_validating.go +++ b/pkg/registration/webhook/v1beta2/managedclustersetbinding_validating.go @@ -4,13 +4,13 @@ import ( "context" apierrors "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/runtime" - "open-cluster-management.io/api/cluster/v1beta2" - internalv1beta1 "open-cluster-management.io/ocm/pkg/registration/webhook/v1beta1" - "sigs.k8s.io/controller-runtime/pkg/webhook" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" + + "open-cluster-management.io/api/cluster/v1beta2" + + internalv1beta1 "open-cluster-management.io/ocm/pkg/registration/webhook/v1beta1" ) var _ webhook.CustomValidator = &ManagedClusterSetBindingWebhook{} diff --git a/pkg/registration/webhook/v1beta2/webhook.go b/pkg/registration/webhook/v1beta2/webhook.go index be3ea76a8..6d17c236b 100644 --- a/pkg/registration/webhook/v1beta2/webhook.go +++ b/pkg/registration/webhook/v1beta2/webhook.go @@ -4,8 +4,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes" - "open-cluster-management.io/api/cluster/v1beta2" ctrl "sigs.k8s.io/controller-runtime" + + "open-cluster-management.io/api/cluster/v1beta2" ) var ( diff --git a/pkg/work/helper/helper_test.go b/pkg/work/helper/helper_test.go index 8ebf35d01..375290d9c 100644 --- a/pkg/work/helper/helper_test.go +++ b/pkg/work/helper/helper_test.go @@ -9,7 +9,6 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/openshift/library-go/pkg/operator/events/eventstesting" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/equality" @@ -20,6 +19,7 @@ import ( "k8s.io/apimachinery/pkg/types" fakedynamic "k8s.io/client-go/dynamic/fake" clienttesting "k8s.io/client-go/testing" + fakeworkclient "open-cluster-management.io/api/client/work/clientset/versioned/fake" workapiv1 "open-cluster-management.io/api/work/v1" diff --git a/pkg/work/helper/helpers.go b/pkg/work/helper/helpers.go index eb1548f15..5faac4454 100644 --- a/pkg/work/helper/helpers.go +++ b/pkg/work/helper/helpers.go @@ -28,6 +28,7 @@ import ( "k8s.io/client-go/dynamic" "k8s.io/client-go/util/retry" "k8s.io/klog/v2" + clusterlister "open-cluster-management.io/api/client/cluster/listers/cluster/v1beta1" workv1client "open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1" clusterv1beta1 "open-cluster-management.io/api/cluster/v1beta1" diff --git a/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_add_finalizer_reconcile.go b/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_add_finalizer_reconcile.go index 5b5fb1aec..3554b19b3 100644 --- a/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_add_finalizer_reconcile.go +++ b/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_add_finalizer_reconcile.go @@ -2,7 +2,9 @@ package manifestworkreplicasetcontroller import ( "context" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + workclientset "open-cluster-management.io/api/client/work/clientset/versioned" workapiv1alpha1 "open-cluster-management.io/api/work/v1alpha1" ) diff --git a/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_add_finalizer_test.go b/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_add_finalizer_test.go index b79acf233..f38226040 100644 --- a/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_add_finalizer_test.go +++ b/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_add_finalizer_test.go @@ -6,7 +6,9 @@ import ( "golang.org/x/exp/slices" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + fakeclient "open-cluster-management.io/api/client/work/clientset/versioned/fake" + helpertest "open-cluster-management.io/ocm/pkg/work/hub/test" ) diff --git a/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_controller.go b/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_controller.go index e512e2a12..47e918a67 100644 --- a/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_controller.go +++ b/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_controller.go @@ -4,6 +4,8 @@ import ( "context" "encoding/json" "fmt" + "strings" + jsonpatch "github.com/evanphx/json-patch" "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" @@ -19,6 +21,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" + clusterinformerv1beta1 "open-cluster-management.io/api/client/cluster/informers/externalversions/cluster/v1beta1" workclientset "open-cluster-management.io/api/client/work/clientset/versioned" workinformerv1 "open-cluster-management.io/api/client/work/informers/externalversions/work/v1" @@ -28,7 +31,6 @@ import ( "open-cluster-management.io/api/utils/work/v1/workapplier" workapiv1 "open-cluster-management.io/api/work/v1" workapiv1alpha1 "open-cluster-management.io/api/work/v1alpha1" - "strings" ) const ( diff --git a/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_controllers_test.go b/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_controllers_test.go index df46d3c30..69c6eb85b 100644 --- a/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_controllers_test.go +++ b/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_controllers_test.go @@ -2,15 +2,18 @@ package manifestworkreplicasetcontroller import ( "context" + "testing" + "time" + clienttesting "k8s.io/client-go/testing" + fakeclusterclient "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" fakeworkclient "open-cluster-management.io/api/client/work/clientset/versioned/fake" workinformers "open-cluster-management.io/api/client/work/informers/externalversions" "open-cluster-management.io/api/utils/work/v1/workapplier" + helpertest "open-cluster-management.io/ocm/pkg/work/hub/test" - "testing" - "time" ) func TestManifestWorkReplicaSetControllerPatchStatus(t *testing.T) { diff --git a/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_deploy_reconcile.go b/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_deploy_reconcile.go index fe5b3315f..5f3750e7e 100644 --- a/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_deploy_reconcile.go +++ b/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_deploy_reconcile.go @@ -9,12 +9,14 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apimachinery/pkg/util/sets" + clusterlister "open-cluster-management.io/api/client/cluster/listers/cluster/v1beta1" worklisterv1 "open-cluster-management.io/api/client/work/listers/work/v1" clusterv1beta1 "open-cluster-management.io/api/cluster/v1beta1" "open-cluster-management.io/api/utils/work/v1/workapplier" workv1 "open-cluster-management.io/api/work/v1" workapiv1alpha1 "open-cluster-management.io/api/work/v1alpha1" + "open-cluster-management.io/ocm/pkg/work/helper" ) diff --git a/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_deploy_test.go b/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_deploy_test.go index 861be7e8a..094bdc8e6 100644 --- a/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_deploy_test.go +++ b/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_deploy_test.go @@ -2,17 +2,20 @@ package manifestworkreplicasetcontroller import ( "context" + "testing" + "time" + apimeta "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + fakeclusterclient "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" fakeworkclient "open-cluster-management.io/api/client/work/clientset/versioned/fake" workinformers "open-cluster-management.io/api/client/work/informers/externalversions" "open-cluster-management.io/api/utils/work/v1/workapplier" workapiv1alpha1 "open-cluster-management.io/api/work/v1alpha1" + helpertest "open-cluster-management.io/ocm/pkg/work/hub/test" - "testing" - "time" ) func TestDeployReconcileAsExpected(t *testing.T) { diff --git a/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_finalize_reconcile.go b/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_finalize_reconcile.go index 7a1810a98..191a5201e 100644 --- a/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_finalize_reconcile.go +++ b/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_finalize_reconcile.go @@ -5,10 +5,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilerrors "k8s.io/apimachinery/pkg/util/errors" + workclientset "open-cluster-management.io/api/client/work/clientset/versioned" worklisterv1 "open-cluster-management.io/api/client/work/listers/work/v1" "open-cluster-management.io/api/utils/work/v1/workapplier" workapiv1alpha1 "open-cluster-management.io/api/work/v1alpha1" + "open-cluster-management.io/ocm/pkg/work/helper" ) diff --git a/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_finalizer_test.go b/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_finalizer_test.go index 7547016d6..be1c4d02d 100644 --- a/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_finalizer_test.go +++ b/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_finalizer_test.go @@ -7,9 +7,11 @@ import ( "golang.org/x/exp/slices" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + fakeclient "open-cluster-management.io/api/client/work/clientset/versioned/fake" workinformers "open-cluster-management.io/api/client/work/informers/externalversions" "open-cluster-management.io/api/utils/work/v1/workapplier" + helpertest "open-cluster-management.io/ocm/pkg/work/hub/test" ) diff --git a/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_index.go b/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_index.go index 718420460..ff3635691 100644 --- a/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_index.go +++ b/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_index.go @@ -2,11 +2,13 @@ package manifestworkreplicasetcontroller import ( "fmt" + "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" + clusterv1beta1 "open-cluster-management.io/api/cluster/v1beta1" workapiv1alpha1 "open-cluster-management.io/api/work/v1alpha1" ) diff --git a/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_index_test.go b/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_index_test.go index 9acd21123..07c36b5de 100644 --- a/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_index_test.go +++ b/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_index_test.go @@ -1,15 +1,18 @@ package manifestworkreplicasetcontroller import ( + "testing" + "time" + "k8s.io/client-go/tools/cache" + fakeclusterclient "open-cluster-management.io/api/client/cluster/clientset/versioned/fake" clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" fakeworkclient "open-cluster-management.io/api/client/work/clientset/versioned/fake" workinformers "open-cluster-management.io/api/client/work/informers/externalversions" "open-cluster-management.io/api/utils/work/v1/workapplier" + helpertest "open-cluster-management.io/ocm/pkg/work/hub/test" - "testing" - "time" ) func TestPlaceMWControllerIndex(t *testing.T) { diff --git a/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_status_reconcile.go b/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_status_reconcile.go index f7617ae51..22d2cbcb8 100644 --- a/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_status_reconcile.go +++ b/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_status_reconcile.go @@ -2,7 +2,9 @@ package manifestworkreplicasetcontroller import ( "context" + apimeta "k8s.io/apimachinery/pkg/api/meta" + worklisterv1 "open-cluster-management.io/api/client/work/listers/work/v1" workapiv1 "open-cluster-management.io/api/work/v1" workapiv1alpha1 "open-cluster-management.io/api/work/v1alpha1" diff --git a/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_status_test.go b/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_status_test.go index 4fcd0b544..a64ee757b 100644 --- a/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_status_test.go +++ b/pkg/work/hub/controllers/manifestworkreplicasetcontroller/manifestworkreplicaset_status_test.go @@ -2,15 +2,18 @@ package manifestworkreplicasetcontroller import ( "context" + "testing" + "time" + apimeta "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + fakeworkclient "open-cluster-management.io/api/client/work/clientset/versioned/fake" workinformers "open-cluster-management.io/api/client/work/informers/externalversions" workv1 "open-cluster-management.io/api/work/v1" workapiv1alpha1 "open-cluster-management.io/api/work/v1alpha1" + helpertest "open-cluster-management.io/ocm/pkg/work/hub/test" - "testing" - "time" ) func TestStatusReconcileAsExpected(t *testing.T) { diff --git a/pkg/work/hub/manager.go b/pkg/work/hub/manager.go index c426db999..d99ad73fc 100644 --- a/pkg/work/hub/manager.go +++ b/pkg/work/hub/manager.go @@ -4,13 +4,14 @@ import ( "context" "time" + "github.com/openshift/library-go/pkg/controller/controllercmd" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/openshift/library-go/pkg/controller/controllercmd" clusterclientset "open-cluster-management.io/api/client/cluster/clientset/versioned" clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions" workclientset "open-cluster-management.io/api/client/work/clientset/versioned" workinformers "open-cluster-management.io/api/client/work/informers/externalversions" + "open-cluster-management.io/ocm/pkg/work/hub/controllers/manifestworkreplicasetcontroller" ) diff --git a/pkg/work/hub/test/helper.go b/pkg/work/hub/test/helper.go index 86bbbc9de..5f9bef049 100644 --- a/pkg/work/hub/test/helper.go +++ b/pkg/work/hub/test/helper.go @@ -2,8 +2,10 @@ package test import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + clusterv1beta1 "open-cluster-management.io/api/cluster/v1beta1" workapiv1alpha1 "open-cluster-management.io/api/work/v1alpha1" + "open-cluster-management.io/ocm/pkg/work/spoke/spoketesting" ) diff --git a/pkg/work/spoke/apply/apply.go b/pkg/work/spoke/apply/apply.go index 6a4c80ce2..a569cd906 100644 --- a/pkg/work/spoke/apply/apply.go +++ b/pkg/work/spoke/apply/apply.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/dynamic" "k8s.io/client-go/kubernetes" + workapiv1 "open-cluster-management.io/api/work/v1" ) diff --git a/pkg/work/spoke/apply/create_only_apply.go b/pkg/work/spoke/apply/create_only_apply.go index 8ee36cc10..74136b1b1 100644 --- a/pkg/work/spoke/apply/create_only_apply.go +++ b/pkg/work/spoke/apply/create_only_apply.go @@ -12,6 +12,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/dynamic" + workapiv1 "open-cluster-management.io/api/work/v1" ) diff --git a/pkg/work/spoke/apply/create_only_apply_test.go b/pkg/work/spoke/apply/create_only_apply_test.go index 8ab367968..9a1a0a742 100644 --- a/pkg/work/spoke/apply/create_only_apply_test.go +++ b/pkg/work/spoke/apply/create_only_apply_test.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" fakedynamic "k8s.io/client-go/dynamic/fake" clienttesting "k8s.io/client-go/testing" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" "open-cluster-management.io/ocm/pkg/work/spoke/spoketesting" ) diff --git a/pkg/work/spoke/apply/server_side_apply.go b/pkg/work/spoke/apply/server_side_apply.go index daae89b26..a3d111539 100644 --- a/pkg/work/spoke/apply/server_side_apply.go +++ b/pkg/work/spoke/apply/server_side_apply.go @@ -15,6 +15,7 @@ import ( "k8s.io/client-go/dynamic" "k8s.io/client-go/tools/cache" "k8s.io/utils/pointer" + workapiv1 "open-cluster-management.io/api/work/v1" ) diff --git a/pkg/work/spoke/apply/server_side_apply_test.go b/pkg/work/spoke/apply/server_side_apply_test.go index 109e98cf6..3a4b21dd2 100644 --- a/pkg/work/spoke/apply/server_side_apply_test.go +++ b/pkg/work/spoke/apply/server_side_apply_test.go @@ -15,7 +15,9 @@ import ( "k8s.io/apimachinery/pkg/types" fakedynamic "k8s.io/client-go/dynamic/fake" clienttesting "k8s.io/client-go/testing" + workapiv1 "open-cluster-management.io/api/work/v1" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" "open-cluster-management.io/ocm/pkg/work/spoke/spoketesting" ) diff --git a/pkg/work/spoke/apply/update_apply.go b/pkg/work/spoke/apply/update_apply.go index d4c0d7c60..01be89a3e 100644 --- a/pkg/work/spoke/apply/update_apply.go +++ b/pkg/work/spoke/apply/update_apply.go @@ -18,6 +18,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/dynamic" "k8s.io/client-go/kubernetes" + workapiv1 "open-cluster-management.io/api/work/v1" ) diff --git a/pkg/work/spoke/apply/update_apply_test.go b/pkg/work/spoke/apply/update_apply_test.go index 02a7e210b..650e31781 100644 --- a/pkg/work/spoke/apply/update_apply_test.go +++ b/pkg/work/spoke/apply/update_apply_test.go @@ -15,6 +15,7 @@ import ( fakedynamic "k8s.io/client-go/dynamic/fake" "k8s.io/client-go/kubernetes/fake" clienttesting "k8s.io/client-go/testing" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" "open-cluster-management.io/ocm/pkg/work/spoke/spoketesting" ) diff --git a/pkg/work/spoke/auth/basic/auth_test.go b/pkg/work/spoke/auth/basic/auth_test.go index 99fb4fb42..631a03e29 100644 --- a/pkg/work/spoke/auth/basic/auth_test.go +++ b/pkg/work/spoke/auth/basic/auth_test.go @@ -17,6 +17,7 @@ import ( clienttesting "k8s.io/client-go/testing" workapiv1 "open-cluster-management.io/api/work/v1" + "open-cluster-management.io/ocm/pkg/work/spoke/spoketesting" ) diff --git a/pkg/work/spoke/auth/cache/auth.go b/pkg/work/spoke/auth/cache/auth.go index deb6098ae..c5c3f6d0d 100644 --- a/pkg/work/spoke/auth/cache/auth.go +++ b/pkg/work/spoke/auth/cache/auth.go @@ -15,6 +15,7 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/klog/v2" "k8s.io/utils/pointer" + worklister "open-cluster-management.io/api/client/work/listers/work/v1" workapiv1 "open-cluster-management.io/api/work/v1" diff --git a/pkg/work/spoke/auth/cache/auth_test.go b/pkg/work/spoke/auth/cache/auth_test.go index 8bba3c60f..d39cc1613 100644 --- a/pkg/work/spoke/auth/cache/auth_test.go +++ b/pkg/work/spoke/auth/cache/auth_test.go @@ -14,10 +14,11 @@ import ( fakekube "k8s.io/client-go/kubernetes/fake" clienttesting "k8s.io/client-go/testing" k8scache "k8s.io/client-go/tools/cache" + fakeworkclient "open-cluster-management.io/api/client/work/clientset/versioned/fake" workinformers "open-cluster-management.io/api/client/work/informers/externalversions" - workapiv1 "open-cluster-management.io/api/work/v1" + "open-cluster-management.io/ocm/pkg/work/spoke/auth/basic" "open-cluster-management.io/ocm/pkg/work/spoke/spoketesting" ) diff --git a/pkg/work/spoke/auth/cache/executor_cache_controller.go b/pkg/work/spoke/auth/cache/executor_cache_controller.go index 5815affce..b644f65a9 100644 --- a/pkg/work/spoke/auth/cache/executor_cache_controller.go +++ b/pkg/work/spoke/auth/cache/executor_cache_controller.go @@ -16,6 +16,7 @@ import ( rbacv1 "k8s.io/client-go/informers/rbac/v1" "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" + workapiv1 "open-cluster-management.io/api/work/v1" "open-cluster-management.io/ocm/pkg/work/spoke/auth/store" diff --git a/pkg/work/spoke/auth/cache/executor_cache_controller_test.go b/pkg/work/spoke/auth/cache/executor_cache_controller_test.go index 9f08dd18a..ff98ef546 100644 --- a/pkg/work/spoke/auth/cache/executor_cache_controller_test.go +++ b/pkg/work/spoke/auth/cache/executor_cache_controller_test.go @@ -21,6 +21,7 @@ import ( fakeworkclient "open-cluster-management.io/api/client/work/clientset/versioned/fake" workinformers "open-cluster-management.io/api/client/work/informers/externalversions" workapiv1 "open-cluster-management.io/api/work/v1" + "open-cluster-management.io/ocm/pkg/work/spoke/auth/basic" "open-cluster-management.io/ocm/pkg/work/spoke/auth/store" "open-cluster-management.io/ocm/pkg/work/spoke/spoketesting" diff --git a/pkg/work/spoke/auth/cache/loader.go b/pkg/work/spoke/auth/cache/loader.go index b99a9bfb5..455654473 100644 --- a/pkg/work/spoke/auth/cache/loader.go +++ b/pkg/work/spoke/auth/cache/loader.go @@ -5,6 +5,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/labels" "k8s.io/klog/v2" + worklister "open-cluster-management.io/api/client/work/listers/work/v1" workapiv1 "open-cluster-management.io/api/work/v1" diff --git a/pkg/work/spoke/auth/factory.go b/pkg/work/spoke/auth/factory.go index f827f35a6..d5afd6361 100644 --- a/pkg/work/spoke/auth/factory.go +++ b/pkg/work/spoke/auth/factory.go @@ -11,6 +11,7 @@ import ( "k8s.io/client-go/rest" k8scache "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" + workinformers "open-cluster-management.io/api/client/work/informers/externalversions/work/v1" workapiv1 "open-cluster-management.io/api/work/v1" diff --git a/pkg/work/spoke/controllers/appliedmanifestcontroller/appliedmanifestwork_controller.go b/pkg/work/spoke/controllers/appliedmanifestcontroller/appliedmanifestwork_controller.go index 04a377673..718104c64 100644 --- a/pkg/work/spoke/controllers/appliedmanifestcontroller/appliedmanifestwork_controller.go +++ b/pkg/work/spoke/controllers/appliedmanifestcontroller/appliedmanifestwork_controller.go @@ -7,6 +7,8 @@ import ( "sort" "time" + "github.com/openshift/library-go/pkg/controller/factory" + "github.com/openshift/library-go/pkg/operator/events" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -17,12 +19,11 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - "github.com/openshift/library-go/pkg/controller/factory" - "github.com/openshift/library-go/pkg/operator/events" workv1client "open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1" workinformer "open-cluster-management.io/api/client/work/informers/externalversions/work/v1" worklister "open-cluster-management.io/api/client/work/listers/work/v1" workapiv1 "open-cluster-management.io/api/work/v1" + "open-cluster-management.io/ocm/pkg/work/helper" ) diff --git a/pkg/work/spoke/controllers/appliedmanifestcontroller/appliedmanifestwork_controller_test.go b/pkg/work/spoke/controllers/appliedmanifestcontroller/appliedmanifestwork_controller_test.go index 0ac1b557e..7a341937f 100644 --- a/pkg/work/spoke/controllers/appliedmanifestcontroller/appliedmanifestwork_controller_test.go +++ b/pkg/work/spoke/controllers/appliedmanifestcontroller/appliedmanifestwork_controller_test.go @@ -14,9 +14,11 @@ import ( clienttesting "k8s.io/client-go/testing" "k8s.io/client-go/util/workqueue" "k8s.io/utils/diff" + fakeworkclient "open-cluster-management.io/api/client/work/clientset/versioned/fake" workinformers "open-cluster-management.io/api/client/work/informers/externalversions" workapiv1 "open-cluster-management.io/api/work/v1" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" "open-cluster-management.io/ocm/pkg/work/helper" "open-cluster-management.io/ocm/pkg/work/spoke/spoketesting" diff --git a/pkg/work/spoke/controllers/finalizercontroller/add_finalizer_controller.go b/pkg/work/spoke/controllers/finalizercontroller/add_finalizer_controller.go index aa2102c64..27940ecbb 100644 --- a/pkg/work/spoke/controllers/finalizercontroller/add_finalizer_controller.go +++ b/pkg/work/spoke/controllers/finalizercontroller/add_finalizer_controller.go @@ -3,21 +3,20 @@ package finalizercontroller import ( "context" - "open-cluster-management.io/ocm/pkg/work/helper" - - workapiv1 "open-cluster-management.io/api/work/v1" - + "github.com/openshift/library-go/pkg/controller/factory" + "github.com/openshift/library-go/pkg/operator/events" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/klog/v2" - "github.com/openshift/library-go/pkg/controller/factory" - "github.com/openshift/library-go/pkg/operator/events" workv1client "open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1" workinformer "open-cluster-management.io/api/client/work/informers/externalversions/work/v1" worklister "open-cluster-management.io/api/client/work/listers/work/v1" + workapiv1 "open-cluster-management.io/api/work/v1" + + "open-cluster-management.io/ocm/pkg/work/helper" "open-cluster-management.io/ocm/pkg/work/spoke/controllers" ) diff --git a/pkg/work/spoke/controllers/finalizercontroller/add_finalizer_controller_test.go b/pkg/work/spoke/controllers/finalizercontroller/add_finalizer_controller_test.go index 5a92fc40f..892bc6fc2 100644 --- a/pkg/work/spoke/controllers/finalizercontroller/add_finalizer_controller_test.go +++ b/pkg/work/spoke/controllers/finalizercontroller/add_finalizer_controller_test.go @@ -8,8 +8,10 @@ import ( "github.com/davecgh/go-spew/spew" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clienttesting "k8s.io/client-go/testing" + fakeworkclient "open-cluster-management.io/api/client/work/clientset/versioned/fake" workapiv1 "open-cluster-management.io/api/work/v1" + "open-cluster-management.io/ocm/pkg/work/spoke/controllers" "open-cluster-management.io/ocm/pkg/work/spoke/spoketesting" ) diff --git a/pkg/work/spoke/controllers/finalizercontroller/appliedmanifestwork_finalize_controller.go b/pkg/work/spoke/controllers/finalizercontroller/appliedmanifestwork_finalize_controller.go index 277357f1f..b84615021 100644 --- a/pkg/work/spoke/controllers/finalizercontroller/appliedmanifestwork_finalize_controller.go +++ b/pkg/work/spoke/controllers/finalizercontroller/appliedmanifestwork_finalize_controller.go @@ -15,10 +15,12 @@ import ( "k8s.io/client-go/dynamic" "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" + workv1client "open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1" workinformer "open-cluster-management.io/api/client/work/informers/externalversions/work/v1" worklister "open-cluster-management.io/api/client/work/listers/work/v1" workapiv1 "open-cluster-management.io/api/work/v1" + "open-cluster-management.io/ocm/pkg/work/helper" "open-cluster-management.io/ocm/pkg/work/spoke/controllers" ) diff --git a/pkg/work/spoke/controllers/finalizercontroller/appliedmanifestwork_finalize_controller_test.go b/pkg/work/spoke/controllers/finalizercontroller/appliedmanifestwork_finalize_controller_test.go index b4a3f34e5..f8c89afcf 100644 --- a/pkg/work/spoke/controllers/finalizercontroller/appliedmanifestwork_finalize_controller_test.go +++ b/pkg/work/spoke/controllers/finalizercontroller/appliedmanifestwork_finalize_controller_test.go @@ -14,8 +14,10 @@ import ( fakedynamic "k8s.io/client-go/dynamic/fake" clienttesting "k8s.io/client-go/testing" "k8s.io/client-go/util/workqueue" + fakeworkclient "open-cluster-management.io/api/client/work/clientset/versioned/fake" workapiv1 "open-cluster-management.io/api/work/v1" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" "open-cluster-management.io/ocm/pkg/work/helper" "open-cluster-management.io/ocm/pkg/work/spoke/controllers" diff --git a/pkg/work/spoke/controllers/finalizercontroller/manifestwork_finalize_controller.go b/pkg/work/spoke/controllers/finalizercontroller/manifestwork_finalize_controller.go index 637e6cf14..b1135d0d4 100644 --- a/pkg/work/spoke/controllers/finalizercontroller/manifestwork_finalize_controller.go +++ b/pkg/work/spoke/controllers/finalizercontroller/manifestwork_finalize_controller.go @@ -13,9 +13,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" + workv1client "open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1" workinformer "open-cluster-management.io/api/client/work/informers/externalversions/work/v1" worklister "open-cluster-management.io/api/client/work/listers/work/v1" + "open-cluster-management.io/ocm/pkg/work/helper" "open-cluster-management.io/ocm/pkg/work/spoke/controllers" ) diff --git a/pkg/work/spoke/controllers/finalizercontroller/manifestwork_finalize_controller_test.go b/pkg/work/spoke/controllers/finalizercontroller/manifestwork_finalize_controller_test.go index e3a20e6e9..290a2ea27 100644 --- a/pkg/work/spoke/controllers/finalizercontroller/manifestwork_finalize_controller_test.go +++ b/pkg/work/spoke/controllers/finalizercontroller/manifestwork_finalize_controller_test.go @@ -9,9 +9,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clienttesting "k8s.io/client-go/testing" "k8s.io/client-go/util/workqueue" + fakeworkclient "open-cluster-management.io/api/client/work/clientset/versioned/fake" workinformers "open-cluster-management.io/api/client/work/informers/externalversions" workapiv1 "open-cluster-management.io/api/work/v1" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" "open-cluster-management.io/ocm/pkg/work/spoke/controllers" ) diff --git a/pkg/work/spoke/controllers/finalizercontroller/unmanaged_appliedmanifestwork_controller.go b/pkg/work/spoke/controllers/finalizercontroller/unmanaged_appliedmanifestwork_controller.go index e89180eca..09ed5dbe7 100644 --- a/pkg/work/spoke/controllers/finalizercontroller/unmanaged_appliedmanifestwork_controller.go +++ b/pkg/work/spoke/controllers/finalizercontroller/unmanaged_appliedmanifestwork_controller.go @@ -17,10 +17,12 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" + workv1client "open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1" workinformer "open-cluster-management.io/api/client/work/informers/externalversions/work/v1" worklister "open-cluster-management.io/api/client/work/listers/work/v1" workapiv1 "open-cluster-management.io/api/work/v1" + "open-cluster-management.io/ocm/pkg/work/helper" ) diff --git a/pkg/work/spoke/controllers/finalizercontroller/unmanaged_appliedmanifestwork_controller_test.go b/pkg/work/spoke/controllers/finalizercontroller/unmanaged_appliedmanifestwork_controller_test.go index 488007b5c..c5ab999cd 100644 --- a/pkg/work/spoke/controllers/finalizercontroller/unmanaged_appliedmanifestwork_controller_test.go +++ b/pkg/work/spoke/controllers/finalizercontroller/unmanaged_appliedmanifestwork_controller_test.go @@ -13,6 +13,7 @@ import ( fakeworkclient "open-cluster-management.io/api/client/work/clientset/versioned/fake" workinformers "open-cluster-management.io/api/client/work/informers/externalversions" workapiv1 "open-cluster-management.io/api/work/v1" + testingcommon "open-cluster-management.io/ocm/pkg/common/testing" ) diff --git a/pkg/work/spoke/controllers/manifestcontroller/manifestwork_controller.go b/pkg/work/spoke/controllers/manifestcontroller/manifestwork_controller.go index 2f0ec9465..bfa5594c8 100644 --- a/pkg/work/spoke/controllers/manifestcontroller/manifestwork_controller.go +++ b/pkg/work/spoke/controllers/manifestcontroller/manifestwork_controller.go @@ -6,6 +6,10 @@ import ( "fmt" "time" + jsonpatch "github.com/evanphx/json-patch" + "github.com/openshift/library-go/pkg/controller/factory" + "github.com/openshift/library-go/pkg/operator/events" + "github.com/pkg/errors" apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" "k8s.io/apimachinery/pkg/api/equality" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -20,10 +24,6 @@ import ( "k8s.io/client-go/util/retry" "k8s.io/klog/v2" - jsonpatch "github.com/evanphx/json-patch" - "github.com/openshift/library-go/pkg/controller/factory" - "github.com/openshift/library-go/pkg/operator/events" - "github.com/pkg/errors" workv1client "open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1" workinformer "open-cluster-management.io/api/client/work/informers/externalversions/work/v1" worklister "open-cluster-management.io/api/client/work/listers/work/v1" diff --git a/pkg/work/spoke/controllers/manifestcontroller/manifestwork_controller_test.go b/pkg/work/spoke/controllers/manifestcontroller/manifestwork_controller_test.go index 625b4d655..bb32b46d6 100644 --- a/pkg/work/spoke/controllers/manifestcontroller/manifestwork_controller_test.go +++ b/pkg/work/spoke/controllers/manifestcontroller/manifestwork_controller_test.go @@ -18,6 +18,7 @@ import ( fakedynamic "k8s.io/client-go/dynamic/fake" fakekube "k8s.io/client-go/kubernetes/fake" clienttesting "k8s.io/client-go/testing" + fakeworkclient "open-cluster-management.io/api/client/work/clientset/versioned/fake" workinformers "open-cluster-management.io/api/client/work/informers/externalversions" workapiv1 "open-cluster-management.io/api/work/v1" diff --git a/pkg/work/spoke/controllers/statuscontroller/availablestatus_controller.go b/pkg/work/spoke/controllers/statuscontroller/availablestatus_controller.go index 4b7fbff6b..fc0acd3a2 100644 --- a/pkg/work/spoke/controllers/statuscontroller/availablestatus_controller.go +++ b/pkg/work/spoke/controllers/statuscontroller/availablestatus_controller.go @@ -5,8 +5,6 @@ import ( "fmt" "time" - "open-cluster-management.io/ocm/pkg/work/spoke/controllers" - "github.com/openshift/library-go/pkg/controller/factory" "github.com/openshift/library-go/pkg/operator/events" "k8s.io/apimachinery/pkg/api/equality" @@ -20,11 +18,14 @@ import ( utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/client-go/dynamic" "k8s.io/klog/v2" + workv1client "open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1" workinformer "open-cluster-management.io/api/client/work/informers/externalversions/work/v1" worklister "open-cluster-management.io/api/client/work/listers/work/v1" workapiv1 "open-cluster-management.io/api/work/v1" + "open-cluster-management.io/ocm/pkg/work/helper" + "open-cluster-management.io/ocm/pkg/work/spoke/controllers" "open-cluster-management.io/ocm/pkg/work/spoke/statusfeedback" ) diff --git a/pkg/work/spoke/controllers/statuscontroller/availablestatus_controller_test.go b/pkg/work/spoke/controllers/statuscontroller/availablestatus_controller_test.go index 9f9f25db5..c95e430b1 100644 --- a/pkg/work/spoke/controllers/statuscontroller/availablestatus_controller_test.go +++ b/pkg/work/spoke/controllers/statuscontroller/availablestatus_controller_test.go @@ -4,17 +4,18 @@ import ( "context" "testing" - "k8s.io/utils/pointer" - "open-cluster-management.io/ocm/pkg/work/spoke/controllers" - "github.com/davecgh/go-spew/spew" "k8s.io/apimachinery/pkg/api/equality" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" fakedynamic "k8s.io/client-go/dynamic/fake" clienttesting "k8s.io/client-go/testing" + "k8s.io/utils/pointer" + fakeworkclient "open-cluster-management.io/api/client/work/clientset/versioned/fake" workapiv1 "open-cluster-management.io/api/work/v1" + + "open-cluster-management.io/ocm/pkg/work/spoke/controllers" "open-cluster-management.io/ocm/pkg/work/spoke/spoketesting" "open-cluster-management.io/ocm/pkg/work/spoke/statusfeedback" ) diff --git a/pkg/work/spoke/spokeagent.go b/pkg/work/spoke/spokeagent.go index 7f0deaece..f936a4ea8 100644 --- a/pkg/work/spoke/spokeagent.go +++ b/pkg/work/spoke/spokeagent.go @@ -2,6 +2,8 @@ package spoke import ( "context" + "time" + "github.com/openshift/library-go/pkg/controller/controllercmd" "github.com/spf13/cobra" apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" @@ -9,9 +11,12 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" + "sigs.k8s.io/controller-runtime/pkg/client/apiutil" + workclientset "open-cluster-management.io/api/client/work/clientset/versioned" workinformers "open-cluster-management.io/api/client/work/informers/externalversions" ocmfeature "open-cluster-management.io/api/feature" + commonoptions "open-cluster-management.io/ocm/pkg/common/options" "open-cluster-management.io/ocm/pkg/features" "open-cluster-management.io/ocm/pkg/work/helper" @@ -20,8 +25,6 @@ import ( "open-cluster-management.io/ocm/pkg/work/spoke/controllers/finalizercontroller" "open-cluster-management.io/ocm/pkg/work/spoke/controllers/manifestcontroller" "open-cluster-management.io/ocm/pkg/work/spoke/controllers/statuscontroller" - "sigs.k8s.io/controller-runtime/pkg/client/apiutil" - "time" ) const ( diff --git a/pkg/work/spoke/spoketesting/manifestwork_helpers.go b/pkg/work/spoke/spoketesting/manifestwork_helpers.go index ad3323e3c..fbc7b6538 100644 --- a/pkg/work/spoke/spoketesting/manifestwork_helpers.go +++ b/pkg/work/spoke/spoketesting/manifestwork_helpers.go @@ -2,12 +2,14 @@ package spoketesting import ( "fmt" + corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/restmapper" + workapiv1 "open-cluster-management.io/api/work/v1" ) diff --git a/pkg/work/spoke/statusfeedback/reader.go b/pkg/work/spoke/statusfeedback/reader.go index b65f92d54..ff0491066 100644 --- a/pkg/work/spoke/statusfeedback/reader.go +++ b/pkg/work/spoke/statusfeedback/reader.go @@ -3,16 +3,17 @@ package statusfeedback import ( "encoding/json" "fmt" - "open-cluster-management.io/ocm/pkg/features" "reflect" - "k8s.io/utils/pointer" - ocmfeature "open-cluster-management.io/api/feature" - "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/client-go/util/jsonpath" + "k8s.io/utils/pointer" + + ocmfeature "open-cluster-management.io/api/feature" workapiv1 "open-cluster-management.io/api/work/v1" + + "open-cluster-management.io/ocm/pkg/features" "open-cluster-management.io/ocm/pkg/work/spoke/statusfeedback/rules" ) diff --git a/pkg/work/spoke/statusfeedback/reader_test.go b/pkg/work/spoke/statusfeedback/reader_test.go index 6d76325b0..8b0904566 100644 --- a/pkg/work/spoke/statusfeedback/reader_test.go +++ b/pkg/work/spoke/statusfeedback/reader_test.go @@ -2,14 +2,16 @@ package statusfeedback import ( "fmt" - "open-cluster-management.io/ocm/pkg/features" "testing" apiequality "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/utils/pointer" + ocmfeature "open-cluster-management.io/api/feature" workapiv1 "open-cluster-management.io/api/work/v1" + + "open-cluster-management.io/ocm/pkg/features" ) const ( diff --git a/pkg/work/spoke/statusfeedback/rules/rule.go b/pkg/work/spoke/statusfeedback/rules/rule.go index 1e0ea5131..709593cbe 100644 --- a/pkg/work/spoke/statusfeedback/rules/rule.go +++ b/pkg/work/spoke/statusfeedback/rules/rule.go @@ -2,6 +2,7 @@ package rules import ( "k8s.io/apimachinery/pkg/runtime/schema" + workapiv1 "open-cluster-management.io/api/work/v1" ) diff --git a/pkg/work/webhook/common/validator.go b/pkg/work/webhook/common/validator.go index c8af0f2d2..53c8b0b52 100644 --- a/pkg/work/webhook/common/validator.go +++ b/pkg/work/webhook/common/validator.go @@ -2,8 +2,10 @@ package common import ( "fmt" + apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" + workv1 "open-cluster-management.io/api/work/v1" ) diff --git a/pkg/work/webhook/common/validator_test.go b/pkg/work/webhook/common/validator_test.go index ae0deaf17..159404987 100644 --- a/pkg/work/webhook/common/validator_test.go +++ b/pkg/work/webhook/common/validator_test.go @@ -2,10 +2,12 @@ package common import ( "fmt" - "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - workv1 "open-cluster-management.io/api/work/v1" "reflect" "testing" + + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" + + workv1 "open-cluster-management.io/api/work/v1" ) func newManifest(size int) workv1.Manifest { diff --git a/pkg/work/webhook/start.go b/pkg/work/webhook/start.go index e22e609e8..c812cb030 100644 --- a/pkg/work/webhook/start.go +++ b/pkg/work/webhook/start.go @@ -1,22 +1,21 @@ package webhook import ( - "k8s.io/klog/v2" - "open-cluster-management.io/ocm/pkg/work/webhook/common" - "k8s.io/apimachinery/pkg/runtime" - // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) // to ensure that exec-entrypoint and run can make use of them. utilruntime "k8s.io/apimachinery/pkg/util/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" _ "k8s.io/client-go/plugin/pkg/client/auth" - workv1 "open-cluster-management.io/api/work/v1" - webhookv1 "open-cluster-management.io/ocm/pkg/work/webhook/v1" - + "k8s.io/klog/v2" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/healthz" "sigs.k8s.io/controller-runtime/pkg/webhook" + + workv1 "open-cluster-management.io/api/work/v1" + + "open-cluster-management.io/ocm/pkg/work/webhook/common" + webhookv1 "open-cluster-management.io/ocm/pkg/work/webhook/v1" ) var ( diff --git a/pkg/work/webhook/v1/manifestwork_validating.go b/pkg/work/webhook/v1/manifestwork_validating.go index ac4229d72..5665e01d6 100644 --- a/pkg/work/webhook/v1/manifestwork_validating.go +++ b/pkg/work/webhook/v1/manifestwork_validating.go @@ -5,21 +5,20 @@ import ( "fmt" "reflect" - "open-cluster-management.io/ocm/pkg/features" - - "open-cluster-management.io/ocm/pkg/work/webhook/common" - authenticationv1 "k8s.io/api/authentication/v1" authorizationv1 "k8s.io/api/authorization/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes" + "sigs.k8s.io/controller-runtime/pkg/webhook" + "sigs.k8s.io/controller-runtime/pkg/webhook/admission" + ocmfeature "open-cluster-management.io/api/feature" workv1 "open-cluster-management.io/api/work/v1" - "sigs.k8s.io/controller-runtime/pkg/webhook" - "sigs.k8s.io/controller-runtime/pkg/webhook/admission" + "open-cluster-management.io/ocm/pkg/features" + "open-cluster-management.io/ocm/pkg/work/webhook/common" ) var _ webhook.CustomValidator = &ManifestWorkWebhook{} diff --git a/pkg/work/webhook/v1/manifestwork_validating_test.go b/pkg/work/webhook/v1/manifestwork_validating_test.go index 08680d7b1..c5784e2c7 100644 --- a/pkg/work/webhook/v1/manifestwork_validating_test.go +++ b/pkg/work/webhook/v1/manifestwork_validating_test.go @@ -6,24 +6,22 @@ import ( "reflect" "testing" - utilruntime "k8s.io/apimachinery/pkg/util/runtime" - - "open-cluster-management.io/ocm/pkg/features" - admissionv1 "k8s.io/api/admission/v1" - clienttesting "k8s.io/client-go/testing" - "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - - fakekube "k8s.io/client-go/kubernetes/fake" - authenticationv1 "k8s.io/api/authentication/v1" v1 "k8s.io/api/authorization/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" + utilruntime "k8s.io/apimachinery/pkg/util/runtime" + fakekube "k8s.io/client-go/kubernetes/fake" + clienttesting "k8s.io/client-go/testing" + "sigs.k8s.io/controller-runtime/pkg/webhook/admission" + ocmfeature "open-cluster-management.io/api/feature" workv1 "open-cluster-management.io/api/work/v1" + + "open-cluster-management.io/ocm/pkg/features" "open-cluster-management.io/ocm/pkg/work/spoke/spoketesting" ) diff --git a/pkg/work/webhook/v1/webhook.go b/pkg/work/webhook/v1/webhook.go index 8fe2d0b2b..fc54bfd62 100644 --- a/pkg/work/webhook/v1/webhook.go +++ b/pkg/work/webhook/v1/webhook.go @@ -2,8 +2,9 @@ package v1 import ( "k8s.io/client-go/kubernetes" - v1 "open-cluster-management.io/api/work/v1" ctrl "sigs.k8s.io/controller-runtime" + + v1 "open-cluster-management.io/api/work/v1" ) type ManifestWorkWebhook struct { diff --git a/pkg/work/webhook/v1alpha1/manifestworkreplicaset_validating.go b/pkg/work/webhook/v1alpha1/manifestworkreplicaset_validating.go index 8054c283a..b2d0dfa6d 100644 --- a/pkg/work/webhook/v1alpha1/manifestworkreplicaset_validating.go +++ b/pkg/work/webhook/v1alpha1/manifestworkreplicaset_validating.go @@ -4,15 +4,16 @@ import ( "context" "errors" - "open-cluster-management.io/ocm/pkg/work/webhook/common" - apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" utilfeature "k8s.io/apiserver/pkg/util/feature" - ocmfeature "open-cluster-management.io/api/feature" - workv1alpha1 "open-cluster-management.io/api/work/v1alpha1" "sigs.k8s.io/controller-runtime/pkg/webhook" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" + + ocmfeature "open-cluster-management.io/api/feature" + workv1alpha1 "open-cluster-management.io/api/work/v1alpha1" + + "open-cluster-management.io/ocm/pkg/work/webhook/common" ) var _ webhook.CustomValidator = &ManifestWorkReplicaSetWebhook{} diff --git a/pkg/work/webhook/v1alpha1/manifestworkreplicaset_validating_test.go b/pkg/work/webhook/v1alpha1/manifestworkreplicaset_validating_test.go index 4748e1511..d99d9e041 100644 --- a/pkg/work/webhook/v1alpha1/manifestworkreplicaset_validating_test.go +++ b/pkg/work/webhook/v1alpha1/manifestworkreplicaset_validating_test.go @@ -9,10 +9,12 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilfeature "k8s.io/apiserver/pkg/util/feature" + "sigs.k8s.io/controller-runtime/pkg/webhook/admission" + ocmfeature "open-cluster-management.io/api/feature" workv1alpha1 "open-cluster-management.io/api/work/v1alpha1" + helpertest "open-cluster-management.io/ocm/pkg/work/hub/test" - "sigs.k8s.io/controller-runtime/pkg/webhook/admission" ) var manifestWorkReplicaSetSchema = metav1.GroupVersionResource{ diff --git a/pkg/work/webhook/v1alpha1/webhook.go b/pkg/work/webhook/v1alpha1/webhook.go index e7e8a51a4..f104a2686 100644 --- a/pkg/work/webhook/v1alpha1/webhook.go +++ b/pkg/work/webhook/v1alpha1/webhook.go @@ -2,8 +2,9 @@ package v1alpha1 import ( "k8s.io/client-go/kubernetes" - v1alpha1 "open-cluster-management.io/api/work/v1alpha1" ctrl "sigs.k8s.io/controller-runtime" + + v1alpha1 "open-cluster-management.io/api/work/v1alpha1" ) type ManifestWorkReplicaSetWebhook struct { diff --git a/test/benchmark/placement/benchmark_test.go b/test/benchmark/placement/benchmark_test.go index 586bf5a90..f1fe9316e 100644 --- a/test/benchmark/placement/benchmark_test.go +++ b/test/benchmark/placement/benchmark_test.go @@ -3,7 +3,6 @@ package placement import ( "context" "fmt" - "open-cluster-management.io/ocm/test/integration/util" "testing" "time" @@ -13,6 +12,8 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "k8s.io/klog/v2" + "sigs.k8s.io/controller-runtime/pkg/envtest" + clusterv1client "open-cluster-management.io/api/client/cluster/clientset/versioned" clusterapiv1 "open-cluster-management.io/api/cluster/v1" clusterapiv1alpha1 "open-cluster-management.io/api/cluster/v1alpha1" @@ -21,7 +22,7 @@ import ( controllers "open-cluster-management.io/ocm/pkg/placement/controllers" scheduling "open-cluster-management.io/ocm/pkg/placement/controllers/scheduling" - "sigs.k8s.io/controller-runtime/pkg/envtest" + "open-cluster-management.io/ocm/test/integration/util" ) const ( diff --git a/test/e2e/addon_lease_test.go b/test/e2e/addon_lease_test.go index 30acdf000..99df56f84 100644 --- a/test/e2e/addon_lease_test.go +++ b/test/e2e/addon_lease_test.go @@ -3,22 +3,21 @@ package e2e import ( "context" "fmt" - "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/klog/v2" - operatorapiv1 "open-cluster-management.io/api/operator/v1" "time" ginkgo "github.com/onsi/ginkgo/v2" gomega "github.com/onsi/gomega" - - clusterv1 "open-cluster-management.io/api/cluster/v1" - coordv1 "k8s.io/api/coordination/v1" corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/rand" "k8s.io/apimachinery/pkg/util/wait" + "k8s.io/klog/v2" + + clusterv1 "open-cluster-management.io/api/cluster/v1" + operatorapiv1 "open-cluster-management.io/api/operator/v1" ) var _ = ginkgo.Describe("Addon Health Check", func() { diff --git a/test/e2e/addonmanagement_test.go b/test/e2e/addonmanagement_test.go index 75f58deef..79e1cef92 100644 --- a/test/e2e/addonmanagement_test.go +++ b/test/e2e/addonmanagement_test.go @@ -3,10 +3,10 @@ package e2e import ( "context" "fmt" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/rand" operatorapiv1 "open-cluster-management.io/api/operator/v1" diff --git a/test/e2e/clusterset_test.go b/test/e2e/clusterset_test.go index 8f44d5097..903f78289 100644 --- a/test/e2e/clusterset_test.go +++ b/test/e2e/clusterset_test.go @@ -9,6 +9,7 @@ import ( gomega "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/rand" + clusterv1beta2 "open-cluster-management.io/api/cluster/v1beta2" ) diff --git a/test/e2e/common.go b/test/e2e/common.go index e97e883f5..330fcb897 100644 --- a/test/e2e/common.go +++ b/test/e2e/common.go @@ -5,42 +5,42 @@ import ( "context" "fmt" "io" - authv1 "k8s.io/api/authentication/v1" - rbacv1 "k8s.io/api/rbac/v1" - "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/dynamic" - "k8s.io/utils/pointer" - ocmfeature "open-cluster-management.io/api/feature" - "open-cluster-management.io/ocm/test/integration/util" "os" "strings" "time" - "k8s.io/klog/v2" - "github.com/onsi/gomega" - apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" - + authv1 "k8s.io/api/authentication/v1" certificatesv1 "k8s.io/api/certificates/v1" coordv1 "k8s.io/api/coordination/v1" corev1 "k8s.io/api/core/v1" + rbacv1 "k8s.io/api/rbac/v1" + apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1beta1" + "k8s.io/apimachinery/pkg/util/wait" + "k8s.io/client-go/dynamic" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/clientcmd" + "k8s.io/klog/v2" + "k8s.io/utils/pointer" + addonv1alpha1 "open-cluster-management.io/api/addon/v1alpha1" addonclient "open-cluster-management.io/api/client/addon/clientset/versioned" clusterclient "open-cluster-management.io/api/client/cluster/clientset/versioned" operatorclient "open-cluster-management.io/api/client/operator/clientset/versioned" workv1client "open-cluster-management.io/api/client/work/clientset/versioned" clusterv1 "open-cluster-management.io/api/cluster/v1" + ocmfeature "open-cluster-management.io/api/feature" operatorapiv1 "open-cluster-management.io/api/operator/v1" workapiv1 "open-cluster-management.io/api/work/v1" + "open-cluster-management.io/ocm/pkg/operator/helpers" + "open-cluster-management.io/ocm/test/integration/util" ) type Tester struct { diff --git a/test/e2e/klusterlet_test.go b/test/e2e/klusterlet_test.go index a358382ca..19b441ee9 100644 --- a/test/e2e/klusterlet_test.go +++ b/test/e2e/klusterlet_test.go @@ -8,9 +8,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/rand" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" operatorapiv1 "open-cluster-management.io/api/operator/v1" ) diff --git a/test/e2e/managedcluster_loopback_test.go b/test/e2e/managedcluster_loopback_test.go index c35dda97a..aa22998ad 100644 --- a/test/e2e/managedcluster_loopback_test.go +++ b/test/e2e/managedcluster_loopback_test.go @@ -3,25 +3,24 @@ package e2e import ( "context" "fmt" - operatorapiv1 "open-cluster-management.io/api/operator/v1" "reflect" "time" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" - + certificatesv1 "k8s.io/api/certificates/v1" + corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/rand" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/util/retry" - certificatesv1 "k8s.io/api/certificates/v1" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" addonv1alpha1 "open-cluster-management.io/api/addon/v1alpha1" clusterv1 "open-cluster-management.io/api/cluster/v1" clusterv1alpha1 "open-cluster-management.io/api/cluster/v1alpha1" + operatorapiv1 "open-cluster-management.io/api/operator/v1" "open-cluster-management.io/ocm/pkg/registration/clientcert" "open-cluster-management.io/ocm/pkg/registration/helpers" diff --git a/test/e2e/managedclusterset_test.go b/test/e2e/managedclusterset_test.go index 23f0f62a4..3ac1b15db 100644 --- a/test/e2e/managedclusterset_test.go +++ b/test/e2e/managedclusterset_test.go @@ -9,6 +9,7 @@ import ( gomega "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/rand" + clusterv1beta1 "open-cluster-management.io/api/cluster/v1beta1" clusterv1beta2 "open-cluster-management.io/api/cluster/v1beta2" ) diff --git a/test/e2e/managedclustersetbinding_test.go b/test/e2e/managedclustersetbinding_test.go index 1456ad1d0..24ff88d4b 100644 --- a/test/e2e/managedclustersetbinding_test.go +++ b/test/e2e/managedclustersetbinding_test.go @@ -12,6 +12,7 @@ import ( "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/rand" + clusterv1beta2 "open-cluster-management.io/api/cluster/v1beta2" ) diff --git a/test/e2e/manifestworkreplicaset_test.go b/test/e2e/manifestworkreplicaset_test.go index aec80ebbc..0dd74fc5f 100644 --- a/test/e2e/manifestworkreplicaset_test.go +++ b/test/e2e/manifestworkreplicaset_test.go @@ -3,18 +3,21 @@ package e2e import ( "context" "fmt" + "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/rand" + clusterapiv1 "open-cluster-management.io/api/cluster/v1" clusterv1beta1 "open-cluster-management.io/api/cluster/v1beta1" clusterapiv1beta2 "open-cluster-management.io/api/cluster/v1beta2" operatorapiv1 "open-cluster-management.io/api/operator/v1" workapiv1 "open-cluster-management.io/api/work/v1" workapiv1alpha1 "open-cluster-management.io/api/work/v1alpha1" + "open-cluster-management.io/ocm/test/integration/util" ) diff --git a/test/e2e/registration_taint_update_test.go b/test/e2e/registration_taint_update_test.go index 790075d24..df25ea382 100644 --- a/test/e2e/registration_taint_update_test.go +++ b/test/e2e/registration_taint_update_test.go @@ -9,7 +9,9 @@ import ( "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/rand" + clusterv1 "open-cluster-management.io/api/cluster/v1" + "open-cluster-management.io/ocm/pkg/registration/helpers" "open-cluster-management.io/ocm/pkg/registration/hub/taint" ) diff --git a/test/e2e/registration_webhook_test.go b/test/e2e/registration_webhook_test.go index 7a0c00412..f9a83b545 100644 --- a/test/e2e/registration_webhook_test.go +++ b/test/e2e/registration_webhook_test.go @@ -7,10 +7,6 @@ import ( "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" - - clusterv1 "open-cluster-management.io/api/cluster/v1" - clusterv1beta2 "open-cluster-management.io/api/cluster/v1beta2" - corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -18,6 +14,9 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/rand" "k8s.io/client-go/util/retry" + + clusterv1 "open-cluster-management.io/api/cluster/v1" + clusterv1beta2 "open-cluster-management.io/api/cluster/v1beta2" ) const ( diff --git a/test/e2e/work_webhook_test.go b/test/e2e/work_webhook_test.go index f6d9a41a5..9f9b09094 100644 --- a/test/e2e/work_webhook_test.go +++ b/test/e2e/work_webhook_test.go @@ -3,20 +3,21 @@ package e2e import ( "context" "fmt" - operatorapiv1 "open-cluster-management.io/api/operator/v1" - "open-cluster-management.io/ocm/test/integration/util" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" - rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/rand" "k8s.io/client-go/util/retry" + workclientset "open-cluster-management.io/api/client/work/clientset/versioned" + operatorapiv1 "open-cluster-management.io/api/operator/v1" workapiv1 "open-cluster-management.io/api/work/v1" + + "open-cluster-management.io/ocm/test/integration/util" ) // Test cases with lable "sanity-check" could be ran on an existing enviroment with validating webhook installed diff --git a/test/e2e/work_workload_test.go b/test/e2e/work_workload_test.go index 55a472bde..176f764f5 100644 --- a/test/e2e/work_workload_test.go +++ b/test/e2e/work_workload_test.go @@ -3,16 +3,12 @@ package e2e import ( "context" "fmt" - "k8s.io/utils/pointer" - operatorapiv1 "open-cluster-management.io/api/operator/v1" - "open-cluster-management.io/ocm/test/integration/util" "reflect" "strings" "time" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" - appsv1 "k8s.io/api/apps/v1" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" @@ -26,7 +22,12 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/rand" + "k8s.io/utils/pointer" + + operatorapiv1 "open-cluster-management.io/api/operator/v1" workapiv1 "open-cluster-management.io/api/work/v1" + + "open-cluster-management.io/ocm/test/integration/util" ) const ( diff --git a/test/integration/operator/clustermanager_hosted_test.go b/test/integration/operator/clustermanager_hosted_test.go index 12622524c..bdefb76db 100644 --- a/test/integration/operator/clustermanager_hosted_test.go +++ b/test/integration/operator/clustermanager_hosted_test.go @@ -3,7 +3,6 @@ package operator import ( "context" "fmt" - "open-cluster-management.io/ocm/test/integration/util" "time" "github.com/onsi/ginkgo/v2" @@ -15,9 +14,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" "k8s.io/client-go/util/cert" + operatorapiv1 "open-cluster-management.io/api/operator/v1" v1 "open-cluster-management.io/api/operator/v1" + "open-cluster-management.io/ocm/pkg/operator/helpers" + "open-cluster-management.io/ocm/test/integration/util" ) func updateDeploymentStatus(kubeClient kubernetes.Interface, namespace, deploymentName string) { diff --git a/test/integration/operator/clustermanager_test.go b/test/integration/operator/clustermanager_test.go index c1a9d4dfe..dee741b50 100644 --- a/test/integration/operator/clustermanager_test.go +++ b/test/integration/operator/clustermanager_test.go @@ -3,26 +3,25 @@ package operator import ( "context" "fmt" - "open-cluster-management.io/ocm/test/integration/util" "time" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" - corev1 "k8s.io/api/core/v1" - v1 "open-cluster-management.io/api/operator/v1" - + "github.com/openshift/library-go/pkg/controller/controllercmd" appsv1 "k8s.io/api/apps/v1" + corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/rest" "k8s.io/client-go/util/cert" - "github.com/openshift/library-go/pkg/controller/controllercmd" - operatorapiv1 "open-cluster-management.io/api/operator/v1" + v1 "open-cluster-management.io/api/operator/v1" + "open-cluster-management.io/ocm/pkg/operator/helpers" "open-cluster-management.io/ocm/pkg/operator/operators/clustermanager" certrotation "open-cluster-management.io/ocm/pkg/operator/operators/clustermanager/controllers/certrotationcontroller" + "open-cluster-management.io/ocm/test/integration/util" ) func startHubOperator(ctx context.Context, mode v1.InstallMode) { diff --git a/test/integration/operator/integration_suite_test.go b/test/integration/operator/integration_suite_test.go index 41d532f86..ce57bbc41 100644 --- a/test/integration/operator/integration_suite_test.go +++ b/test/integration/operator/integration_suite_test.go @@ -9,7 +9,6 @@ import ( "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" - corev1 "k8s.io/api/core/v1" apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" "k8s.io/apimachinery/pkg/api/errors" @@ -24,6 +23,7 @@ import ( operatorclient "open-cluster-management.io/api/client/operator/clientset/versioned" operatorapiv1 "open-cluster-management.io/api/operator/v1" + "open-cluster-management.io/ocm/pkg/operator/operators/klusterlet/controllers/bootstrapcontroller" "open-cluster-management.io/ocm/pkg/operator/operators/klusterlet/controllers/ssarcontroller" ) diff --git a/test/integration/operator/klusterlet_hosted_test.go b/test/integration/operator/klusterlet_hosted_test.go index 1c79ce46c..6c41228bf 100644 --- a/test/integration/operator/klusterlet_hosted_test.go +++ b/test/integration/operator/klusterlet_hosted_test.go @@ -3,12 +3,15 @@ package operator import ( "context" "fmt" + "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/rand" + operatorapiv1 "open-cluster-management.io/api/operator/v1" + "open-cluster-management.io/ocm/pkg/operator/helpers" "open-cluster-management.io/ocm/test/integration/util" ) diff --git a/test/integration/operator/klusterlet_test.go b/test/integration/operator/klusterlet_test.go index 810e9e356..132f44649 100644 --- a/test/integration/operator/klusterlet_test.go +++ b/test/integration/operator/klusterlet_test.go @@ -6,8 +6,6 @@ import ( "strings" "time" - ocmfeature "open-cluster-management.io/api/feature" - "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" "github.com/openshift/library-go/pkg/controller/controllercmd" @@ -17,7 +15,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/rand" "k8s.io/client-go/rest" + + ocmfeature "open-cluster-management.io/api/feature" operatorapiv1 "open-cluster-management.io/api/operator/v1" + "open-cluster-management.io/ocm/pkg/operator/helpers" "open-cluster-management.io/ocm/pkg/operator/operators/klusterlet" "open-cluster-management.io/ocm/test/integration/util" diff --git a/test/integration/placement/assertion_test.go b/test/integration/placement/assertion_test.go index 6bd12baa2..35ba05b1b 100644 --- a/test/integration/placement/assertion_test.go +++ b/test/integration/placement/assertion_test.go @@ -6,8 +6,6 @@ import ( "sort" "time" - "open-cluster-management.io/ocm/test/integration/util" - "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" @@ -15,10 +13,13 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" + clusterapiv1 "open-cluster-management.io/api/cluster/v1" clusterapiv1alpha1 "open-cluster-management.io/api/cluster/v1alpha1" clusterapiv1beta1 "open-cluster-management.io/api/cluster/v1beta1" clusterapiv1beta2 "open-cluster-management.io/api/cluster/v1beta2" + + "open-cluster-management.io/ocm/test/integration/util" ) func assertPlacementDecisionCreated(placement *clusterapiv1beta1.Placement) { diff --git a/test/integration/placement/placement_test.go b/test/integration/placement/placement_test.go index 4f2a098b5..0db1592fa 100644 --- a/test/integration/placement/placement_test.go +++ b/test/integration/placement/placement_test.go @@ -5,8 +5,6 @@ import ( "fmt" "time" - "open-cluster-management.io/ocm/test/integration/util" - "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" "github.com/openshift/library-go/pkg/controller/controllercmd" @@ -15,8 +13,10 @@ import ( "k8s.io/apimachinery/pkg/util/rand" clusterapiv1beta1 "open-cluster-management.io/api/cluster/v1beta1" + controllers "open-cluster-management.io/ocm/pkg/placement/controllers" "open-cluster-management.io/ocm/pkg/placement/controllers/scheduling" + "open-cluster-management.io/ocm/test/integration/util" ) const ( diff --git a/test/integration/placement/prioritizer_test.go b/test/integration/placement/prioritizer_test.go index 2635e344f..0bd48a9c8 100644 --- a/test/integration/placement/prioritizer_test.go +++ b/test/integration/placement/prioritizer_test.go @@ -3,7 +3,6 @@ package placement import ( "context" "fmt" - "open-cluster-management.io/ocm/test/integration/util" "time" "github.com/onsi/ginkgo/v2" @@ -12,9 +11,12 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/rand" + clusterapiv1beta1 "open-cluster-management.io/api/cluster/v1beta1" + controllers "open-cluster-management.io/ocm/pkg/placement/controllers" "open-cluster-management.io/ocm/pkg/placement/controllers/scheduling" + "open-cluster-management.io/ocm/test/integration/util" ) var _ = ginkgo.Describe("Prioritizers", func() { diff --git a/test/integration/placement/suite_test.go b/test/integration/placement/suite_test.go index 910199177..58092795e 100644 --- a/test/integration/placement/suite_test.go +++ b/test/integration/placement/suite_test.go @@ -5,7 +5,6 @@ import ( "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" - "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/envtest" diff --git a/test/integration/placement/toleration_test.go b/test/integration/placement/toleration_test.go index 9cc3335ed..1055df78a 100644 --- a/test/integration/placement/toleration_test.go +++ b/test/integration/placement/toleration_test.go @@ -3,7 +3,6 @@ package placement import ( "context" "fmt" - "open-cluster-management.io/ocm/test/integration/util" "time" "github.com/onsi/ginkgo/v2" @@ -12,10 +11,13 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/rand" + clusterapiv1 "open-cluster-management.io/api/cluster/v1" clusterapiv1beta1 "open-cluster-management.io/api/cluster/v1beta1" + controllers "open-cluster-management.io/ocm/pkg/placement/controllers" "open-cluster-management.io/ocm/pkg/placement/controllers/scheduling" + "open-cluster-management.io/ocm/test/integration/util" ) var _ = ginkgo.Describe("TaintToleration", func() { diff --git a/test/integration/registration/addon_lease_test.go b/test/integration/registration/addon_lease_test.go index 45c9f080f..4870c1ef7 100644 --- a/test/integration/registration/addon_lease_test.go +++ b/test/integration/registration/addon_lease_test.go @@ -3,23 +3,24 @@ package registration_test import ( "context" "fmt" - commonoptions "open-cluster-management.io/ocm/pkg/common/options" - "open-cluster-management.io/ocm/test/integration/util" "path" "time" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" - coordv1 "k8s.io/api/coordination/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/rand" + addonv1alpha1 "open-cluster-management.io/api/addon/v1alpha1" clusterv1 "open-cluster-management.io/api/cluster/v1" + + commonoptions "open-cluster-management.io/ocm/pkg/common/options" "open-cluster-management.io/ocm/pkg/features" "open-cluster-management.io/ocm/pkg/registration/spoke" + "open-cluster-management.io/ocm/test/integration/util" ) var _ = ginkgo.Describe("Addon Lease Resync", func() { diff --git a/test/integration/registration/addon_registration_test.go b/test/integration/registration/addon_registration_test.go index a887f1210..56b3ca449 100644 --- a/test/integration/registration/addon_registration_test.go +++ b/test/integration/registration/addon_registration_test.go @@ -3,8 +3,6 @@ package registration_test import ( "context" "fmt" - commonoptions "open-cluster-management.io/ocm/pkg/common/options" - "open-cluster-management.io/ocm/test/integration/util" "path" "reflect" "strings" @@ -12,18 +10,21 @@ import ( "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" - "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/api/meta" - "k8s.io/apimachinery/pkg/util/rand" - certificates "k8s.io/api/certificates/v1" corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/rand" + addonv1alpha1 "open-cluster-management.io/api/addon/v1alpha1" clusterv1 "open-cluster-management.io/api/cluster/v1" + + commonoptions "open-cluster-management.io/ocm/pkg/common/options" "open-cluster-management.io/ocm/pkg/features" "open-cluster-management.io/ocm/pkg/registration/clientcert" "open-cluster-management.io/ocm/pkg/registration/spoke" + "open-cluster-management.io/ocm/test/integration/util" ) var _ = ginkgo.Describe("Addon Registration", func() { diff --git a/test/integration/registration/certificate_rotation_test.go b/test/integration/registration/certificate_rotation_test.go index f0ccaa5ce..85ce5c6bd 100644 --- a/test/integration/registration/certificate_rotation_test.go +++ b/test/integration/registration/certificate_rotation_test.go @@ -1,15 +1,15 @@ package registration_test import ( - commonoptions "open-cluster-management.io/ocm/pkg/common/options" - "open-cluster-management.io/ocm/test/integration/util" "path" "time" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" + commonoptions "open-cluster-management.io/ocm/pkg/common/options" "open-cluster-management.io/ocm/pkg/registration/spoke" + "open-cluster-management.io/ocm/test/integration/util" ) var _ = ginkgo.Describe("Certificate Rotation", func() { diff --git a/test/integration/registration/default_managedclusterset_controller_test.go b/test/integration/registration/default_managedclusterset_controller_test.go index aa125e0fa..d6291a99b 100644 --- a/test/integration/registration/default_managedclusterset_controller_test.go +++ b/test/integration/registration/default_managedclusterset_controller_test.go @@ -7,9 +7,9 @@ import ( "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/api/equality" - setcontroller "open-cluster-management.io/ocm/pkg/registration/hub/managedclusterset" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + setcontroller "open-cluster-management.io/ocm/pkg/registration/hub/managedclusterset" ) var _ = ginkgo.Describe("DefaultManagedClusterSet", func() { diff --git a/test/integration/registration/disaster_recovery_test.go b/test/integration/registration/disaster_recovery_test.go index 2b2e6f92e..02ec65455 100644 --- a/test/integration/registration/disaster_recovery_test.go +++ b/test/integration/registration/disaster_recovery_test.go @@ -3,14 +3,13 @@ package registration_test import ( "context" "fmt" - commonoptions "open-cluster-management.io/ocm/pkg/common/options" - "open-cluster-management.io/ocm/test/integration/util" "os" "path" "time" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" + "github.com/openshift/library-go/pkg/controller/controllercmd" certificates "k8s.io/api/certificates/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/meta" @@ -20,15 +19,17 @@ import ( "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/envtest" - "github.com/openshift/library-go/pkg/controller/controllercmd" addonv1alpha1 "open-cluster-management.io/api/addon/v1alpha1" addonclientset "open-cluster-management.io/api/client/addon/clientset/versioned" clusterclientset "open-cluster-management.io/api/client/cluster/clientset/versioned" clusterv1 "open-cluster-management.io/api/cluster/v1" + + commonoptions "open-cluster-management.io/ocm/pkg/common/options" "open-cluster-management.io/ocm/pkg/features" "open-cluster-management.io/ocm/pkg/registration/clientcert" "open-cluster-management.io/ocm/pkg/registration/hub" "open-cluster-management.io/ocm/pkg/registration/spoke" + "open-cluster-management.io/ocm/test/integration/util" ) var _ = ginkgo.Describe("Disaster Recovery", func() { diff --git a/test/integration/registration/global_managedclusterset_controller_test.go b/test/integration/registration/global_managedclusterset_controller_test.go index 1bb8cf6d2..8c6e15f20 100644 --- a/test/integration/registration/global_managedclusterset_controller_test.go +++ b/test/integration/registration/global_managedclusterset_controller_test.go @@ -8,8 +8,8 @@ import ( "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/api/equality" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + setcontroller "open-cluster-management.io/ocm/pkg/registration/hub/managedclusterset" ) diff --git a/test/integration/registration/integration_suite_test.go b/test/integration/registration/integration_suite_test.go index 860dc4394..0b2176f4e 100644 --- a/test/integration/registration/integration_suite_test.go +++ b/test/integration/registration/integration_suite_test.go @@ -3,8 +3,6 @@ package registration_test import ( "context" "fmt" - "open-cluster-management.io/ocm/pkg/registration/spoke/registration" - "open-cluster-management.io/ocm/test/integration/util" "os" "path" "testing" @@ -12,26 +10,27 @@ import ( "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" - "github.com/openshift/library-go/pkg/controller/controllercmd" - "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" "k8s.io/client-go/transport" + "sigs.k8s.io/controller-runtime/pkg/envtest" + logf "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/controller-runtime/pkg/log/zap" addonclientset "open-cluster-management.io/api/client/addon/clientset/versioned" clusterclientset "open-cluster-management.io/api/client/cluster/clientset/versioned" workclientset "open-cluster-management.io/api/client/work/clientset/versioned" clusterv1 "open-cluster-management.io/api/cluster/v1" + "open-cluster-management.io/ocm/pkg/features" "open-cluster-management.io/ocm/pkg/registration/clientcert" "open-cluster-management.io/ocm/pkg/registration/hub" "open-cluster-management.io/ocm/pkg/registration/spoke" "open-cluster-management.io/ocm/pkg/registration/spoke/addon" - "sigs.k8s.io/controller-runtime/pkg/envtest" - logf "sigs.k8s.io/controller-runtime/pkg/log" - "sigs.k8s.io/controller-runtime/pkg/log/zap" + "open-cluster-management.io/ocm/pkg/registration/spoke/registration" + "open-cluster-management.io/ocm/test/integration/util" ) const ( diff --git a/test/integration/registration/managedcluster_deletion_test.go b/test/integration/registration/managedcluster_deletion_test.go index 111084f2c..ef3430ec2 100644 --- a/test/integration/registration/managedcluster_deletion_test.go +++ b/test/integration/registration/managedcluster_deletion_test.go @@ -6,12 +6,12 @@ import ( "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" - - clusterv1 "open-cluster-management.io/api/cluster/v1" - "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/rand" + + clusterv1 "open-cluster-management.io/api/cluster/v1" + testinghelpers "open-cluster-management.io/ocm/pkg/registration/helpers/testing" ) diff --git a/test/integration/registration/managedcluster_lease_test.go b/test/integration/registration/managedcluster_lease_test.go index 35277427d..0e72db0fe 100644 --- a/test/integration/registration/managedcluster_lease_test.go +++ b/test/integration/registration/managedcluster_lease_test.go @@ -3,20 +3,21 @@ package registration_test import ( "context" "fmt" - commonoptions "open-cluster-management.io/ocm/pkg/common/options" - "open-cluster-management.io/ocm/test/integration/util" "path" "time" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" - "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/rand" + clusterv1 "open-cluster-management.io/api/cluster/v1" + + commonoptions "open-cluster-management.io/ocm/pkg/common/options" "open-cluster-management.io/ocm/pkg/registration/spoke" + "open-cluster-management.io/ocm/test/integration/util" ) var _ = ginkgo.Describe("Cluster Lease Update", func() { diff --git a/test/integration/registration/managedclusterset_test.go b/test/integration/registration/managedclusterset_test.go index 283c0d809..473d31046 100644 --- a/test/integration/registration/managedclusterset_test.go +++ b/test/integration/registration/managedclusterset_test.go @@ -9,6 +9,7 @@ import ( "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/rand" + clusterv1 "open-cluster-management.io/api/cluster/v1" clusterv1beta2 "open-cluster-management.io/api/cluster/v1beta2" ) diff --git a/test/integration/registration/spokeagent_recovery_test.go b/test/integration/registration/spokeagent_recovery_test.go index 85c20d7a6..c45f28ae9 100644 --- a/test/integration/registration/spokeagent_recovery_test.go +++ b/test/integration/registration/spokeagent_recovery_test.go @@ -2,20 +2,21 @@ package registration_test import ( "fmt" - commonoptions "open-cluster-management.io/ocm/pkg/common/options" - "open-cluster-management.io/ocm/test/integration/util" "path" "reflect" "time" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" - corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" + clusterv1 "open-cluster-management.io/api/cluster/v1" + + commonoptions "open-cluster-management.io/ocm/pkg/common/options" "open-cluster-management.io/ocm/pkg/registration/spoke" + "open-cluster-management.io/ocm/test/integration/util" ) var _ = ginkgo.Describe("Agent Recovery", func() { diff --git a/test/integration/registration/spokeagent_restart_test.go b/test/integration/registration/spokeagent_restart_test.go index db7cdd718..a488368e6 100644 --- a/test/integration/registration/spokeagent_restart_test.go +++ b/test/integration/registration/spokeagent_restart_test.go @@ -3,18 +3,19 @@ package registration_test import ( "context" "fmt" - commonoptions "open-cluster-management.io/ocm/pkg/common/options" - "open-cluster-management.io/ocm/test/integration/util" "path" "time" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" - "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + clusterv1 "open-cluster-management.io/api/cluster/v1" + + commonoptions "open-cluster-management.io/ocm/pkg/common/options" "open-cluster-management.io/ocm/pkg/registration/spoke" + "open-cluster-management.io/ocm/test/integration/util" ) var _ = ginkgo.Describe("Agent Restart", func() { diff --git a/test/integration/registration/spokecluster_autoapproval_test.go b/test/integration/registration/spokecluster_autoapproval_test.go index f94614c74..6a58f39f9 100644 --- a/test/integration/registration/spokecluster_autoapproval_test.go +++ b/test/integration/registration/spokecluster_autoapproval_test.go @@ -2,8 +2,6 @@ package registration_test import ( "fmt" - commonoptions "open-cluster-management.io/ocm/pkg/common/options" - "open-cluster-management.io/ocm/test/integration/util" "path" "time" @@ -11,8 +9,12 @@ import ( "github.com/onsi/gomega" certificates "k8s.io/api/certificates/v1" "k8s.io/apimachinery/pkg/api/meta" + clusterv1 "open-cluster-management.io/api/cluster/v1" + + commonoptions "open-cluster-management.io/ocm/pkg/common/options" "open-cluster-management.io/ocm/pkg/registration/spoke" + "open-cluster-management.io/ocm/test/integration/util" ) var _ = ginkgo.Describe("Cluster Auto Approval", func() { diff --git a/test/integration/registration/spokecluster_claim_test.go b/test/integration/registration/spokecluster_claim_test.go index 4d67401e0..7d579b015 100644 --- a/test/integration/registration/spokecluster_claim_test.go +++ b/test/integration/registration/spokecluster_claim_test.go @@ -3,8 +3,6 @@ package registration_test import ( "context" "fmt" - commonoptions "open-cluster-management.io/ocm/pkg/common/options" - "open-cluster-management.io/ocm/test/integration/util" "path" "reflect" "time" @@ -12,12 +10,15 @@ import ( "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/api/meta" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/rand" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clusterv1 "open-cluster-management.io/api/cluster/v1" clusterv1alpha1 "open-cluster-management.io/api/cluster/v1alpha1" + + commonoptions "open-cluster-management.io/ocm/pkg/common/options" "open-cluster-management.io/ocm/pkg/registration/spoke" + "open-cluster-management.io/ocm/test/integration/util" ) var _ = ginkgo.Describe("Cluster Claim", func() { diff --git a/test/integration/registration/spokecluster_joining_test.go b/test/integration/registration/spokecluster_joining_test.go index 295d609b6..eaa2e3c87 100644 --- a/test/integration/registration/spokecluster_joining_test.go +++ b/test/integration/registration/spokecluster_joining_test.go @@ -2,8 +2,6 @@ package registration_test import ( "fmt" - commonoptions "open-cluster-management.io/ocm/pkg/common/options" - "open-cluster-management.io/ocm/test/integration/util" "path" "time" @@ -12,7 +10,10 @@ import ( "k8s.io/apimachinery/pkg/api/meta" clusterv1 "open-cluster-management.io/api/cluster/v1" + + commonoptions "open-cluster-management.io/ocm/pkg/common/options" "open-cluster-management.io/ocm/pkg/registration/spoke" + "open-cluster-management.io/ocm/test/integration/util" ) var _ = ginkgo.Describe("Joining Process", func() { diff --git a/test/integration/registration/spokecluster_status_test.go b/test/integration/registration/spokecluster_status_test.go index 43afe5dd7..b971c660a 100644 --- a/test/integration/registration/spokecluster_status_test.go +++ b/test/integration/registration/spokecluster_status_test.go @@ -2,8 +2,6 @@ package registration_test import ( "fmt" - commonoptions "open-cluster-management.io/ocm/pkg/common/options" - "open-cluster-management.io/ocm/test/integration/util" "path" "time" @@ -12,7 +10,10 @@ import ( "k8s.io/apimachinery/pkg/api/meta" clusterv1 "open-cluster-management.io/api/cluster/v1" + + commonoptions "open-cluster-management.io/ocm/pkg/common/options" "open-cluster-management.io/ocm/pkg/registration/spoke" + "open-cluster-management.io/ocm/test/integration/util" ) var _ = ginkgo.Describe("Collecting Node Resource", func() { diff --git a/test/integration/registration/taint_add_test.go b/test/integration/registration/taint_add_test.go index c617f9834..8a90b6d52 100644 --- a/test/integration/registration/taint_add_test.go +++ b/test/integration/registration/taint_add_test.go @@ -3,20 +3,23 @@ package registration_test import ( "context" "fmt" + "path" + "time" + "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" "github.com/openshift/library-go/pkg/controller/controllercmd" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/rand" + v1 "open-cluster-management.io/api/cluster/v1" + commonoptions "open-cluster-management.io/ocm/pkg/common/options" "open-cluster-management.io/ocm/pkg/registration/helpers" "open-cluster-management.io/ocm/pkg/registration/hub/taint" "open-cluster-management.io/ocm/pkg/registration/spoke" "open-cluster-management.io/ocm/test/integration/util" - "path" - "time" ) var _ = ginkgo.Describe("ManagedCluster Taints Update", func() { diff --git a/test/integration/util/assertion.go b/test/integration/util/assertion.go index a883db56e..5bdf1c6c2 100644 --- a/test/integration/util/assertion.go +++ b/test/integration/util/assertion.go @@ -3,22 +3,21 @@ package util import ( "context" "fmt" - corev1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/api/meta" - "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/client-go/dynamic" - "k8s.io/client-go/kubernetes" - workclientset "open-cluster-management.io/api/client/work/clientset/versioned" - workapiv1 "open-cluster-management.io/api/work/v1" "reflect" "sort" "github.com/onsi/gomega" - + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/client-go/dynamic" + "k8s.io/client-go/kubernetes" operatorclientset "open-cluster-management.io/api/client/operator/clientset/versioned" + workclientset "open-cluster-management.io/api/client/work/clientset/versioned" + workapiv1 "open-cluster-management.io/api/work/v1" ) const ( diff --git a/test/integration/util/managedcluster.go b/test/integration/util/managedcluster.go index 641ad556b..d1a3a71de 100644 --- a/test/integration/util/managedcluster.go +++ b/test/integration/util/managedcluster.go @@ -2,11 +2,13 @@ package util import ( "context" + corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" "k8s.io/client-go/util/retry" + clusterclientset "open-cluster-management.io/api/client/cluster/clientset/versioned" clusterv1 "open-cluster-management.io/api/cluster/v1" ) diff --git a/test/integration/util/structured.go b/test/integration/util/structured.go index 9ba595b73..0934c7e02 100644 --- a/test/integration/util/structured.go +++ b/test/integration/util/structured.go @@ -2,12 +2,14 @@ package util import ( "context" + corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes" + workapiv1 "open-cluster-management.io/api/work/v1" ) diff --git a/test/integration/util/unstructured.go b/test/integration/util/unstructured.go index 6226433c3..1de6b2de2 100644 --- a/test/integration/util/unstructured.go +++ b/test/integration/util/unstructured.go @@ -4,7 +4,6 @@ import ( "context" "github.com/onsi/gomega" - corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/integration/work/deleteoption_test.go b/test/integration/work/deleteoption_test.go index aee4bd533..fd9650d03 100644 --- a/test/integration/work/deleteoption_test.go +++ b/test/integration/work/deleteoption_test.go @@ -3,8 +3,6 @@ package work import ( "context" "fmt" - commonoptions "open-cluster-management.io/ocm/pkg/common/options" - "open-cluster-management.io/ocm/test/integration/util" "time" "github.com/onsi/ginkgo/v2" @@ -13,8 +11,12 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilrand "k8s.io/apimachinery/pkg/util/rand" + workapiv1 "open-cluster-management.io/api/work/v1" + + commonoptions "open-cluster-management.io/ocm/pkg/common/options" "open-cluster-management.io/ocm/pkg/work/spoke" + "open-cluster-management.io/ocm/test/integration/util" ) var _ = ginkgo.Describe("ManifestWork Status Feedback", func() { diff --git a/test/integration/work/executor_test.go b/test/integration/work/executor_test.go index ed10d2a2b..ae6e23525 100644 --- a/test/integration/work/executor_test.go +++ b/test/integration/work/executor_test.go @@ -3,9 +3,6 @@ package work import ( "context" "encoding/json" - commonoptions "open-cluster-management.io/ocm/pkg/common/options" - "open-cluster-management.io/ocm/pkg/features" - "open-cluster-management.io/ocm/test/integration/util" "time" jsonpatch "github.com/evanphx/json-patch" @@ -16,9 +13,14 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" utilrand "k8s.io/apimachinery/pkg/util/rand" + workclientset "open-cluster-management.io/api/client/work/clientset/versioned" workapiv1 "open-cluster-management.io/api/work/v1" + + commonoptions "open-cluster-management.io/ocm/pkg/common/options" + "open-cluster-management.io/ocm/pkg/features" "open-cluster-management.io/ocm/pkg/work/spoke" + "open-cluster-management.io/ocm/test/integration/util" ) var _ = ginkgo.Describe("ManifestWork Executor Subject", func() { diff --git a/test/integration/work/manifestworkreplicaset_test.go b/test/integration/work/manifestworkreplicaset_test.go index 4d9a51b0d..ef8bb9dfc 100644 --- a/test/integration/work/manifestworkreplicaset_test.go +++ b/test/integration/work/manifestworkreplicaset_test.go @@ -3,7 +3,6 @@ package work import ( "context" "fmt" - "open-cluster-management.io/ocm/test/integration/util" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" @@ -12,9 +11,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilrand "k8s.io/apimachinery/pkg/util/rand" "k8s.io/apimachinery/pkg/util/sets" + clusterv1beta1 "open-cluster-management.io/api/cluster/v1beta1" workapiv1 "open-cluster-management.io/api/work/v1" workapiv1alpha1 "open-cluster-management.io/api/work/v1alpha1" + + "open-cluster-management.io/ocm/test/integration/util" ) var _ = ginkgo.Describe("ManifestWorkReplicaSet", func() { diff --git a/test/integration/work/statusfeedback_test.go b/test/integration/work/statusfeedback_test.go index 76bc75893..209007b15 100644 --- a/test/integration/work/statusfeedback_test.go +++ b/test/integration/work/statusfeedback_test.go @@ -3,9 +3,6 @@ package work import ( "context" "fmt" - commonoptions "open-cluster-management.io/ocm/pkg/common/options" - "open-cluster-management.io/ocm/pkg/features" - "open-cluster-management.io/ocm/test/integration/util" "time" "github.com/onsi/ginkgo/v2" @@ -16,9 +13,14 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilrand "k8s.io/apimachinery/pkg/util/rand" "k8s.io/utils/pointer" + ocmfeature "open-cluster-management.io/api/feature" workapiv1 "open-cluster-management.io/api/work/v1" + + commonoptions "open-cluster-management.io/ocm/pkg/common/options" + "open-cluster-management.io/ocm/pkg/features" "open-cluster-management.io/ocm/pkg/work/spoke" + "open-cluster-management.io/ocm/test/integration/util" ) var _ = ginkgo.Describe("ManifestWork Status Feedback", func() { diff --git a/test/integration/work/suite_test.go b/test/integration/work/suite_test.go index 61725786b..faa8dd73c 100644 --- a/test/integration/work/suite_test.go +++ b/test/integration/work/suite_test.go @@ -2,18 +2,13 @@ package work import ( "context" - "open-cluster-management.io/ocm/test/integration/util" "os" "path" "testing" - "github.com/openshift/library-go/pkg/controller/controllercmd" - clusterclientset "open-cluster-management.io/api/client/cluster/clientset/versioned" - "open-cluster-management.io/ocm/pkg/work/hub" - "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" - + "github.com/openshift/library-go/pkg/controller/controllercmd" "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" @@ -21,9 +16,13 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" + clusterclientset "open-cluster-management.io/api/client/cluster/clientset/versioned" workclientset "open-cluster-management.io/api/client/work/clientset/versioned" workapiv1 "open-cluster-management.io/api/work/v1" + "open-cluster-management.io/ocm/pkg/work/helper" + "open-cluster-management.io/ocm/pkg/work/hub" + "open-cluster-management.io/ocm/test/integration/util" ) const ( diff --git a/test/integration/work/unmanaged_appliedwork_test.go b/test/integration/work/unmanaged_appliedwork_test.go index 623284806..6fe543b3b 100644 --- a/test/integration/work/unmanaged_appliedwork_test.go +++ b/test/integration/work/unmanaged_appliedwork_test.go @@ -3,8 +3,6 @@ package work import ( "context" "fmt" - commonoptions "open-cluster-management.io/ocm/pkg/common/options" - util "open-cluster-management.io/ocm/test/integration/util" "os" "path" "time" @@ -16,10 +14,14 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilrand "k8s.io/apimachinery/pkg/util/rand" "k8s.io/client-go/kubernetes" + "sigs.k8s.io/controller-runtime/pkg/envtest" + workclientset "open-cluster-management.io/api/client/work/clientset/versioned" workapiv1 "open-cluster-management.io/api/work/v1" + + commonoptions "open-cluster-management.io/ocm/pkg/common/options" "open-cluster-management.io/ocm/pkg/work/spoke" - "sigs.k8s.io/controller-runtime/pkg/envtest" + util "open-cluster-management.io/ocm/test/integration/util" ) var _ = ginkgo.Describe("Unmanaged ApplieManifestWork", func() { diff --git a/test/integration/work/updatestrategy_test.go b/test/integration/work/updatestrategy_test.go index c2c2ffecc..4c530ad0c 100644 --- a/test/integration/work/updatestrategy_test.go +++ b/test/integration/work/updatestrategy_test.go @@ -3,8 +3,6 @@ package work import ( "context" "fmt" - commonoptions "open-cluster-management.io/ocm/pkg/common/options" - "open-cluster-management.io/ocm/test/integration/util" "time" "github.com/onsi/ginkgo/v2" @@ -15,8 +13,12 @@ import ( "k8s.io/apimachinery/pkg/types" utilrand "k8s.io/apimachinery/pkg/util/rand" "k8s.io/utils/pointer" + workapiv1 "open-cluster-management.io/api/work/v1" + + commonoptions "open-cluster-management.io/ocm/pkg/common/options" "open-cluster-management.io/ocm/pkg/work/spoke" + "open-cluster-management.io/ocm/test/integration/util" ) var _ = ginkgo.Describe("ManifestWork Update Strategy", func() { diff --git a/test/integration/work/work_test.go b/test/integration/work/work_test.go index 19d2fb7e9..c4489cb5a 100644 --- a/test/integration/work/work_test.go +++ b/test/integration/work/work_test.go @@ -3,13 +3,10 @@ package work import ( "context" "fmt" - commonoptions "open-cluster-management.io/ocm/pkg/common/options" - "open-cluster-management.io/ocm/test/integration/util" "time" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" - "github.com/openshift/library-go/pkg/controller/controllercmd" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -21,7 +18,10 @@ import ( "k8s.io/client-go/util/retry" workapiv1 "open-cluster-management.io/api/work/v1" + + commonoptions "open-cluster-management.io/ocm/pkg/common/options" "open-cluster-management.io/ocm/pkg/work/spoke" + "open-cluster-management.io/ocm/test/integration/util" ) func startWorkAgent(ctx context.Context, o *spoke.WorkloadAgentOptions) {