From 352f84ae1ee2516b36e42a8a59b525f5baaf8a58 Mon Sep 17 00:00:00 2001 From: Steve Kuznetsov Date: Thu, 6 Feb 2025 13:29:48 -0700 Subject: [PATCH] *: format imports Signed-off-by: Steve Kuznetsov --- cmd/aro/monitor.go | 1 + cmd/aro/operator.go | 4 +++- cmd/aro/rp.go | 1 + hack/gendevconfig/gendevconfig.go | 1 + hack/gendiscoverycache/main.go | 4 +++- hack/role/role.go | 4 +++- pkg/cluster/acrtoken.go | 1 + pkg/cluster/arooperator.go | 3 ++- pkg/cluster/cluster.go | 10 +++++---- pkg/cluster/clusterserviceprincipal.go | 1 + pkg/cluster/clusterserviceprincipal_test.go | 6 +++-- pkg/cluster/condition.go | 3 ++- pkg/cluster/condition_test.go | 16 ++++++++------ pkg/cluster/consolebranding.go | 3 ++- pkg/cluster/consolebranding_test.go | 6 +++-- pkg/cluster/delete.go | 1 + pkg/cluster/delete_test.go | 1 + pkg/cluster/deploybaseresources.go | 1 + pkg/cluster/deploybaseresources_test.go | 1 + pkg/cluster/disableupdates.go | 4 +++- pkg/cluster/disableupdates_test.go | 6 +++-- pkg/cluster/ensureendpoints_test.go | 1 + pkg/cluster/fixmcscert_test.go | 1 + pkg/cluster/fixmcsuserdata.go | 4 +++- pkg/cluster/fixmcsuserdata_test.go | 5 +++-- pkg/cluster/gatherlogs.go | 5 +++-- pkg/cluster/gatherlogs_test.go | 12 +++++----- pkg/cluster/hive_test.go | 1 + pkg/cluster/install.go | 14 +++++++----- pkg/cluster/install_test.go | 10 +++++---- pkg/cluster/ipaddresses.go | 1 + pkg/cluster/ipaddresses_test.go | 1 + pkg/cluster/loadbalancerprofile_test.go | 1 + pkg/cluster/networkprofile_test.go | 6 +++-- pkg/cluster/samples.go | 7 +++--- pkg/cluster/samples_test.go | 8 ++++--- pkg/cluster/storageclass.go | 1 + pkg/cluster/storageclass_test.go | 6 +++-- pkg/cluster/tls.go | 3 ++- pkg/cluster/workloadidentityresources.go | 4 +++- pkg/cluster/workloadidentityresources_test.go | 4 +++- pkg/containerinstall/install_test.go | 5 ++--- pkg/deploy/config.go | 1 + pkg/deploy/predeploy.go | 1 + pkg/deploy/upgrade_gateway.go | 1 + pkg/deploy/upgrade_rp.go | 1 + .../admin_hive_clusterdeployment_get_test.go | 3 ++- pkg/frontend/admin_hive_syncset_get.go | 3 ++- pkg/frontend/admin_hive_syncset_get_test.go | 4 +++- pkg/frontend/admin_hive_syncset_list.go | 3 ++- pkg/frontend/admin_hive_syncset_list_test.go | 4 +++- .../admin_hive_syncset_resources_test.go | 4 +++- .../admin_openshiftcluster_approvecsr.go | 1 + .../admin_openshiftcluster_cordonnode.go | 1 + ...n_openshiftcluster_etcdcertificaterenew.go | 6 +++-- ...nshiftcluster_etcdcertificaterenew_test.go | 6 +++-- .../admin_openshiftcluster_etcdrecovery.go | 3 ++- ...dmin_openshiftcluster_etcdrecovery_test.go | 6 +++-- ...dmin_openshiftcluster_kubernetesobjects.go | 1 + ...openshiftcluster_kubernetesobjects_test.go | 1 + pkg/frontend/adminactions/kubeactions.go | 1 + .../adminactions/resources_list_test.go | 1 + pkg/frontend/adminreplies.go | 1 + pkg/frontend/fixetcd.go | 8 ++++--- pkg/frontend/fixetcd_test.go | 4 +++- pkg/frontend/frontend.go | 1 + pkg/frontend/frontend_test.go | 1 + pkg/frontend/validate.go | 1 + pkg/hive/failure/handler.go | 4 +++- pkg/hive/install.go | 6 +++-- pkg/hive/manager.go | 6 +++-- pkg/hive/manager_test.go | 6 +++-- pkg/hive/resources.go | 5 +++-- pkg/hive/resources_test.go | 1 + pkg/mimo/actuator/actuator_test.go | 1 - pkg/mimo/actuator/service.go | 1 + pkg/mimo/actuator/service_test.go | 1 - pkg/mimo/actuator/task.go | 1 + .../steps/cluster/acrtoken_checker_test.go | 4 ++-- pkg/mimo/steps/cluster/apiserver_is_up.go | 3 ++- .../steps/cluster/apiserver_is_up_test.go | 5 +++-- pkg/mimo/steps/cluster/operatorflags_test.go | 4 ++-- pkg/mimo/steps/cluster/tls.go | 3 ++- pkg/mimo/steps/cluster/tls_test.go | 5 +++-- pkg/mimo/steps/example/task.go | 3 ++- pkg/mimo/steps/example/task_test.go | 5 +++-- pkg/mirror/imagestream.go | 1 + pkg/monitor/cluster/arooperatorconditions.go | 4 +++- .../cluster/arooperatorconditions_test.go | 4 +++- .../cluster/arooperatorheartbeat_test.go | 1 + pkg/monitor/cluster/cache.go | 3 ++- .../cluster/certificateexpirationstatuses.go | 3 ++- .../certificateexpirationstatuses_test.go | 8 ++++--- pkg/monitor/cluster/cluster.go | 10 +++++---- .../cluster/clusteroperatorconditions.go | 3 ++- .../cluster/clusteroperatorconditions_test.go | 6 +++-- .../cluster/clusteroperatorversions_test.go | 6 +++-- pkg/monitor/cluster/clustersync.go | 1 + pkg/monitor/cluster/clustersync_test.go | 4 +++- .../cluster/clusterversionconditions_test.go | 6 +++-- pkg/monitor/cluster/clusterversions_test.go | 6 +++-- pkg/monitor/cluster/daemonsetstatuses_test.go | 1 + pkg/monitor/cluster/debugpods_test.go | 1 + .../cluster/deploymentstatuses_test.go | 1 + pkg/monitor/cluster/hiveregistrationstatus.go | 3 ++- .../cluster/hiveregistrationstatus_test.go | 4 +++- pkg/monitor/cluster/jobconditions_test.go | 1 + pkg/monitor/cluster/machineconfigpool_test.go | 6 +++-- .../cluster/machineconfigpoolconditions.go | 4 +++- .../machineconfigpoolconditions_test.go | 6 +++-- pkg/monitor/cluster/nodeconditions.go | 4 +++- pkg/monitor/cluster/nodeconditions_test.go | 8 ++++--- pkg/monitor/cluster/podconditions.go | 1 + pkg/monitor/cluster/podconditions_test.go | 1 + pkg/monitor/cluster/quota_test.go | 1 + .../cluster/replicasetstatuses_test.go | 1 + .../cluster/statefulsetstatuses_test.go | 1 + pkg/monitor/cluster/summary_test.go | 6 +++-- pkg/monitor/monitor.go | 1 + pkg/monitor/worker.go | 1 + .../v1alpha1/cluster_types.go | 3 ++- .../v1alpha1/zz_generated.deepcopy.go | 3 ++- .../v1alpha1/previewfeature_types.go | 3 ++- .../v1alpha1/zz_generated.deepcopy.go | 3 ++- .../alertwebhook/alertwebhook_controller.go | 1 + .../alertwebhook_controller_test.go | 1 + .../autosizednodes_controller.go | 4 +++- .../autosizednodes_controller_test.go | 9 +++++--- pkg/operator/controllers/banner/banner.go | 3 ++- .../controllers/banner/banner_controller.go | 4 +++- .../banner/banner_controller_test.go | 3 ++- .../controllers/base/aro_controller.go | 8 ++++--- .../controllers/base/aro_controller_test.go | 4 +++- .../checkers/clusterdnschecker/checker.go | 3 ++- .../clusterdnschecker/checker_test.go | 4 +++- .../checkers/clusterdnschecker/controller.go | 4 +++- .../clusterdnschecker/controller_test.go | 3 ++- .../ingresscertificatechecker/checker.go | 5 +++-- .../ingresscertificatechecker/checker_test.go | 5 +++-- .../ingresscertificatechecker/controller.go | 6 +++-- .../controller_test.go | 3 ++- .../checkers/internetchecker/controller.go | 4 +++- .../internetchecker/controller_test.go | 3 ++- .../unsupportedconditionchecker.go | 10 +++++---- .../unsupportedconditionchecker_test.go | 7 +++--- .../serviceprincipalchecker/checker.go | 1 + .../serviceprincipalchecker/controller.go | 4 +++- .../controller_test.go | 3 ++- .../cloudproviderconfig_controller.go | 1 + .../cloudproviderconfig_controller_test.go | 1 + .../clusteroperatoraro_controller.go | 12 +++++----- .../clusteroperatoraro_controller_test.go | 6 +++-- .../controllers/cpms/cpms_controller.go | 4 +++- .../controllers/cpms/cpms_controller_test.go | 4 +++- .../controllers/dnsmasq/cluster_controller.go | 6 +++-- .../dnsmasq/cluster_controller_test.go | 8 ++++--- pkg/operator/controllers/dnsmasq/dnsmasq.go | 4 +++- .../dnsmasq/machineconfig_controller.go | 4 +++- .../dnsmasq/machineconfig_controller_test.go | 8 ++++--- .../dnsmasq/machineconfigpool_controller.go | 4 +++- .../machineconfigpool_controller_test.go | 8 ++++--- .../etchosts/cluster_controller.go | 4 +++- .../etchosts/cluster_controller_test.go | 6 +++-- pkg/operator/controllers/etchosts/etchosts.go | 4 +++- .../etchosts/machineconfig_controller.go | 4 +++- .../etchosts/machineconfig_controller_test.go | 1 + .../genevalogging/genevalogging.go | 6 +++-- .../genevalogging/genevalogging_controller.go | 4 +++- .../genevalogging/genevalogging_test.go | 8 ++++--- .../guardrails/guardrails_config.go | 3 ++- .../guardrails/guardrails_controller.go | 1 + .../guardrails/guardrails_controller_test.go | 1 + .../controllers/guardrails/template_test.go | 1 + .../imageconfig/image_controller.go | 4 +++- .../imageconfig/image_controller_test.go | 6 +++-- .../controllers/ingress/ingress_controller.go | 4 +++- .../ingress/ingress_controller_test.go | 4 +++- pkg/operator/controllers/machine/machine.go | 3 ++- .../controllers/machine/machine_controller.go | 6 +++-- .../machine/machine_controller_test.go | 6 +++-- .../machinehealthcheck_controller.go | 6 +++-- .../machinehealthcheck_controller_test.go | 8 ++++--- .../machineset/machineset_controller.go | 4 +++- .../machineset/machineset_controller_test.go | 6 +++-- .../monitoring/monitoring_controller.go | 1 + .../monitoring/monitoring_controller_test.go | 4 +++- .../controllers/muo/muo_controller.go | 1 + .../controllers/muo/muo_controller_test.go | 4 +++- pkg/operator/controllers/muo/template_test.go | 1 + .../controllers/node/node_controller.go | 1 + .../controllers/node/node_controller_test.go | 4 +++- .../nsgflowlogs/nsgflowlogs_test.go | 1 + .../previewfeature_controller.go | 1 + .../pullsecret/pullsecret_controller.go | 1 + .../pullsecret/pullsecret_controller_test.go | 4 +++- .../controllers/rbac/rbac_controller.go | 1 + pkg/operator/controllers/routefix/routefix.go | 6 +++-- .../routefix/routefix_controller.go | 6 +++-- .../storageaccount_controller.go | 4 +++- .../storageaccounts/storageaccounts.go | 4 +++- .../storageaccounts/storageaccounts_test.go | 4 +++- .../subnets/subnet_controller_test.go | 1 + .../controllers/subnets/subnets_controller.go | 4 +++- .../controllers/workaround/systemreserved.go | 4 +++- .../workaround/systemreserved_test.go | 4 +++- .../workaround/workaround_controller.go | 4 +++- .../workaround/workaround_controller_test.go | 4 +++- pkg/operator/deploy/deploy.go | 4 +++- pkg/operator/deploy/deploy_test.go | 8 ++++--- pkg/operator/helpers.go | 3 ++- pkg/operator/helpers_test.go | 3 ++- pkg/portal/cluster/clusteroperators.go | 3 ++- pkg/portal/cluster/clusteroperators_test.go | 4 +++- pkg/portal/cluster/fetcher.go | 6 +++-- pkg/portal/cluster/machines.go | 3 ++- pkg/portal/cluster/machines_test.go | 4 +++- pkg/portal/cluster/machinesets.go | 3 ++- pkg/portal/cluster/machinesets_test.go | 4 +++- pkg/portal/cluster/nodes_test.go | 1 + pkg/portal/kubeconfig/kubeconfig.go | 1 + pkg/portal/kubeconfig/proxy_test.go | 1 + pkg/portal/prometheus/proxy_test.go | 1 + pkg/portal/security_test.go | 1 + pkg/swagger/paths.go | 1 + pkg/util/arm/deploy_test.go | 1 + .../mgmt/features/deployments_addons.go | 1 + pkg/util/clienthelper/clienthelper.go | 8 ++++--- pkg/util/clienthelper/clienthelper_test.go | 6 +++-- pkg/util/clienthelper/createorder.go | 3 ++- pkg/util/clienthelper/createorder_test.go | 3 ++- pkg/util/cluster/cluster.go | 1 + pkg/util/clusterauthorizer/authorizer.go | 1 + pkg/util/clusterauthorizer/authorizer_test.go | 1 + pkg/util/clusterdata/cluster_version.go | 8 ++++--- pkg/util/clusterdata/cluster_version_test.go | 6 +++-- pkg/util/clusterdata/clusterdata.go | 6 +++-- pkg/util/clusterdata/ingress_profile.go | 8 ++++--- pkg/util/clusterdata/ingress_profile_test.go | 8 ++++--- pkg/util/clusterdata/service_principal.go | 8 ++++--- .../clusterdata/service_principal_test.go | 1 + pkg/util/clusterdata/worker_profile.go | 8 ++++--- pkg/util/clusterdata/worker_profile_test.go | 8 ++++--- pkg/util/clusteroperators/isavailable_test.go | 3 ++- pkg/util/conditions/condition.go | 3 ++- pkg/util/conditions/condition_test.go | 3 ++- pkg/util/deployer/deploy_test.go | 1 + pkg/util/dynamichelper/createorder.go | 3 ++- pkg/util/dynamichelper/createorder_test.go | 3 ++- .../cache_fallback_discovery_client.go | 1 + .../cache_fallback_discovery_client_test.go | 1 + pkg/util/dynamichelper/dynamichelper.go | 8 ++++--- pkg/util/dynamichelper/dynamichelper_test.go | 6 +++-- pkg/util/dynamichelper/gvrresolver.go | 1 + pkg/util/keyvault/keyvault.go | 1 + pkg/util/liveconfig/hive.go | 1 + pkg/util/log/hive.go | 1 + pkg/util/mocks/adminactions/kubeactions.go | 1 + pkg/util/mocks/clusterdata/clusterdata.go | 8 ++++--- pkg/util/mocks/deployer/deployer.go | 1 + pkg/util/mocks/dynamichelper/dynamichelper.go | 1 + pkg/util/mocks/hive/hive.go | 6 +++-- pkg/util/mocks/net/net.go | 6 +++-- pkg/util/mocks/samples/samples.go | 8 ++++--- pkg/util/mocks/samplesclient/versioned.go | 4 +++- pkg/util/net/net.go | 8 ++++--- pkg/util/net/net_test.go | 12 +++++----- pkg/util/portforward/portforward.go | 1 + pkg/util/portforward/streamconn.go | 1 + pkg/util/ready/ready.go | 5 +++-- pkg/util/ready/ready_test.go | 5 +++-- pkg/util/scheme/scheme.go | 22 ++++++++++--------- pkg/util/steps/condition.go | 1 + pkg/util/steps/refreshing.go | 1 + pkg/util/steps/runner_test.go | 1 + pkg/util/subnet/cluster_subnets.go | 4 +++- pkg/util/subnet/cluster_subnets_test.go | 4 +++- pkg/util/version/clusterversion.go | 3 ++- pkg/util/version/clusterversion_test.go | 3 ++- pkg/validate/dynamic/diskencryptionset.go | 1 + pkg/validate/dynamic/dynamic.go | 1 + .../platformworkloadidentityprofile_test.go | 1 + test/e2e/admin_portal.go | 1 - test/e2e/adminapi.go | 1 - test/e2e/adminapi_redeployvm.go | 2 +- test/e2e/adminapi_resources.go | 5 ++--- test/e2e/cluster.go | 6 ++--- test/e2e/disk_encryption.go | 2 +- test/e2e/dns.go | 2 +- test/e2e/e2e_test.go | 1 - test/e2e/helpers.go | 5 +++-- test/e2e/hive.go | 3 ++- test/e2e/ocp_alerts.go | 2 +- test/e2e/ocp_cluster.go | 5 +++-- test/e2e/ocp_machine.go | 3 ++- test/e2e/operator.go | 17 +++++++------- test/e2e/setup.go | 19 ++++++++-------- test/e2e/update.go | 7 +++--- test/util/clienthelper/helpers.go | 1 + test/util/conditions/conditions.go | 4 +++- test/util/kubeadminkubeconfig/kubeconfig.go | 1 + 300 files changed, 779 insertions(+), 371 deletions(-) diff --git a/cmd/aro/monitor.go b/cmd/aro/monitor.go index 7bc886f7648..b5a13d6fada 100644 --- a/cmd/aro/monitor.go +++ b/cmd/aro/monitor.go @@ -9,6 +9,7 @@ import ( "github.com/Azure/go-autorest/tracing" "github.com/sirupsen/logrus" + kmetrics "k8s.io/client-go/tools/metrics" "github.com/Azure/ARO-RP/pkg/database" diff --git a/cmd/aro/operator.go b/cmd/aro/operator.go index 979f15b74fd..0481c5b6127 100644 --- a/cmd/aro/operator.go +++ b/cmd/aro/operator.go @@ -8,13 +8,15 @@ import ( "flag" "fmt" - machinev1 "github.com/openshift/api/machine/v1" "github.com/sirupsen/logrus" + "k8s.io/client-go/discovery" "k8s.io/client-go/kubernetes" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/healthz" + machinev1 "github.com/openshift/api/machine/v1" + "github.com/Azure/ARO-RP/pkg/env" pkgoperator "github.com/Azure/ARO-RP/pkg/operator" "github.com/Azure/ARO-RP/pkg/operator/controllers/alertwebhook" diff --git a/cmd/aro/rp.go b/cmd/aro/rp.go index 71697373e8b..492e8ce4f29 100644 --- a/cmd/aro/rp.go +++ b/cmd/aro/rp.go @@ -12,6 +12,7 @@ import ( "github.com/Azure/go-autorest/tracing" "github.com/sirupsen/logrus" + kmetrics "k8s.io/client-go/tools/metrics" "github.com/Azure/ARO-RP/pkg/api" diff --git a/hack/gendevconfig/gendevconfig.go b/hack/gendevconfig/gendevconfig.go index 67a955c0372..261b84b6923 100644 --- a/hack/gendevconfig/gendevconfig.go +++ b/hack/gendevconfig/gendevconfig.go @@ -8,6 +8,7 @@ import ( "os" "github.com/sirupsen/logrus" + "sigs.k8s.io/yaml" "github.com/Azure/ARO-RP/pkg/deploy" diff --git a/hack/gendiscoverycache/main.go b/hack/gendiscoverycache/main.go index ea2e78cd5d6..507941cf652 100644 --- a/hack/gendiscoverycache/main.go +++ b/hack/gendiscoverycache/main.go @@ -8,12 +8,14 @@ import ( "os" "path/filepath" - configclient "github.com/openshift/client-go/config/clientset/versioned" "github.com/sirupsen/logrus" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" + configclient "github.com/openshift/client-go/config/clientset/versioned" + utillog "github.com/Azure/ARO-RP/pkg/util/log" "github.com/Azure/ARO-RP/pkg/util/version" ) diff --git a/hack/role/role.go b/hack/role/role.go index ee21d00c8e8..dc8bf2b0678 100644 --- a/hack/role/role.go +++ b/hack/role/role.go @@ -21,11 +21,13 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azidentity" sdkauthorization "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/authorization/armauthorization/v3" - cloudcredentialv1 "github.com/openshift/cloud-credential-operator/pkg/apis/cloudcredential/v1" "github.com/sirupsen/logrus" + "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/yaml" + cloudcredentialv1 "github.com/openshift/cloud-credential-operator/pkg/apis/cloudcredential/v1" + "github.com/Azure/ARO-RP/pkg/env" "github.com/Azure/ARO-RP/pkg/util/azureclient/azuresdk/armauthorization" "github.com/Azure/ARO-RP/pkg/util/version" diff --git a/pkg/cluster/acrtoken.go b/pkg/cluster/acrtoken.go index d561b587acf..438f57d868f 100644 --- a/pkg/cluster/acrtoken.go +++ b/pkg/cluster/acrtoken.go @@ -8,6 +8,7 @@ import ( "time" "github.com/Azure/go-autorest/autorest/date" + corev1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/cluster/arooperator.go b/pkg/cluster/arooperator.go index 35289901aa8..8755a3d48d9 100644 --- a/pkg/cluster/arooperator.go +++ b/pkg/cluster/arooperator.go @@ -7,8 +7,9 @@ import ( "context" "fmt" - cloudcredentialv1 "github.com/openshift/cloud-credential-operator/pkg/apis/cloudcredential/v1" "k8s.io/apimachinery/pkg/runtime/schema" + + cloudcredentialv1 "github.com/openshift/cloud-credential-operator/pkg/apis/cloudcredential/v1" ) var ( diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go index 487204e614d..2baf8e898b1 100644 --- a/pkg/cluster/cluster.go +++ b/pkg/cluster/cluster.go @@ -12,6 +12,12 @@ import ( "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/azure" "github.com/Azure/msi-dataplane/pkg/dataplane" + "github.com/sirupsen/logrus" + + extensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" + "k8s.io/client-go/dynamic" + "k8s.io/client-go/kubernetes" + configclient "github.com/openshift/client-go/config/clientset/versioned" imageregistryclient "github.com/openshift/client-go/imageregistry/clientset/versioned" machineclient "github.com/openshift/client-go/machine/clientset/versioned" @@ -19,10 +25,6 @@ import ( samplesclient "github.com/openshift/client-go/samples/clientset/versioned" securityclient "github.com/openshift/client-go/security/clientset/versioned" mcoclient "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned" - "github.com/sirupsen/logrus" - extensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" - "k8s.io/client-go/dynamic" - "k8s.io/client-go/kubernetes" "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/cluster/graph" diff --git a/pkg/cluster/clusterserviceprincipal.go b/pkg/cluster/clusterserviceprincipal.go index a29701a3fb8..21475fe55c7 100644 --- a/pkg/cluster/clusterserviceprincipal.go +++ b/pkg/cluster/clusterserviceprincipal.go @@ -10,6 +10,7 @@ import ( "time" mgmtauthorization "github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-09-01-preview/authorization" + corev1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/cluster/clusterserviceprincipal_test.go b/pkg/cluster/clusterserviceprincipal_test.go index d6ee43e9d87..407234248c1 100644 --- a/pkg/cluster/clusterserviceprincipal_test.go +++ b/pkg/cluster/clusterserviceprincipal_test.go @@ -13,10 +13,9 @@ import ( mgmtauthorization "github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-09-01-preview/authorization" mgmtfeatures "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-07-01/features" "github.com/Azure/go-autorest/autorest/to" - operatorv1 "github.com/openshift/api/operator/v1" - operatorfake "github.com/openshift/client-go/operator/clientset/versioned/fake" "github.com/sirupsen/logrus" "go.uber.org/mock/gomock" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -25,6 +24,9 @@ import ( ktesting "k8s.io/client-go/testing" "sigs.k8s.io/yaml" + operatorv1 "github.com/openshift/api/operator/v1" + operatorfake "github.com/openshift/client-go/operator/clientset/versioned/fake" + "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/util/arm" mock_authorization "github.com/Azure/ARO-RP/pkg/util/mocks/azureclient/mgmt/authorization" diff --git a/pkg/cluster/condition.go b/pkg/cluster/condition.go index 1729edcd5c7..8ee47ebf791 100644 --- a/pkg/cluster/condition.go +++ b/pkg/cluster/condition.go @@ -8,11 +8,12 @@ import ( "errors" "time" - configv1 "github.com/openshift/api/config/v1" corev1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + configv1 "github.com/openshift/api/config/v1" + "github.com/Azure/ARO-RP/pkg/util/clusteroperators" ) diff --git a/pkg/cluster/condition_test.go b/pkg/cluster/condition_test.go index 172d2f34f24..01a575e0fd3 100644 --- a/pkg/cluster/condition_test.go +++ b/pkg/cluster/condition_test.go @@ -11,14 +11,8 @@ import ( "time" "github.com/Azure/go-autorest/autorest/to" - configv1 "github.com/openshift/api/config/v1" - machinev1beta1 "github.com/openshift/api/machine/v1beta1" - operatorv1 "github.com/openshift/api/operator/v1" - configfake "github.com/openshift/client-go/config/clientset/versioned/fake" - machinefake "github.com/openshift/client-go/machine/clientset/versioned/fake" - operatorfake "github.com/openshift/client-go/operator/clientset/versioned/fake" - cloudcredentialv1 "github.com/openshift/cloud-credential-operator/pkg/apis/cloudcredential/v1" "github.com/sirupsen/logrus" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -27,6 +21,14 @@ import ( "k8s.io/client-go/kubernetes/scheme" ktesting "k8s.io/client-go/testing" + configv1 "github.com/openshift/api/config/v1" + machinev1beta1 "github.com/openshift/api/machine/v1beta1" + operatorv1 "github.com/openshift/api/operator/v1" + configfake "github.com/openshift/client-go/config/clientset/versioned/fake" + machinefake "github.com/openshift/client-go/machine/clientset/versioned/fake" + operatorfake "github.com/openshift/client-go/operator/clientset/versioned/fake" + cloudcredentialv1 "github.com/openshift/cloud-credential-operator/pkg/apis/cloudcredential/v1" + "github.com/Azure/ARO-RP/pkg/api" utilerror "github.com/Azure/ARO-RP/test/util/error" ) diff --git a/pkg/cluster/consolebranding.go b/pkg/cluster/consolebranding.go index b5112e09dcc..88e321d4fcc 100644 --- a/pkg/cluster/consolebranding.go +++ b/pkg/cluster/consolebranding.go @@ -6,9 +6,10 @@ package cluster import ( "context" - operatorv1 "github.com/openshift/api/operator/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/util/retry" + + operatorv1 "github.com/openshift/api/operator/v1" ) const consoleConfigResourceName string = "cluster" diff --git a/pkg/cluster/consolebranding_test.go b/pkg/cluster/consolebranding_test.go index 4e1f67d4039..97f88185d46 100644 --- a/pkg/cluster/consolebranding_test.go +++ b/pkg/cluster/consolebranding_test.go @@ -7,10 +7,12 @@ import ( "context" "testing" - operatorv1 "github.com/openshift/api/operator/v1" - operatorfake "github.com/openshift/client-go/operator/clientset/versioned/fake" "github.com/sirupsen/logrus" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + operatorv1 "github.com/openshift/api/operator/v1" + operatorfake "github.com/openshift/client-go/operator/clientset/versioned/fake" ) func TestUpdateConsoleBranding(t *testing.T) { diff --git a/pkg/cluster/delete.go b/pkg/cluster/delete.go index 2267aa540ff..a7cd57e290e 100644 --- a/pkg/cluster/delete.go +++ b/pkg/cluster/delete.go @@ -17,6 +17,7 @@ import ( mgmtfeatures "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-07-01/features" "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/azure" + "k8s.io/apimachinery/pkg/util/wait" "github.com/Azure/ARO-RP/pkg/api" diff --git a/pkg/cluster/delete_test.go b/pkg/cluster/delete_test.go index ef16a063511..690abfd1e9a 100644 --- a/pkg/cluster/delete_test.go +++ b/pkg/cluster/delete_test.go @@ -22,6 +22,7 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" + "k8s.io/utils/ptr" "github.com/Azure/ARO-RP/pkg/api" diff --git a/pkg/cluster/deploybaseresources.go b/pkg/cluster/deploybaseresources.go index 625524f2618..efee5d74b96 100644 --- a/pkg/cluster/deploybaseresources.go +++ b/pkg/cluster/deploybaseresources.go @@ -19,6 +19,7 @@ import ( "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/azure" "github.com/Azure/go-autorest/autorest/to" + utilrand "k8s.io/apimachinery/pkg/util/rand" "k8s.io/apimachinery/pkg/util/wait" diff --git a/pkg/cluster/deploybaseresources_test.go b/pkg/cluster/deploybaseresources_test.go index c439c2af40f..4d7bf3de17c 100644 --- a/pkg/cluster/deploybaseresources_test.go +++ b/pkg/cluster/deploybaseresources_test.go @@ -25,6 +25,7 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" + utilrand "k8s.io/apimachinery/pkg/util/rand" "k8s.io/utils/ptr" diff --git a/pkg/cluster/disableupdates.go b/pkg/cluster/disableupdates.go index 2cc84b8a037..aa4e26f3378 100644 --- a/pkg/cluster/disableupdates.go +++ b/pkg/cluster/disableupdates.go @@ -8,9 +8,11 @@ import ( "strings" "github.com/coreos/go-semver/semver" - configv1 "github.com/openshift/api/config/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/util/retry" + + configv1 "github.com/openshift/api/config/v1" ) func (m *manager) disableUpdates(ctx context.Context) error { diff --git a/pkg/cluster/disableupdates_test.go b/pkg/cluster/disableupdates_test.go index da964c11156..6c9164438aa 100644 --- a/pkg/cluster/disableupdates_test.go +++ b/pkg/cluster/disableupdates_test.go @@ -7,11 +7,13 @@ import ( "context" "testing" - configv1 "github.com/openshift/api/config/v1" - configfake "github.com/openshift/client-go/config/clientset/versioned/fake" "go.uber.org/mock/gomock" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + configv1 "github.com/openshift/api/config/v1" + configfake "github.com/openshift/client-go/config/clientset/versioned/fake" + "github.com/Azure/ARO-RP/pkg/api" mock_env "github.com/Azure/ARO-RP/pkg/util/mocks/env" ) diff --git a/pkg/cluster/ensureendpoints_test.go b/pkg/cluster/ensureendpoints_test.go index 181f44681f6..1d7e8704469 100644 --- a/pkg/cluster/ensureendpoints_test.go +++ b/pkg/cluster/ensureendpoints_test.go @@ -11,6 +11,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v2" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" + "k8s.io/utils/ptr" "github.com/Azure/ARO-RP/pkg/api" diff --git a/pkg/cluster/fixmcscert_test.go b/pkg/cluster/fixmcscert_test.go index f13904f36b0..b813addc507 100644 --- a/pkg/cluster/fixmcscert_test.go +++ b/pkg/cluster/fixmcscert_test.go @@ -13,6 +13,7 @@ import ( "testing" "go.uber.org/mock/gomock" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kruntime "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/cluster/fixmcsuserdata.go b/pkg/cluster/fixmcsuserdata.go index 6ccab01e394..3b23dd49172 100644 --- a/pkg/cluster/fixmcsuserdata.go +++ b/pkg/cluster/fixmcsuserdata.go @@ -11,12 +11,14 @@ import ( "net/url" "strings" - machinev1beta1 "github.com/openshift/api/machine/v1beta1" "github.com/ugorji/go/codec" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/util/retry" + machinev1beta1 "github.com/openshift/api/machine/v1beta1" + "github.com/Azure/ARO-RP/pkg/api" _ "github.com/Azure/ARO-RP/pkg/util/scheme" ) diff --git a/pkg/cluster/fixmcsuserdata_test.go b/pkg/cluster/fixmcsuserdata_test.go index 23f00e0eaa1..968cd1a8372 100644 --- a/pkg/cluster/fixmcsuserdata_test.go +++ b/pkg/cluster/fixmcsuserdata_test.go @@ -10,8 +10,6 @@ import ( "reflect" "testing" - machinev1beta1 "github.com/openshift/api/machine/v1beta1" - machinefake "github.com/openshift/client-go/machine/clientset/versioned/fake" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kruntime "k8s.io/apimachinery/pkg/runtime" @@ -20,6 +18,9 @@ import ( kjson "k8s.io/apimachinery/pkg/runtime/serializer/json" "k8s.io/client-go/kubernetes/fake" + machinev1beta1 "github.com/openshift/api/machine/v1beta1" + machinefake "github.com/openshift/client-go/machine/clientset/versioned/fake" + "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/util/cmp" testlog "github.com/Azure/ARO-RP/test/util/log" diff --git a/pkg/cluster/gatherlogs.go b/pkg/cluster/gatherlogs.go index b447df2e853..ce15ff2ed7f 100644 --- a/pkg/cluster/gatherlogs.go +++ b/pkg/cluster/gatherlogs.go @@ -12,11 +12,12 @@ import ( "io" "strings" - configv1 "github.com/openshift/api/config/v1" - operatorv1 "github.com/openshift/api/operator/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + configv1 "github.com/openshift/api/config/v1" + operatorv1 "github.com/openshift/api/operator/v1" + "github.com/Azure/ARO-RP/pkg/cluster/failurediagnostics" "github.com/Azure/ARO-RP/pkg/util/steps" ) diff --git a/pkg/cluster/gatherlogs_test.go b/pkg/cluster/gatherlogs_test.go index 510c849d594..988164e4c15 100644 --- a/pkg/cluster/gatherlogs_test.go +++ b/pkg/cluster/gatherlogs_test.go @@ -11,21 +11,23 @@ import ( "github.com/onsi/gomega" "github.com/onsi/gomega/types" - configv1 "github.com/openshift/api/config/v1" - operatorv1 "github.com/openshift/api/operator/v1" - configfake "github.com/openshift/client-go/config/clientset/versioned/fake" - operatorfake "github.com/openshift/client-go/operator/clientset/versioned/fake" - hivev1 "github.com/openshift/hive/apis/hive/v1" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" + corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kruntime "k8s.io/apimachinery/pkg/runtime" kubernetesfake "k8s.io/client-go/kubernetes/fake" + configv1 "github.com/openshift/api/config/v1" + operatorv1 "github.com/openshift/api/operator/v1" + configfake "github.com/openshift/client-go/config/clientset/versioned/fake" + operatorfake "github.com/openshift/client-go/operator/clientset/versioned/fake" + hivev1 "github.com/openshift/hive/apis/hive/v1" + "github.com/Azure/ARO-RP/pkg/api" mock_hive "github.com/Azure/ARO-RP/pkg/util/mocks/hive" utilerror "github.com/Azure/ARO-RP/test/util/error" diff --git a/pkg/cluster/hive_test.go b/pkg/cluster/hive_test.go index 0435131dd9e..b7921a2cd6b 100644 --- a/pkg/cluster/hive_test.go +++ b/pkg/cluster/hive_test.go @@ -12,6 +12,7 @@ import ( "github.com/sirupsen/logrus" "go.uber.org/mock/gomock" + corev1 "k8s.io/api/core/v1" "github.com/Azure/ARO-RP/pkg/api" diff --git a/pkg/cluster/install.go b/pkg/cluster/install.go index 5e28e9dd561..12fb042c802 100644 --- a/pkg/cluster/install.go +++ b/pkg/cluster/install.go @@ -9,6 +9,14 @@ import ( "time" "github.com/coreos/go-semver/semver" + + extensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" + kruntime "k8s.io/apimachinery/pkg/runtime" + "k8s.io/client-go/dynamic" + "k8s.io/client-go/kubernetes" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/client/apiutil" + configclient "github.com/openshift/client-go/config/clientset/versioned" imageregistryclient "github.com/openshift/client-go/imageregistry/clientset/versioned" machineclient "github.com/openshift/client-go/machine/clientset/versioned" @@ -16,12 +24,6 @@ import ( samplesclient "github.com/openshift/client-go/samples/clientset/versioned" securityclient "github.com/openshift/client-go/security/clientset/versioned" mcoclient "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned" - extensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" - kruntime "k8s.io/apimachinery/pkg/runtime" - "k8s.io/client-go/dynamic" - "k8s.io/client-go/kubernetes" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/client/apiutil" "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/containerinstall" diff --git a/pkg/cluster/install_test.go b/pkg/cluster/install_test.go index 8e523127098..00db6b11751 100644 --- a/pkg/cluster/install_test.go +++ b/pkg/cluster/install_test.go @@ -12,16 +12,18 @@ import ( "github.com/onsi/gomega" "github.com/onsi/gomega/types" - configv1 "github.com/openshift/api/config/v1" - operatorv1 "github.com/openshift/api/operator/v1" - configfake "github.com/openshift/client-go/config/clientset/versioned/fake" - operatorfake "github.com/openshift/client-go/operator/clientset/versioned/fake" "github.com/sirupsen/logrus" "go.uber.org/mock/gomock" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" + configv1 "github.com/openshift/api/config/v1" + operatorv1 "github.com/openshift/api/operator/v1" + configfake "github.com/openshift/client-go/config/clientset/versioned/fake" + operatorfake "github.com/openshift/client-go/operator/clientset/versioned/fake" + "github.com/Azure/ARO-RP/pkg/api" mock_hive "github.com/Azure/ARO-RP/pkg/util/mocks/hive" "github.com/Azure/ARO-RP/pkg/util/steps" diff --git a/pkg/cluster/ipaddresses.go b/pkg/cluster/ipaddresses.go index d15c9e51cd4..9f9582a1fb4 100644 --- a/pkg/cluster/ipaddresses.go +++ b/pkg/cluster/ipaddresses.go @@ -16,6 +16,7 @@ import ( mgmtnetwork "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-08-01/network" "github.com/Azure/go-autorest/autorest/to" "github.com/apparentlymart/go-cidr/cidr" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/Azure/ARO-RP/pkg/api" diff --git a/pkg/cluster/ipaddresses_test.go b/pkg/cluster/ipaddresses_test.go index 934d3bd2d86..dac588be054 100644 --- a/pkg/cluster/ipaddresses_test.go +++ b/pkg/cluster/ipaddresses_test.go @@ -13,6 +13,7 @@ import ( "github.com/Azure/go-autorest/autorest/to" "github.com/sirupsen/logrus" "go.uber.org/mock/gomock" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" diff --git a/pkg/cluster/loadbalancerprofile_test.go b/pkg/cluster/loadbalancerprofile_test.go index 5784193b51e..cd14518a80f 100644 --- a/pkg/cluster/loadbalancerprofile_test.go +++ b/pkg/cluster/loadbalancerprofile_test.go @@ -14,6 +14,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" + "k8s.io/utils/ptr" "github.com/Azure/ARO-RP/pkg/api" diff --git a/pkg/cluster/networkprofile_test.go b/pkg/cluster/networkprofile_test.go index 1bfc14ce9a5..73622b82ba8 100644 --- a/pkg/cluster/networkprofile_test.go +++ b/pkg/cluster/networkprofile_test.go @@ -8,11 +8,13 @@ import ( "strings" "testing" - mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" - mcofake "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned/fake" "github.com/stretchr/testify/assert" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" + mcofake "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned/fake" + "github.com/Azure/ARO-RP/pkg/api" testdatabase "github.com/Azure/ARO-RP/test/database" ) diff --git a/pkg/cluster/samples.go b/pkg/cluster/samples.go index f137aaa29b8..4453ab3755d 100644 --- a/pkg/cluster/samples.go +++ b/pkg/cluster/samples.go @@ -6,12 +6,13 @@ package cluster import ( "context" - configv1 "github.com/openshift/api/config/v1" - operatorv1 "github.com/openshift/api/operator/v1" - samplesv1 "github.com/openshift/api/samples/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/util/retry" + + configv1 "github.com/openshift/api/config/v1" + operatorv1 "github.com/openshift/api/operator/v1" + samplesv1 "github.com/openshift/api/samples/v1" ) // disableSamples disables the samples if there's no appropriate pull secret diff --git a/pkg/cluster/samples_test.go b/pkg/cluster/samples_test.go index 7d351a52c88..053512fd367 100644 --- a/pkg/cluster/samples_test.go +++ b/pkg/cluster/samples_test.go @@ -7,13 +7,15 @@ import ( "context" "testing" - operatorv1 "github.com/openshift/api/operator/v1" - samplesv1 "github.com/openshift/api/samples/v1" - samplesfake "github.com/openshift/client-go/samples/clientset/versioned/fake" "go.uber.org/mock/gomock" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kruntime "k8s.io/apimachinery/pkg/runtime" + operatorv1 "github.com/openshift/api/operator/v1" + samplesv1 "github.com/openshift/api/samples/v1" + samplesfake "github.com/openshift/client-go/samples/clientset/versioned/fake" + "github.com/Azure/ARO-RP/pkg/api" mock_env "github.com/Azure/ARO-RP/pkg/util/mocks/env" utilerror "github.com/Azure/ARO-RP/test/util/error" diff --git a/pkg/cluster/storageclass.go b/pkg/cluster/storageclass.go index 733f38732ed..23dd38f3f20 100644 --- a/pkg/cluster/storageclass.go +++ b/pkg/cluster/storageclass.go @@ -7,6 +7,7 @@ import ( "context" "github.com/Azure/go-autorest/autorest/to" + corev1 "k8s.io/api/core/v1" storagev1 "k8s.io/api/storage/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/cluster/storageclass_test.go b/pkg/cluster/storageclass_test.go index 4f4f889a29a..edc9bd5282c 100644 --- a/pkg/cluster/storageclass_test.go +++ b/pkg/cluster/storageclass_test.go @@ -8,9 +8,8 @@ import ( "errors" "testing" - operatorv1 "github.com/openshift/api/operator/v1" - operatorfake "github.com/openshift/client-go/operator/clientset/versioned/fake" "github.com/stretchr/testify/assert" + storagev1 "k8s.io/api/storage/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -18,6 +17,9 @@ import ( "k8s.io/client-go/kubernetes/fake" ktesting "k8s.io/client-go/testing" + operatorv1 "github.com/openshift/api/operator/v1" + operatorfake "github.com/openshift/client-go/operator/clientset/versioned/fake" + "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/util/version" utilerror "github.com/Azure/ARO-RP/test/util/error" diff --git a/pkg/cluster/tls.go b/pkg/cluster/tls.go index 168d1517d6a..ed12c737447 100644 --- a/pkg/cluster/tls.go +++ b/pkg/cluster/tls.go @@ -6,12 +6,13 @@ package cluster import ( "context" - configv1 "github.com/openshift/api/config/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/util/retry" + configv1 "github.com/openshift/api/config/v1" + "github.com/Azure/ARO-RP/pkg/env" "github.com/Azure/ARO-RP/pkg/util/dns" "github.com/Azure/ARO-RP/pkg/util/keyvault" diff --git a/pkg/cluster/workloadidentityresources.go b/pkg/cluster/workloadidentityresources.go index 1d115a14866..19ced983c32 100644 --- a/pkg/cluster/workloadidentityresources.go +++ b/pkg/cluster/workloadidentityresources.go @@ -9,11 +9,13 @@ import ( "strings" "github.com/Azure/go-autorest/autorest/azure" - configv1 "github.com/openshift/api/config/v1" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kruntime "k8s.io/apimachinery/pkg/runtime" + configv1 "github.com/openshift/api/config/v1" + "github.com/Azure/ARO-RP/pkg/api" pkgoperator "github.com/Azure/ARO-RP/pkg/operator" "github.com/Azure/ARO-RP/pkg/util/platformworkloadidentity" diff --git a/pkg/cluster/workloadidentityresources_test.go b/pkg/cluster/workloadidentityresources_test.go index 3fc9d6f730f..391ad3b00f6 100644 --- a/pkg/cluster/workloadidentityresources_test.go +++ b/pkg/cluster/workloadidentityresources_test.go @@ -8,10 +8,10 @@ import ( "fmt" "testing" - configv1 "github.com/openshift/api/config/v1" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kruntime "k8s.io/apimachinery/pkg/runtime" @@ -19,6 +19,8 @@ import ( "k8s.io/utils/ptr" ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake" + configv1 "github.com/openshift/api/config/v1" + "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/util/clienthelper" mock_platformworkloadidentity "github.com/Azure/ARO-RP/pkg/util/mocks/platformworkloadidentity" diff --git a/pkg/containerinstall/install_test.go b/pkg/containerinstall/install_test.go index 48da986b22d..bff78d99c27 100644 --- a/pkg/containerinstall/install_test.go +++ b/pkg/containerinstall/install_test.go @@ -9,15 +9,14 @@ import ( "testing" "time" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/bindings/containers" "github.com/containers/podman/v5/pkg/bindings/images" "github.com/containers/podman/v5/pkg/bindings/secrets" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/specgen" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "github.com/onsi/gomega/types" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" diff --git a/pkg/deploy/config.go b/pkg/deploy/config.go index 90bc8ffd726..726737afc08 100644 --- a/pkg/deploy/config.go +++ b/pkg/deploy/config.go @@ -13,6 +13,7 @@ import ( "github.com/Azure/go-autorest/autorest/to" "golang.org/x/crypto/ssh" + "sigs.k8s.io/yaml" ) diff --git a/pkg/deploy/predeploy.go b/pkg/deploy/predeploy.go index e34874d5101..b164d183d62 100644 --- a/pkg/deploy/predeploy.go +++ b/pkg/deploy/predeploy.go @@ -21,6 +21,7 @@ import ( mgmtfeatures "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-07-01/features" "github.com/Azure/go-autorest/autorest/azure" "github.com/Azure/go-autorest/autorest/to" + "k8s.io/apimachinery/pkg/util/wait" "github.com/Azure/ARO-RP/pkg/api" diff --git a/pkg/deploy/upgrade_gateway.go b/pkg/deploy/upgrade_gateway.go index bd7c35f8820..c9cb28c4c35 100644 --- a/pkg/deploy/upgrade_gateway.go +++ b/pkg/deploy/upgrade_gateway.go @@ -9,6 +9,7 @@ import ( mgmtcompute "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute" "github.com/Azure/go-autorest/autorest/to" + "k8s.io/apimachinery/pkg/util/wait" ) diff --git a/pkg/deploy/upgrade_rp.go b/pkg/deploy/upgrade_rp.go index d03c474808d..cf9a845473b 100644 --- a/pkg/deploy/upgrade_rp.go +++ b/pkg/deploy/upgrade_rp.go @@ -9,6 +9,7 @@ import ( mgmtcompute "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute" "github.com/Azure/go-autorest/autorest/to" + "k8s.io/apimachinery/pkg/util/wait" ) diff --git a/pkg/frontend/admin_hive_clusterdeployment_get_test.go b/pkg/frontend/admin_hive_clusterdeployment_get_test.go index 31d03be813f..f5ef9fcb734 100644 --- a/pkg/frontend/admin_hive_clusterdeployment_get_test.go +++ b/pkg/frontend/admin_hive_clusterdeployment_get_test.go @@ -10,9 +10,10 @@ import ( "strings" "testing" - hivev1 "github.com/openshift/hive/apis/hive/v1" "go.uber.org/mock/gomock" + hivev1 "github.com/openshift/hive/apis/hive/v1" + "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/metrics/noop" mock_env "github.com/Azure/ARO-RP/pkg/util/mocks/env" diff --git a/pkg/frontend/admin_hive_syncset_get.go b/pkg/frontend/admin_hive_syncset_get.go index f4eae7e385a..8569ea427d6 100644 --- a/pkg/frontend/admin_hive_syncset_get.go +++ b/pkg/frontend/admin_hive_syncset_get.go @@ -10,10 +10,11 @@ import ( "strconv" "github.com/go-chi/chi/v5" - hivev1 "github.com/openshift/hive/apis/hive/v1" "github.com/sirupsen/logrus" "github.com/ugorji/go/codec" + hivev1 "github.com/openshift/hive/apis/hive/v1" + "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/frontend/middleware" ) diff --git a/pkg/frontend/admin_hive_syncset_get_test.go b/pkg/frontend/admin_hive_syncset_get_test.go index c45736f9efb..ab93d2e731d 100644 --- a/pkg/frontend/admin_hive_syncset_get_test.go +++ b/pkg/frontend/admin_hive_syncset_get_test.go @@ -9,10 +9,12 @@ import ( "strings" "testing" - hivev1 "github.com/openshift/hive/apis/hive/v1" "go.uber.org/mock/gomock" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + hivev1 "github.com/openshift/hive/apis/hive/v1" + "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/metrics/noop" mock_env "github.com/Azure/ARO-RP/pkg/util/mocks/env" diff --git a/pkg/frontend/admin_hive_syncset_list.go b/pkg/frontend/admin_hive_syncset_list.go index 6f15af81f96..772538b8755 100644 --- a/pkg/frontend/admin_hive_syncset_list.go +++ b/pkg/frontend/admin_hive_syncset_list.go @@ -9,10 +9,11 @@ import ( "reflect" "strconv" - hivev1 "github.com/openshift/hive/apis/hive/v1" "github.com/sirupsen/logrus" "github.com/ugorji/go/codec" + hivev1 "github.com/openshift/hive/apis/hive/v1" + "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/frontend/middleware" ) diff --git a/pkg/frontend/admin_hive_syncset_list_test.go b/pkg/frontend/admin_hive_syncset_list_test.go index ea2e3e688e0..e6813d0b226 100644 --- a/pkg/frontend/admin_hive_syncset_list_test.go +++ b/pkg/frontend/admin_hive_syncset_list_test.go @@ -9,10 +9,12 @@ import ( "strings" "testing" - hivev1 "github.com/openshift/hive/apis/hive/v1" "go.uber.org/mock/gomock" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + hivev1 "github.com/openshift/hive/apis/hive/v1" + "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/metrics/noop" mock_env "github.com/Azure/ARO-RP/pkg/util/mocks/env" diff --git a/pkg/frontend/admin_hive_syncset_resources_test.go b/pkg/frontend/admin_hive_syncset_resources_test.go index ab4f81f6d14..e5c5ec354ba 100644 --- a/pkg/frontend/admin_hive_syncset_resources_test.go +++ b/pkg/frontend/admin_hive_syncset_resources_test.go @@ -11,10 +11,12 @@ import ( "testing" "time" - hivev1alpha1 "github.com/openshift/hive/apis/hiveinternal/v1alpha1" "go.uber.org/mock/gomock" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + hivev1alpha1 "github.com/openshift/hive/apis/hiveinternal/v1alpha1" + "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/metrics/noop" mock_env "github.com/Azure/ARO-RP/pkg/util/mocks/env" diff --git a/pkg/frontend/admin_openshiftcluster_approvecsr.go b/pkg/frontend/admin_openshiftcluster_approvecsr.go index 5f45a915ce7..4612fce65ed 100644 --- a/pkg/frontend/admin_openshiftcluster_approvecsr.go +++ b/pkg/frontend/admin_openshiftcluster_approvecsr.go @@ -11,6 +11,7 @@ import ( "github.com/go-chi/chi/v5" "github.com/sirupsen/logrus" + "k8s.io/apimachinery/pkg/runtime/schema" "github.com/Azure/ARO-RP/pkg/api" diff --git a/pkg/frontend/admin_openshiftcluster_cordonnode.go b/pkg/frontend/admin_openshiftcluster_cordonnode.go index c2449fd2760..7300b379775 100644 --- a/pkg/frontend/admin_openshiftcluster_cordonnode.go +++ b/pkg/frontend/admin_openshiftcluster_cordonnode.go @@ -11,6 +11,7 @@ import ( "github.com/go-chi/chi/v5" "github.com/sirupsen/logrus" + "k8s.io/apimachinery/pkg/runtime/schema" "github.com/Azure/ARO-RP/pkg/api" diff --git a/pkg/frontend/admin_openshiftcluster_etcdcertificaterenew.go b/pkg/frontend/admin_openshiftcluster_etcdcertificaterenew.go index c224926489e..39a37b06d3b 100644 --- a/pkg/frontend/admin_openshiftcluster_etcdcertificaterenew.go +++ b/pkg/frontend/admin_openshiftcluster_etcdcertificaterenew.go @@ -14,10 +14,9 @@ import ( "time" "github.com/Azure/go-autorest/autorest/azure" - configv1 "github.com/openshift/api/config/v1" - operatorv1 "github.com/openshift/api/operator/v1" "github.com/sirupsen/logrus" "github.com/ugorji/go/codec" + corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -26,6 +25,9 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/util/retry" + configv1 "github.com/openshift/api/config/v1" + operatorv1 "github.com/openshift/api/operator/v1" + "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/database/cosmosdb" "github.com/Azure/ARO-RP/pkg/frontend/adminactions" diff --git a/pkg/frontend/admin_openshiftcluster_etcdcertificaterenew_test.go b/pkg/frontend/admin_openshiftcluster_etcdcertificaterenew_test.go index f73f4e145b5..9a969b10c26 100644 --- a/pkg/frontend/admin_openshiftcluster_etcdcertificaterenew_test.go +++ b/pkg/frontend/admin_openshiftcluster_etcdcertificaterenew_test.go @@ -14,14 +14,16 @@ import ( "testing" "time" - configv1 "github.com/openshift/api/config/v1" - operatorv1 "github.com/openshift/api/operator/v1" "github.com/sirupsen/logrus" "github.com/ugorji/go/codec" "go.uber.org/mock/gomock" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + configv1 "github.com/openshift/api/config/v1" + operatorv1 "github.com/openshift/api/operator/v1" + "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/env" "github.com/Azure/ARO-RP/pkg/frontend/adminactions" diff --git a/pkg/frontend/admin_openshiftcluster_etcdrecovery.go b/pkg/frontend/admin_openshiftcluster_etcdrecovery.go index 30ed4cb5f71..e7aba4dab7a 100644 --- a/pkg/frontend/admin_openshiftcluster_etcdrecovery.go +++ b/pkg/frontend/admin_openshiftcluster_etcdrecovery.go @@ -10,9 +10,10 @@ import ( "strings" "github.com/go-chi/chi/v5" - operatorclient "github.com/openshift/client-go/operator/clientset/versioned" "github.com/sirupsen/logrus" + operatorclient "github.com/openshift/client-go/operator/clientset/versioned" + "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/database/cosmosdb" "github.com/Azure/ARO-RP/pkg/frontend/middleware" diff --git a/pkg/frontend/admin_openshiftcluster_etcdrecovery_test.go b/pkg/frontend/admin_openshiftcluster_etcdrecovery_test.go index 8f8ecb8f5ed..43aaa02717a 100644 --- a/pkg/frontend/admin_openshiftcluster_etcdrecovery_test.go +++ b/pkg/frontend/admin_openshiftcluster_etcdrecovery_test.go @@ -11,13 +11,15 @@ import ( "strings" "testing" - operatorv1client "github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1" - operatorv1fake "github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1/fake" "github.com/sirupsen/logrus" + corev1 "k8s.io/api/core/v1" kschema "k8s.io/apimachinery/pkg/runtime/schema" ktesting "k8s.io/client-go/testing" + operatorv1client "github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1" + operatorv1fake "github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1/fake" + "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/env" "github.com/Azure/ARO-RP/pkg/frontend/adminactions" diff --git a/pkg/frontend/admin_openshiftcluster_kubernetesobjects.go b/pkg/frontend/admin_openshiftcluster_kubernetesobjects.go index 57c8501a952..d661f64708f 100644 --- a/pkg/frontend/admin_openshiftcluster_kubernetesobjects.go +++ b/pkg/frontend/admin_openshiftcluster_kubernetesobjects.go @@ -13,6 +13,7 @@ import ( "github.com/go-chi/chi/v5" "github.com/sirupsen/logrus" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "github.com/Azure/ARO-RP/pkg/api" diff --git a/pkg/frontend/admin_openshiftcluster_kubernetesobjects_test.go b/pkg/frontend/admin_openshiftcluster_kubernetesobjects_test.go index ed1c4a507d0..ced1045c7cf 100644 --- a/pkg/frontend/admin_openshiftcluster_kubernetesobjects_test.go +++ b/pkg/frontend/admin_openshiftcluster_kubernetesobjects_test.go @@ -12,6 +12,7 @@ import ( "github.com/sirupsen/logrus" "go.uber.org/mock/gomock" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/frontend/adminactions/kubeactions.go b/pkg/frontend/adminactions/kubeactions.go index 920e495fadc..c9737510f7e 100644 --- a/pkg/frontend/adminactions/kubeactions.go +++ b/pkg/frontend/adminactions/kubeactions.go @@ -9,6 +9,7 @@ import ( "github.com/Azure/go-autorest/autorest/to" "github.com/sirupsen/logrus" + corev1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" diff --git a/pkg/frontend/adminactions/resources_list_test.go b/pkg/frontend/adminactions/resources_list_test.go index 542eeeca5cf..0d7afd14bca 100644 --- a/pkg/frontend/adminactions/resources_list_test.go +++ b/pkg/frontend/adminactions/resources_list_test.go @@ -15,6 +15,7 @@ import ( "github.com/Azure/go-autorest/autorest/to" "github.com/sirupsen/logrus" "go.uber.org/mock/gomock" + "k8s.io/utils/ptr" "github.com/Azure/ARO-RP/pkg/api" diff --git a/pkg/frontend/adminreplies.go b/pkg/frontend/adminreplies.go index 375d94eb737..454bb4b1353 100644 --- a/pkg/frontend/adminreplies.go +++ b/pkg/frontend/adminreplies.go @@ -9,6 +9,7 @@ import ( "net/http" "github.com/sirupsen/logrus" + kerrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/frontend/fixetcd.go b/pkg/frontend/fixetcd.go index 9c67bccc99b..8c401063645 100644 --- a/pkg/frontend/fixetcd.go +++ b/pkg/frontend/fixetcd.go @@ -15,11 +15,9 @@ import ( "time" "github.com/Azure/go-autorest/autorest/to" - operatorv1 "github.com/openshift/api/operator/v1" - securityv1 "github.com/openshift/api/security/v1" - operatorv1client "github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1" "github.com/sirupsen/logrus" "github.com/ugorji/go/codec" + corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -28,6 +26,10 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" + operatorv1 "github.com/openshift/api/operator/v1" + securityv1 "github.com/openshift/api/security/v1" + operatorv1client "github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1" + "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/env" "github.com/Azure/ARO-RP/pkg/frontend/adminactions" diff --git a/pkg/frontend/fixetcd_test.go b/pkg/frontend/fixetcd_test.go index 2e8bf0f305f..259f3550090 100644 --- a/pkg/frontend/fixetcd_test.go +++ b/pkg/frontend/fixetcd_test.go @@ -11,15 +11,17 @@ import ( "testing" "github.com/Azure/go-autorest/autorest/to" - operatorv1fake "github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1/fake" "github.com/ugorji/go/codec" "go.uber.org/mock/gomock" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/watch" ktesting "k8s.io/client-go/testing" + operatorv1fake "github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1/fake" + "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/metrics/noop" mock_adminactions "github.com/Azure/ARO-RP/pkg/util/mocks/adminactions" diff --git a/pkg/frontend/frontend.go b/pkg/frontend/frontend.go index d6bb4589d4f..6029006ab2a 100644 --- a/pkg/frontend/frontend.go +++ b/pkg/frontend/frontend.go @@ -19,6 +19,7 @@ import ( "github.com/go-chi/chi/v5" chiMiddlewares "github.com/go-chi/chi/v5/middleware" "github.com/sirupsen/logrus" + kerrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/frontend/frontend_test.go b/pkg/frontend/frontend_test.go index abeb6f7845b..dec34bda3b3 100644 --- a/pkg/frontend/frontend_test.go +++ b/pkg/frontend/frontend_test.go @@ -19,6 +19,7 @@ import ( "github.com/onsi/gomega/types" "github.com/sirupsen/logrus" "go.uber.org/mock/gomock" + kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/frontend/validate.go b/pkg/frontend/validate.go index d788caddacf..afadde8172c 100644 --- a/pkg/frontend/validate.go +++ b/pkg/frontend/validate.go @@ -11,6 +11,7 @@ import ( "github.com/Azure/go-autorest/autorest/azure" "github.com/coreos/go-semver/semver" + "k8s.io/apimachinery/pkg/runtime/schema" "github.com/Azure/ARO-RP/pkg/api" diff --git a/pkg/hive/failure/handler.go b/pkg/hive/failure/handler.go index 0488a7e93dd..541b9eab169 100644 --- a/pkg/hive/failure/handler.go +++ b/pkg/hive/failure/handler.go @@ -10,9 +10,11 @@ import ( "regexp" mgmtfeatures "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-07-01/features" - hivev1 "github.com/openshift/hive/apis/hive/v1" + corev1 "k8s.io/api/core/v1" + hivev1 "github.com/openshift/hive/apis/hive/v1" + "github.com/Azure/ARO-RP/pkg/api" ) diff --git a/pkg/hive/install.go b/pkg/hive/install.go index 754847b0c0d..f5f165ab186 100644 --- a/pkg/hive/install.go +++ b/pkg/hive/install.go @@ -14,12 +14,14 @@ import ( "strings" "github.com/Azure/go-autorest/autorest/to" - hivev1 "github.com/openshift/hive/apis/hive/v1" - hivev1azure "github.com/openshift/hive/apis/hive/v1/azure" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kruntime "k8s.io/apimachinery/pkg/runtime" + hivev1 "github.com/openshift/hive/apis/hive/v1" + hivev1azure "github.com/openshift/hive/apis/hive/v1/azure" + "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/util/dynamichelper" utillog "github.com/Azure/ARO-RP/pkg/util/log" diff --git a/pkg/hive/manager.go b/pkg/hive/manager.go index 9922d057e09..f60a20e3a60 100644 --- a/pkg/hive/manager.go +++ b/pkg/hive/manager.go @@ -11,9 +11,8 @@ import ( "sort" "strings" - hivev1 "github.com/openshift/hive/apis/hive/v1" - hivev1alpha1 "github.com/openshift/hive/apis/hiveinternal/v1alpha1" "github.com/sirupsen/logrus" + corev1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -24,6 +23,9 @@ import ( "k8s.io/client-go/util/retry" "sigs.k8s.io/controller-runtime/pkg/client" + hivev1 "github.com/openshift/hive/apis/hive/v1" + hivev1alpha1 "github.com/openshift/hive/apis/hiveinternal/v1alpha1" + "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/env" "github.com/Azure/ARO-RP/pkg/hive/failure" diff --git a/pkg/hive/manager_test.go b/pkg/hive/manager_test.go index d67bffd596a..b2e21e7b4c4 100644 --- a/pkg/hive/manager_test.go +++ b/pkg/hive/manager_test.go @@ -9,16 +9,18 @@ import ( "reflect" "testing" - hivev1 "github.com/openshift/hive/apis/hive/v1" - hivev1alpha1 "github.com/openshift/hive/apis/hiveinternal/v1alpha1" "github.com/sirupsen/logrus" "go.uber.org/mock/gomock" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kruntime "k8s.io/apimachinery/pkg/runtime" kubernetesfake "k8s.io/client-go/kubernetes/fake" "sigs.k8s.io/controller-runtime/pkg/client/fake" + hivev1 "github.com/openshift/hive/apis/hive/v1" + hivev1alpha1 "github.com/openshift/hive/apis/hiveinternal/v1alpha1" + "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/hive/failure" "github.com/Azure/ARO-RP/pkg/util/cmp" diff --git a/pkg/hive/resources.go b/pkg/hive/resources.go index 71351b1bf1a..16c9842e1db 100644 --- a/pkg/hive/resources.go +++ b/pkg/hive/resources.go @@ -8,13 +8,14 @@ import ( "os" "strings" - hivev1 "github.com/openshift/hive/apis/hive/v1" - hivev1azure "github.com/openshift/hive/apis/hive/v1/azure" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kruntime "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/yaml" + hivev1 "github.com/openshift/hive/apis/hive/v1" + hivev1azure "github.com/openshift/hive/apis/hive/v1/azure" + "github.com/Azure/ARO-RP/pkg/api" utillog "github.com/Azure/ARO-RP/pkg/util/log" "github.com/Azure/ARO-RP/pkg/util/pullsecret" diff --git a/pkg/hive/resources_test.go b/pkg/hive/resources_test.go index ae1858873b6..aa921711f5e 100644 --- a/pkg/hive/resources_test.go +++ b/pkg/hive/resources_test.go @@ -8,6 +8,7 @@ import ( "github.com/go-test/deep" "github.com/stretchr/testify/assert" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kruntime "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/mimo/actuator/actuator_test.go b/pkg/mimo/actuator/actuator_test.go index dbfc86a9dc6..d4ecb849b21 100644 --- a/pkg/mimo/actuator/actuator_test.go +++ b/pkg/mimo/actuator/actuator_test.go @@ -13,7 +13,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/sirupsen/logrus" "go.uber.org/mock/gomock" diff --git a/pkg/mimo/actuator/service.go b/pkg/mimo/actuator/service.go index 898aa8382f0..e1ce36fd877 100644 --- a/pkg/mimo/actuator/service.go +++ b/pkg/mimo/actuator/service.go @@ -16,6 +16,7 @@ import ( "github.com/sirupsen/logrus" "golang.org/x/exp/maps" + "sigs.k8s.io/controller-runtime/pkg/healthz" "github.com/Azure/ARO-RP/pkg/api" diff --git a/pkg/mimo/actuator/service_test.go b/pkg/mimo/actuator/service_test.go index 8566f5a18e0..c92acfd9b6d 100644 --- a/pkg/mimo/actuator/service_test.go +++ b/pkg/mimo/actuator/service_test.go @@ -11,7 +11,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/sirupsen/logrus" "go.uber.org/mock/gomock" diff --git a/pkg/mimo/actuator/task.go b/pkg/mimo/actuator/task.go index 4322be76fd0..493282d7c0b 100644 --- a/pkg/mimo/actuator/task.go +++ b/pkg/mimo/actuator/task.go @@ -9,6 +9,7 @@ import ( "github.com/Azure/go-autorest/autorest" "github.com/sirupsen/logrus" + "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/apiutil" diff --git a/pkg/mimo/steps/cluster/acrtoken_checker_test.go b/pkg/mimo/steps/cluster/acrtoken_checker_test.go index 46db9585580..4ff0bba09f0 100644 --- a/pkg/mimo/steps/cluster/acrtoken_checker_test.go +++ b/pkg/mimo/steps/cluster/acrtoken_checker_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - . "github.com/onsi/gomega" - "github.com/Azure/go-autorest/autorest/date" + . "github.com/onsi/gomega" "go.uber.org/mock/gomock" + "sigs.k8s.io/controller-runtime/pkg/client/fake" "github.com/Azure/ARO-RP/pkg/api" diff --git a/pkg/mimo/steps/cluster/apiserver_is_up.go b/pkg/mimo/steps/cluster/apiserver_is_up.go index eecefa7e434..eb788860cb2 100644 --- a/pkg/mimo/steps/cluster/apiserver_is_up.go +++ b/pkg/mimo/steps/cluster/apiserver_is_up.go @@ -7,10 +7,11 @@ import ( "context" "errors" - configv1 "github.com/openshift/api/config/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" + configv1 "github.com/openshift/api/config/v1" + "github.com/Azure/ARO-RP/pkg/util/clusteroperators" "github.com/Azure/ARO-RP/pkg/util/mimo" ) diff --git a/pkg/mimo/steps/cluster/apiserver_is_up_test.go b/pkg/mimo/steps/cluster/apiserver_is_up_test.go index c89544766a1..90f81cfe41c 100644 --- a/pkg/mimo/steps/cluster/apiserver_is_up_test.go +++ b/pkg/mimo/steps/cluster/apiserver_is_up_test.go @@ -9,13 +9,14 @@ import ( "time" . "github.com/onsi/gomega" - - configv1 "github.com/openshift/api/config/v1" "go.uber.org/mock/gomock" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client/fake" + configv1 "github.com/openshift/api/config/v1" + "github.com/Azure/ARO-RP/pkg/util/clienthelper" mock_env "github.com/Azure/ARO-RP/pkg/util/mocks/env" testtasks "github.com/Azure/ARO-RP/test/mimo/tasks" diff --git a/pkg/mimo/steps/cluster/operatorflags_test.go b/pkg/mimo/steps/cluster/operatorflags_test.go index f9b29f5fa3f..d0801fcbad8 100644 --- a/pkg/mimo/steps/cluster/operatorflags_test.go +++ b/pkg/mimo/steps/cluster/operatorflags_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - . "github.com/onsi/gomega" - "github.com/go-test/deep" + . "github.com/onsi/gomega" "go.uber.org/mock/gomock" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes/scheme" diff --git a/pkg/mimo/steps/cluster/tls.go b/pkg/mimo/steps/cluster/tls.go index 5501077ed5b..60e555c8550 100644 --- a/pkg/mimo/steps/cluster/tls.go +++ b/pkg/mimo/steps/cluster/tls.go @@ -6,11 +6,12 @@ package cluster import ( "context" - configv1 "github.com/openshift/api/config/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/util/retry" + configv1 "github.com/openshift/api/config/v1" + "github.com/Azure/ARO-RP/pkg/cluster" "github.com/Azure/ARO-RP/pkg/util/dns" "github.com/Azure/ARO-RP/pkg/util/mimo" diff --git a/pkg/mimo/steps/cluster/tls_test.go b/pkg/mimo/steps/cluster/tls_test.go index 64b26995264..1074ec04714 100644 --- a/pkg/mimo/steps/cluster/tls_test.go +++ b/pkg/mimo/steps/cluster/tls_test.go @@ -9,14 +9,15 @@ import ( "time" . "github.com/onsi/gomega" - - configv1 "github.com/openshift/api/config/v1" "go.uber.org/mock/gomock" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client/fake" + configv1 "github.com/openshift/api/config/v1" + "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/util/clienthelper" mock_env "github.com/Azure/ARO-RP/pkg/util/mocks/env" diff --git a/pkg/mimo/steps/example/task.go b/pkg/mimo/steps/example/task.go index 3dc832029fd..87653487a2e 100644 --- a/pkg/mimo/steps/example/task.go +++ b/pkg/mimo/steps/example/task.go @@ -7,9 +7,10 @@ import ( "context" "fmt" - configv1 "github.com/openshift/api/config/v1" "k8s.io/apimachinery/pkg/types" + configv1 "github.com/openshift/api/config/v1" + "github.com/Azure/ARO-RP/pkg/util/mimo" ) diff --git a/pkg/mimo/steps/example/task_test.go b/pkg/mimo/steps/example/task_test.go index af1e07fa8e2..5d34858ebf5 100644 --- a/pkg/mimo/steps/example/task_test.go +++ b/pkg/mimo/steps/example/task_test.go @@ -9,12 +9,13 @@ import ( "time" . "github.com/onsi/gomega" - - configv1 "github.com/openshift/api/config/v1" "go.uber.org/mock/gomock" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client/fake" + configv1 "github.com/openshift/api/config/v1" + "github.com/Azure/ARO-RP/pkg/util/clienthelper" mock_env "github.com/Azure/ARO-RP/pkg/util/mocks/env" testtasks "github.com/Azure/ARO-RP/test/mimo/tasks" diff --git a/pkg/mirror/imagestream.go b/pkg/mirror/imagestream.go index c1c1d704bba..786aa49a39f 100644 --- a/pkg/mirror/imagestream.go +++ b/pkg/mirror/imagestream.go @@ -16,6 +16,7 @@ import ( "github.com/containers/image/v5/docker" "github.com/containers/image/v5/pkg/blobinfocache/memory" "github.com/containers/image/v5/types" + imagev1 "github.com/openshift/api/image/v1" ) diff --git a/pkg/monitor/cluster/arooperatorconditions.go b/pkg/monitor/cluster/arooperatorconditions.go index 598e1d62357..817ab3a278e 100644 --- a/pkg/monitor/cluster/arooperatorconditions.go +++ b/pkg/monitor/cluster/arooperatorconditions.go @@ -7,10 +7,12 @@ import ( "context" "strings" - operatorv1 "github.com/openshift/api/operator/v1" "github.com/sirupsen/logrus" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + operatorv1 "github.com/openshift/api/operator/v1" + arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" ) diff --git a/pkg/monitor/cluster/arooperatorconditions_test.go b/pkg/monitor/cluster/arooperatorconditions_test.go index e40077642f8..499f80e916f 100644 --- a/pkg/monitor/cluster/arooperatorconditions_test.go +++ b/pkg/monitor/cluster/arooperatorconditions_test.go @@ -7,10 +7,12 @@ import ( "context" "testing" - operatorv1 "github.com/openshift/api/operator/v1" "go.uber.org/mock/gomock" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + operatorv1 "github.com/openshift/api/operator/v1" + arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" arofake "github.com/Azure/ARO-RP/pkg/operator/clientset/versioned/fake" mock_metrics "github.com/Azure/ARO-RP/pkg/util/mocks/metrics" diff --git a/pkg/monitor/cluster/arooperatorheartbeat_test.go b/pkg/monitor/cluster/arooperatorheartbeat_test.go index b4a00a64883..59a49313c40 100644 --- a/pkg/monitor/cluster/arooperatorheartbeat_test.go +++ b/pkg/monitor/cluster/arooperatorheartbeat_test.go @@ -9,6 +9,7 @@ import ( "github.com/Azure/go-autorest/autorest/to" "go.uber.org/mock/gomock" + appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" diff --git a/pkg/monitor/cluster/cache.go b/pkg/monitor/cluster/cache.go index 84b6e1d120c..df70acf8f15 100644 --- a/pkg/monitor/cluster/cache.go +++ b/pkg/monitor/cluster/cache.go @@ -6,11 +6,12 @@ package cluster import ( "context" - configv1 "github.com/openshift/api/config/v1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + configv1 "github.com/openshift/api/config/v1" + pkgoperator "github.com/Azure/ARO-RP/pkg/operator" ) diff --git a/pkg/monitor/cluster/certificateexpirationstatuses.go b/pkg/monitor/cluster/certificateexpirationstatuses.go index 7f387da758a..c0abcdd4774 100644 --- a/pkg/monitor/cluster/certificateexpirationstatuses.go +++ b/pkg/monitor/cluster/certificateexpirationstatuses.go @@ -8,12 +8,13 @@ import ( "strings" "time" - operatorv1 "github.com/openshift/api/operator/v1" corev1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" + operatorv1 "github.com/openshift/api/operator/v1" + "github.com/Azure/ARO-RP/pkg/operator" "github.com/Azure/ARO-RP/pkg/operator/controllers/genevalogging" utilcert "github.com/Azure/ARO-RP/pkg/util/cert" diff --git a/pkg/monitor/cluster/certificateexpirationstatuses_test.go b/pkg/monitor/cluster/certificateexpirationstatuses_test.go index ff8f242c0e8..3460127a59c 100644 --- a/pkg/monitor/cluster/certificateexpirationstatuses_test.go +++ b/pkg/monitor/cluster/certificateexpirationstatuses_test.go @@ -7,16 +7,18 @@ import ( "testing" "time" - configv1 "github.com/openshift/api/config/v1" - operatorv1 "github.com/openshift/api/operator/v1" - configfake "github.com/openshift/client-go/config/clientset/versioned/fake" "go.uber.org/mock/gomock" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" fakeClient "k8s.io/client-go/kubernetes/fake" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" + configv1 "github.com/openshift/api/config/v1" + operatorv1 "github.com/openshift/api/operator/v1" + configfake "github.com/openshift/client-go/config/clientset/versioned/fake" + "github.com/Azure/ARO-RP/pkg/api" mock_metrics "github.com/Azure/ARO-RP/pkg/util/mocks/metrics" utiltls "github.com/Azure/ARO-RP/pkg/util/tls" diff --git a/pkg/monitor/cluster/cluster.go b/pkg/monitor/cluster/cluster.go index f8cb39d2780..bc309cc7d6f 100644 --- a/pkg/monitor/cluster/cluster.go +++ b/pkg/monitor/cluster/cluster.go @@ -9,11 +9,8 @@ import ( "sync" "github.com/Azure/go-autorest/autorest/azure" - configv1 "github.com/openshift/api/config/v1" - configclient "github.com/openshift/client-go/config/clientset/versioned" - machineclient "github.com/openshift/client-go/machine/clientset/versioned" - mcoclient "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned" "github.com/sirupsen/logrus" + appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes" @@ -21,6 +18,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/apiutil" + configv1 "github.com/openshift/api/config/v1" + configclient "github.com/openshift/client-go/config/clientset/versioned" + machineclient "github.com/openshift/client-go/machine/clientset/versioned" + mcoclient "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned" + "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/hive" "github.com/Azure/ARO-RP/pkg/metrics" diff --git a/pkg/monitor/cluster/clusteroperatorconditions.go b/pkg/monitor/cluster/clusteroperatorconditions.go index c9d7d2cca11..1bfa0f6029e 100644 --- a/pkg/monitor/cluster/clusteroperatorconditions.go +++ b/pkg/monitor/cluster/clusteroperatorconditions.go @@ -6,8 +6,9 @@ package cluster import ( "context" - configv1 "github.com/openshift/api/config/v1" "github.com/sirupsen/logrus" + + configv1 "github.com/openshift/api/config/v1" ) type clusterOperatorConditionsIgnoreStruct struct { diff --git a/pkg/monitor/cluster/clusteroperatorconditions_test.go b/pkg/monitor/cluster/clusteroperatorconditions_test.go index 2c4feb01824..e0b89d03a2a 100644 --- a/pkg/monitor/cluster/clusteroperatorconditions_test.go +++ b/pkg/monitor/cluster/clusteroperatorconditions_test.go @@ -7,11 +7,13 @@ import ( "context" "testing" - configv1 "github.com/openshift/api/config/v1" - configfake "github.com/openshift/client-go/config/clientset/versioned/fake" "go.uber.org/mock/gomock" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + configv1 "github.com/openshift/api/config/v1" + configfake "github.com/openshift/client-go/config/clientset/versioned/fake" + mock_metrics "github.com/Azure/ARO-RP/pkg/util/mocks/metrics" ) diff --git a/pkg/monitor/cluster/clusteroperatorversions_test.go b/pkg/monitor/cluster/clusteroperatorversions_test.go index ccb4ec6729d..801239387f1 100644 --- a/pkg/monitor/cluster/clusteroperatorversions_test.go +++ b/pkg/monitor/cluster/clusteroperatorversions_test.go @@ -7,11 +7,13 @@ import ( "context" "testing" - configv1 "github.com/openshift/api/config/v1" - configfake "github.com/openshift/client-go/config/clientset/versioned/fake" "go.uber.org/mock/gomock" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + configv1 "github.com/openshift/api/config/v1" + configfake "github.com/openshift/client-go/config/clientset/versioned/fake" + mock_metrics "github.com/Azure/ARO-RP/pkg/util/mocks/metrics" ) diff --git a/pkg/monitor/cluster/clustersync.go b/pkg/monitor/cluster/clustersync.go index de0830d598a..8efa3e30ef5 100644 --- a/pkg/monitor/cluster/clustersync.go +++ b/pkg/monitor/cluster/clustersync.go @@ -7,6 +7,7 @@ import ( "context" "github.com/sirupsen/logrus" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/monitor/cluster/clustersync_test.go b/pkg/monitor/cluster/clustersync_test.go index abb1ccefb37..81003429ff2 100644 --- a/pkg/monitor/cluster/clustersync_test.go +++ b/pkg/monitor/cluster/clustersync_test.go @@ -9,13 +9,15 @@ import ( "testing" "time" - hivev1alpha1 "github.com/openshift/hive/apis/hiveinternal/v1alpha1" "github.com/sirupsen/logrus" "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + hivev1alpha1 "github.com/openshift/hive/apis/hiveinternal/v1alpha1" + "github.com/Azure/ARO-RP/pkg/hive" mock_hive "github.com/Azure/ARO-RP/pkg/util/mocks/hive" mock_metrics "github.com/Azure/ARO-RP/pkg/util/mocks/metrics" diff --git a/pkg/monitor/cluster/clusterversionconditions_test.go b/pkg/monitor/cluster/clusterversionconditions_test.go index c471294359a..82e9a442826 100644 --- a/pkg/monitor/cluster/clusterversionconditions_test.go +++ b/pkg/monitor/cluster/clusterversionconditions_test.go @@ -7,11 +7,13 @@ import ( "context" "testing" - configv1 "github.com/openshift/api/config/v1" - configfake "github.com/openshift/client-go/config/clientset/versioned/fake" "go.uber.org/mock/gomock" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + configv1 "github.com/openshift/api/config/v1" + configfake "github.com/openshift/client-go/config/clientset/versioned/fake" + mock_metrics "github.com/Azure/ARO-RP/pkg/util/mocks/metrics" ) diff --git a/pkg/monitor/cluster/clusterversions_test.go b/pkg/monitor/cluster/clusterversions_test.go index a473845c4be..f8553ff2257 100644 --- a/pkg/monitor/cluster/clusterversions_test.go +++ b/pkg/monitor/cluster/clusterversions_test.go @@ -7,13 +7,15 @@ import ( "context" "testing" - configv1 "github.com/openshift/api/config/v1" - configfake "github.com/openshift/client-go/config/clientset/versioned/fake" "go.uber.org/mock/gomock" + appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" + configv1 "github.com/openshift/api/config/v1" + configfake "github.com/openshift/client-go/config/clientset/versioned/fake" + "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/operator" mock_metrics "github.com/Azure/ARO-RP/pkg/util/mocks/metrics" diff --git a/pkg/monitor/cluster/daemonsetstatuses_test.go b/pkg/monitor/cluster/daemonsetstatuses_test.go index a98953536bf..464d67c374d 100644 --- a/pkg/monitor/cluster/daemonsetstatuses_test.go +++ b/pkg/monitor/cluster/daemonsetstatuses_test.go @@ -9,6 +9,7 @@ import ( "testing" "go.uber.org/mock/gomock" + appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" diff --git a/pkg/monitor/cluster/debugpods_test.go b/pkg/monitor/cluster/debugpods_test.go index ae858cbca48..1398b0c0fa9 100644 --- a/pkg/monitor/cluster/debugpods_test.go +++ b/pkg/monitor/cluster/debugpods_test.go @@ -9,6 +9,7 @@ import ( "time" "go.uber.org/mock/gomock" + corev1 "k8s.io/api/core/v1" eventsv1 "k8s.io/api/events/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/monitor/cluster/deploymentstatuses_test.go b/pkg/monitor/cluster/deploymentstatuses_test.go index 6cb435b9f92..5bd737f7e21 100644 --- a/pkg/monitor/cluster/deploymentstatuses_test.go +++ b/pkg/monitor/cluster/deploymentstatuses_test.go @@ -9,6 +9,7 @@ import ( "testing" "go.uber.org/mock/gomock" + appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" diff --git a/pkg/monitor/cluster/hiveregistrationstatus.go b/pkg/monitor/cluster/hiveregistrationstatus.go index 48ece26fd26..96ad7799613 100644 --- a/pkg/monitor/cluster/hiveregistrationstatus.go +++ b/pkg/monitor/cluster/hiveregistrationstatus.go @@ -7,10 +7,11 @@ import ( "context" "fmt" - hivev1 "github.com/openshift/hive/apis/hive/v1" corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" + hivev1 "github.com/openshift/hive/apis/hive/v1" + "github.com/Azure/ARO-RP/pkg/hive" ) diff --git a/pkg/monitor/cluster/hiveregistrationstatus_test.go b/pkg/monitor/cluster/hiveregistrationstatus_test.go index 0a1cc212b31..e06818fd521 100644 --- a/pkg/monitor/cluster/hiveregistrationstatus_test.go +++ b/pkg/monitor/cluster/hiveregistrationstatus_test.go @@ -8,17 +8,19 @@ import ( "fmt" "testing" - hivev1 "github.com/openshift/hive/apis/hive/v1" "github.com/sirupsen/logrus" "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kruntime "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client" fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake" + hivev1 "github.com/openshift/hive/apis/hive/v1" + "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/hive" mock_metrics "github.com/Azure/ARO-RP/pkg/util/mocks/metrics" diff --git a/pkg/monitor/cluster/jobconditions_test.go b/pkg/monitor/cluster/jobconditions_test.go index bdd27cfc903..81600817b50 100644 --- a/pkg/monitor/cluster/jobconditions_test.go +++ b/pkg/monitor/cluster/jobconditions_test.go @@ -8,6 +8,7 @@ import ( "testing" "go.uber.org/mock/gomock" + batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/monitor/cluster/machineconfigpool_test.go b/pkg/monitor/cluster/machineconfigpool_test.go index e4b3ba8fe8a..91dbe8d0167 100644 --- a/pkg/monitor/cluster/machineconfigpool_test.go +++ b/pkg/monitor/cluster/machineconfigpool_test.go @@ -7,14 +7,16 @@ import ( "context" "testing" - mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" - mcofake "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned/fake" "go.uber.org/mock/gomock" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kruntime "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes/fake" + mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" + mcofake "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned/fake" + mock_metrics "github.com/Azure/ARO-RP/pkg/util/mocks/metrics" ) diff --git a/pkg/monitor/cluster/machineconfigpoolconditions.go b/pkg/monitor/cluster/machineconfigpoolconditions.go index 6e310b1e56c..2a6ef5240a4 100644 --- a/pkg/monitor/cluster/machineconfigpoolconditions.go +++ b/pkg/monitor/cluster/machineconfigpoolconditions.go @@ -6,10 +6,12 @@ package cluster import ( "context" - mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" "github.com/sirupsen/logrus" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" ) var machineConfigPoolConditionsExpected = map[mcv1.MachineConfigPoolConditionType]corev1.ConditionStatus{ diff --git a/pkg/monitor/cluster/machineconfigpoolconditions_test.go b/pkg/monitor/cluster/machineconfigpoolconditions_test.go index 17abf24ac9d..80dab2d9cb1 100644 --- a/pkg/monitor/cluster/machineconfigpoolconditions_test.go +++ b/pkg/monitor/cluster/machineconfigpoolconditions_test.go @@ -7,12 +7,14 @@ import ( "context" "testing" - mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" - mcofake "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned/fake" "go.uber.org/mock/gomock" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" + mcofake "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned/fake" + mock_metrics "github.com/Azure/ARO-RP/pkg/util/mocks/metrics" ) diff --git a/pkg/monitor/cluster/nodeconditions.go b/pkg/monitor/cluster/nodeconditions.go index 7e8f76b2728..d2177d2a22b 100644 --- a/pkg/monitor/cluster/nodeconditions.go +++ b/pkg/monitor/cluster/nodeconditions.go @@ -8,10 +8,12 @@ import ( "encoding/json" "strconv" - machinev1beta1 "github.com/openshift/api/machine/v1beta1" "github.com/sirupsen/logrus" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + machinev1beta1 "github.com/openshift/api/machine/v1beta1" ) var nodeConditionsExpected = map[corev1.NodeConditionType]corev1.ConditionStatus{ diff --git a/pkg/monitor/cluster/nodeconditions_test.go b/pkg/monitor/cluster/nodeconditions_test.go index 61f537814db..dbff7d27f8b 100644 --- a/pkg/monitor/cluster/nodeconditions_test.go +++ b/pkg/monitor/cluster/nodeconditions_test.go @@ -8,16 +8,18 @@ import ( "encoding/json" "testing" - machinev1beta1 "github.com/openshift/api/machine/v1beta1" - machineclient "github.com/openshift/client-go/machine/clientset/versioned" - machinefake "github.com/openshift/client-go/machine/clientset/versioned/fake" "github.com/sirupsen/logrus" "go.uber.org/mock/gomock" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kruntime "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes/fake" + machinev1beta1 "github.com/openshift/api/machine/v1beta1" + machineclient "github.com/openshift/client-go/machine/clientset/versioned" + machinefake "github.com/openshift/client-go/machine/clientset/versioned/fake" + mock_metrics "github.com/Azure/ARO-RP/pkg/util/mocks/metrics" ) diff --git a/pkg/monitor/cluster/podconditions.go b/pkg/monitor/cluster/podconditions.go index 974046a4dfe..f05234f30c5 100644 --- a/pkg/monitor/cluster/podconditions.go +++ b/pkg/monitor/cluster/podconditions.go @@ -7,6 +7,7 @@ import ( "context" "github.com/sirupsen/logrus" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/kubelet/events" diff --git a/pkg/monitor/cluster/podconditions_test.go b/pkg/monitor/cluster/podconditions_test.go index 66671fad5eb..122574c2f99 100644 --- a/pkg/monitor/cluster/podconditions_test.go +++ b/pkg/monitor/cluster/podconditions_test.go @@ -11,6 +11,7 @@ import ( "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" diff --git a/pkg/monitor/cluster/quota_test.go b/pkg/monitor/cluster/quota_test.go index 4bbfe5df1f1..43f8df026fa 100644 --- a/pkg/monitor/cluster/quota_test.go +++ b/pkg/monitor/cluster/quota_test.go @@ -9,6 +9,7 @@ import ( "time" "go.uber.org/mock/gomock" + corev1 "k8s.io/api/core/v1" eventsv1 "k8s.io/api/events/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/monitor/cluster/replicasetstatuses_test.go b/pkg/monitor/cluster/replicasetstatuses_test.go index 1227c0e82cc..d5ff0537d42 100644 --- a/pkg/monitor/cluster/replicasetstatuses_test.go +++ b/pkg/monitor/cluster/replicasetstatuses_test.go @@ -9,6 +9,7 @@ import ( "testing" "go.uber.org/mock/gomock" + appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" diff --git a/pkg/monitor/cluster/statefulsetstatuses_test.go b/pkg/monitor/cluster/statefulsetstatuses_test.go index d28678c64b0..015b352fbdd 100644 --- a/pkg/monitor/cluster/statefulsetstatuses_test.go +++ b/pkg/monitor/cluster/statefulsetstatuses_test.go @@ -9,6 +9,7 @@ import ( "testing" "go.uber.org/mock/gomock" + appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" diff --git a/pkg/monitor/cluster/summary_test.go b/pkg/monitor/cluster/summary_test.go index 581015da455..f9d70e6c766 100644 --- a/pkg/monitor/cluster/summary_test.go +++ b/pkg/monitor/cluster/summary_test.go @@ -8,13 +8,15 @@ import ( "testing" "time" - configv1 "github.com/openshift/api/config/v1" - configfake "github.com/openshift/client-go/config/clientset/versioned/fake" "go.uber.org/mock/gomock" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" + configv1 "github.com/openshift/api/config/v1" + configfake "github.com/openshift/client-go/config/clientset/versioned/fake" + "github.com/Azure/ARO-RP/pkg/api" mock_metrics "github.com/Azure/ARO-RP/pkg/util/mocks/metrics" ) diff --git a/pkg/monitor/monitor.go b/pkg/monitor/monitor.go index 4e1f92e4d7a..7b4db02e644 100644 --- a/pkg/monitor/monitor.go +++ b/pkg/monitor/monitor.go @@ -11,6 +11,7 @@ import ( "time" "github.com/sirupsen/logrus" + "k8s.io/client-go/rest" "github.com/Azure/ARO-RP/pkg/api" diff --git a/pkg/monitor/worker.go b/pkg/monitor/worker.go index d589247d945..45a65996a86 100644 --- a/pkg/monitor/worker.go +++ b/pkg/monitor/worker.go @@ -12,6 +12,7 @@ import ( "github.com/Azure/go-autorest/autorest/azure" "github.com/sirupsen/logrus" + "k8s.io/client-go/rest" "github.com/Azure/ARO-RP/pkg/api" diff --git a/pkg/operator/apis/aro.openshift.io/v1alpha1/cluster_types.go b/pkg/operator/apis/aro.openshift.io/v1alpha1/cluster_types.go index d8008e1a019..9046a6c0785 100644 --- a/pkg/operator/apis/aro.openshift.io/v1alpha1/cluster_types.go +++ b/pkg/operator/apis/aro.openshift.io/v1alpha1/cluster_types.go @@ -6,8 +6,9 @@ package v1alpha1 import ( "strings" - operatorv1 "github.com/openshift/api/operator/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + operatorv1 "github.com/openshift/api/operator/v1" ) type BannerContent string diff --git a/pkg/operator/apis/aro.openshift.io/v1alpha1/zz_generated.deepcopy.go b/pkg/operator/apis/aro.openshift.io/v1alpha1/zz_generated.deepcopy.go index 3ce31199b6b..ba21807c8af 100644 --- a/pkg/operator/apis/aro.openshift.io/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/operator/apis/aro.openshift.io/v1alpha1/zz_generated.deepcopy.go @@ -5,8 +5,9 @@ package v1alpha1 import ( - v1 "github.com/openshift/api/operator/v1" runtime "k8s.io/apimachinery/pkg/runtime" + + v1 "github.com/openshift/api/operator/v1" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/pkg/operator/apis/preview.aro.openshift.io/v1alpha1/previewfeature_types.go b/pkg/operator/apis/preview.aro.openshift.io/v1alpha1/previewfeature_types.go index 67497f10f54..115032c43fe 100644 --- a/pkg/operator/apis/preview.aro.openshift.io/v1alpha1/previewfeature_types.go +++ b/pkg/operator/apis/preview.aro.openshift.io/v1alpha1/previewfeature_types.go @@ -4,8 +4,9 @@ package v1alpha1 // Licensed under the Apache License 2.0. import ( - operatorv1 "github.com/openshift/api/operator/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + operatorv1 "github.com/openshift/api/operator/v1" ) const ( diff --git a/pkg/operator/apis/preview.aro.openshift.io/v1alpha1/zz_generated.deepcopy.go b/pkg/operator/apis/preview.aro.openshift.io/v1alpha1/zz_generated.deepcopy.go index 64fefc850b0..19c682d019a 100644 --- a/pkg/operator/apis/preview.aro.openshift.io/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/operator/apis/preview.aro.openshift.io/v1alpha1/zz_generated.deepcopy.go @@ -5,8 +5,9 @@ package v1alpha1 import ( - v1 "github.com/openshift/api/operator/v1" runtime "k8s.io/apimachinery/pkg/runtime" + + v1 "github.com/openshift/api/operator/v1" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/pkg/operator/controllers/alertwebhook/alertwebhook_controller.go b/pkg/operator/controllers/alertwebhook/alertwebhook_controller.go index 0b1f5296a65..b5632b406ff 100644 --- a/pkg/operator/controllers/alertwebhook/alertwebhook_controller.go +++ b/pkg/operator/controllers/alertwebhook/alertwebhook_controller.go @@ -8,6 +8,7 @@ import ( "reflect" "github.com/sirupsen/logrus" + corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" diff --git a/pkg/operator/controllers/alertwebhook/alertwebhook_controller_test.go b/pkg/operator/controllers/alertwebhook/alertwebhook_controller_test.go index 3bab586856b..1c42d80d1fb 100644 --- a/pkg/operator/controllers/alertwebhook/alertwebhook_controller_test.go +++ b/pkg/operator/controllers/alertwebhook/alertwebhook_controller_test.go @@ -9,6 +9,7 @@ import ( "testing" "github.com/sirupsen/logrus" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/operator/controllers/autosizednodes/autosizednodes_controller.go b/pkg/operator/controllers/autosizednodes/autosizednodes_controller.go index d420a2e76c2..f171fc38829 100644 --- a/pkg/operator/controllers/autosizednodes/autosizednodes_controller.go +++ b/pkg/operator/controllers/autosizednodes/autosizednodes_controller.go @@ -8,8 +8,8 @@ import ( "fmt" "github.com/Azure/go-autorest/autorest/to" - mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" "github.com/sirupsen/logrus" + kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" @@ -18,6 +18,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/predicate" + mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/operator/predicates" diff --git a/pkg/operator/controllers/autosizednodes/autosizednodes_controller_test.go b/pkg/operator/controllers/autosizednodes/autosizednodes_controller_test.go index 916e2738469..802b830ac44 100644 --- a/pkg/operator/controllers/autosizednodes/autosizednodes_controller_test.go +++ b/pkg/operator/controllers/autosizednodes/autosizednodes_controller_test.go @@ -11,8 +11,8 @@ import ( "github.com/Azure/go-autorest/autorest/to" "github.com/google/go-cmp/cmp" - mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" "github.com/sirupsen/logrus" + kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" @@ -20,10 +20,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - // This "_" import is counterintuitive but is required to initialize the scheme - // ARO unfortunately relies on implicit import and its side effect for this + mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" + + // This "_" import is counterintuitive but is required to initialize the scheme + // ARO unfortunately relies on implicit import and its side effect for this _ "github.com/Azure/ARO-RP/pkg/util/scheme" utilerror "github.com/Azure/ARO-RP/test/util/error" ) diff --git a/pkg/operator/controllers/banner/banner.go b/pkg/operator/controllers/banner/banner.go index 57dec8f5ea4..d77666ac3d2 100644 --- a/pkg/operator/controllers/banner/banner.go +++ b/pkg/operator/controllers/banner/banner.go @@ -7,11 +7,12 @@ import ( "context" "fmt" - consolev1 "github.com/openshift/api/console/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + consolev1 "github.com/openshift/api/console/v1" + arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" ) diff --git a/pkg/operator/controllers/banner/banner_controller.go b/pkg/operator/controllers/banner/banner_controller.go index 3264cbc6dc9..9d7662776e5 100644 --- a/pkg/operator/controllers/banner/banner_controller.go +++ b/pkg/operator/controllers/banner/banner_controller.go @@ -6,8 +6,8 @@ package banner import ( "context" - consolev1 "github.com/openshift/api/console/v1" "github.com/sirupsen/logrus" + "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/builder" @@ -17,6 +17,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" + consolev1 "github.com/openshift/api/console/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/operator/predicates" diff --git a/pkg/operator/controllers/banner/banner_controller_test.go b/pkg/operator/controllers/banner/banner_controller_test.go index 48ab7f5952f..6df47586266 100644 --- a/pkg/operator/controllers/banner/banner_controller_test.go +++ b/pkg/operator/controllers/banner/banner_controller_test.go @@ -9,13 +9,14 @@ import ( "strings" "testing" - consolev1 "github.com/openshift/api/console/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client/fake" + consolev1 "github.com/openshift/api/console/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" utillog "github.com/Azure/ARO-RP/pkg/util/log" diff --git a/pkg/operator/controllers/base/aro_controller.go b/pkg/operator/controllers/base/aro_controller.go index 47a8b03f80c..e12a9753a25 100644 --- a/pkg/operator/controllers/base/aro_controller.go +++ b/pkg/operator/controllers/base/aro_controller.go @@ -7,14 +7,16 @@ import ( "context" "fmt" - configv1 "github.com/openshift/api/config/v1" - operatorv1 "github.com/openshift/api/operator/v1" - "github.com/openshift/library-go/pkg/operator/v1helpers" "github.com/sirupsen/logrus" + "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" + configv1 "github.com/openshift/api/config/v1" + operatorv1 "github.com/openshift/api/operator/v1" + "github.com/openshift/library-go/pkg/operator/v1helpers" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/util/version" diff --git a/pkg/operator/controllers/base/aro_controller_test.go b/pkg/operator/controllers/base/aro_controller_test.go index d6c58e0d050..28fe677686f 100644 --- a/pkg/operator/controllers/base/aro_controller_test.go +++ b/pkg/operator/controllers/base/aro_controller_test.go @@ -9,11 +9,13 @@ import ( "testing" "time" - operatorv1 "github.com/openshift/api/operator/v1" "github.com/sirupsen/logrus" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake" + operatorv1 "github.com/openshift/api/operator/v1" + arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" _ "github.com/Azure/ARO-RP/pkg/util/scheme" utilconditions "github.com/Azure/ARO-RP/test/util/conditions" diff --git a/pkg/operator/controllers/checkers/clusterdnschecker/checker.go b/pkg/operator/controllers/checkers/clusterdnschecker/checker.go index 8089b71982d..2d820e588a1 100644 --- a/pkg/operator/controllers/checkers/clusterdnschecker/checker.go +++ b/pkg/operator/controllers/checkers/clusterdnschecker/checker.go @@ -8,9 +8,10 @@ import ( "fmt" "strings" - operatorv1 "github.com/openshift/api/operator/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" + + operatorv1 "github.com/openshift/api/operator/v1" ) type clusterDNSChecker interface { diff --git a/pkg/operator/controllers/checkers/clusterdnschecker/checker_test.go b/pkg/operator/controllers/checkers/clusterdnschecker/checker_test.go index 9f06b5454ba..4a59983e947 100644 --- a/pkg/operator/controllers/checkers/clusterdnschecker/checker_test.go +++ b/pkg/operator/controllers/checkers/clusterdnschecker/checker_test.go @@ -7,11 +7,13 @@ import ( "context" "testing" - operatorv1 "github.com/openshift/api/operator/v1" "github.com/stretchr/testify/assert" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake" + operatorv1 "github.com/openshift/api/operator/v1" + utilerror "github.com/Azure/ARO-RP/test/util/error" ) diff --git a/pkg/operator/controllers/checkers/clusterdnschecker/controller.go b/pkg/operator/controllers/checkers/clusterdnschecker/controller.go index 2e762eeee3d..502e3f7f49d 100644 --- a/pkg/operator/controllers/checkers/clusterdnschecker/controller.go +++ b/pkg/operator/controllers/checkers/clusterdnschecker/controller.go @@ -7,8 +7,8 @@ import ( "context" "time" - operatorv1 "github.com/openshift/api/operator/v1" "github.com/sirupsen/logrus" + "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/builder" @@ -18,6 +18,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" + operatorv1 "github.com/openshift/api/operator/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/operator/predicates" diff --git a/pkg/operator/controllers/checkers/clusterdnschecker/controller_test.go b/pkg/operator/controllers/checkers/clusterdnschecker/controller_test.go index d854ff24cd1..8a987ce8562 100644 --- a/pkg/operator/controllers/checkers/clusterdnschecker/controller_test.go +++ b/pkg/operator/controllers/checkers/clusterdnschecker/controller_test.go @@ -10,13 +10,14 @@ import ( "testing" "time" - operatorv1 "github.com/openshift/api/operator/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/reconcile" + operatorv1 "github.com/openshift/api/operator/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/util/azureclient" diff --git a/pkg/operator/controllers/checkers/ingresscertificatechecker/checker.go b/pkg/operator/controllers/checkers/ingresscertificatechecker/checker.go index cda52eb2c99..e6d0fa31faf 100644 --- a/pkg/operator/controllers/checkers/ingresscertificatechecker/checker.go +++ b/pkg/operator/controllers/checkers/ingresscertificatechecker/checker.go @@ -14,12 +14,13 @@ import ( "context" "errors" - configv1 "github.com/openshift/api/config/v1" - operatorv1 "github.com/openshift/api/operator/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" + configv1 "github.com/openshift/api/config/v1" + operatorv1 "github.com/openshift/api/operator/v1" + arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/util/dns" ) diff --git a/pkg/operator/controllers/checkers/ingresscertificatechecker/checker_test.go b/pkg/operator/controllers/checkers/ingresscertificatechecker/checker_test.go index bbba5edfbaa..537340140f5 100644 --- a/pkg/operator/controllers/checkers/ingresscertificatechecker/checker_test.go +++ b/pkg/operator/controllers/checkers/ingresscertificatechecker/checker_test.go @@ -7,13 +7,14 @@ import ( "context" "testing" - configv1 "github.com/openshift/api/config/v1" - operatorv1 "github.com/openshift/api/operator/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake" + configv1 "github.com/openshift/api/config/v1" + operatorv1 "github.com/openshift/api/operator/v1" + arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" ) diff --git a/pkg/operator/controllers/checkers/ingresscertificatechecker/controller.go b/pkg/operator/controllers/checkers/ingresscertificatechecker/controller.go index 4b28c974578..ca95130b459 100644 --- a/pkg/operator/controllers/checkers/ingresscertificatechecker/controller.go +++ b/pkg/operator/controllers/checkers/ingresscertificatechecker/controller.go @@ -8,9 +8,8 @@ import ( "errors" "time" - configv1 "github.com/openshift/api/config/v1" - operatorv1 "github.com/openshift/api/operator/v1" "github.com/sirupsen/logrus" + "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/builder" @@ -20,6 +19,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" + configv1 "github.com/openshift/api/config/v1" + operatorv1 "github.com/openshift/api/operator/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/operator/predicates" diff --git a/pkg/operator/controllers/checkers/ingresscertificatechecker/controller_test.go b/pkg/operator/controllers/checkers/ingresscertificatechecker/controller_test.go index 76dcbfed811..9ca191c498c 100644 --- a/pkg/operator/controllers/checkers/ingresscertificatechecker/controller_test.go +++ b/pkg/operator/controllers/checkers/ingresscertificatechecker/controller_test.go @@ -9,13 +9,14 @@ import ( "testing" "time" - operatorv1 "github.com/openshift/api/operator/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/reconcile" + operatorv1 "github.com/openshift/api/operator/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/util/azureclient" diff --git a/pkg/operator/controllers/checkers/internetchecker/controller.go b/pkg/operator/controllers/checkers/internetchecker/controller.go index 5fc5e99a4be..71099636219 100644 --- a/pkg/operator/controllers/checkers/internetchecker/controller.go +++ b/pkg/operator/controllers/checkers/internetchecker/controller.go @@ -7,8 +7,8 @@ import ( "context" "time" - operatorv1 "github.com/openshift/api/operator/v1" "github.com/sirupsen/logrus" + "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/builder" @@ -16,6 +16,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" + operatorv1 "github.com/openshift/api/operator/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/operator/predicates" diff --git a/pkg/operator/controllers/checkers/internetchecker/controller_test.go b/pkg/operator/controllers/checkers/internetchecker/controller_test.go index 6cda5ca25df..1dab870d9a2 100644 --- a/pkg/operator/controllers/checkers/internetchecker/controller_test.go +++ b/pkg/operator/controllers/checkers/internetchecker/controller_test.go @@ -10,13 +10,14 @@ import ( "testing" "time" - operatorv1 "github.com/openshift/api/operator/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/reconcile" + operatorv1 "github.com/openshift/api/operator/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/util/cmp" diff --git a/pkg/operator/controllers/checkers/internetchecker/unsupportedconditionchecker.go b/pkg/operator/controllers/checkers/internetchecker/unsupportedconditionchecker.go index c423aee0133..56f5ebee557 100644 --- a/pkg/operator/controllers/checkers/internetchecker/unsupportedconditionchecker.go +++ b/pkg/operator/controllers/checkers/internetchecker/unsupportedconditionchecker.go @@ -7,15 +7,17 @@ import ( "context" "fmt" + "github.com/sirupsen/logrus" + + kerrors "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/kubernetes" + configv1 "github.com/openshift/api/config/v1" consolev1 "github.com/openshift/api/console/v1" configclient "github.com/openshift/client-go/config/clientset/versioned" consoleclient "github.com/openshift/client-go/console/clientset/versioned" "github.com/openshift/library-go/pkg/config/clusteroperator/v1helpers" - "github.com/sirupsen/logrus" - kerrors "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/kubernetes" "github.com/Azure/ARO-RP/pkg/operator" ) diff --git a/pkg/operator/controllers/checkers/internetchecker/unsupportedconditionchecker_test.go b/pkg/operator/controllers/checkers/internetchecker/unsupportedconditionchecker_test.go index 1ee051414e6..58b10e8a3fd 100644 --- a/pkg/operator/controllers/checkers/internetchecker/unsupportedconditionchecker_test.go +++ b/pkg/operator/controllers/checkers/internetchecker/unsupportedconditionchecker_test.go @@ -7,13 +7,14 @@ import ( "context" "testing" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/kubernetes/fake" + configv1 "github.com/openshift/api/config/v1" consolev1 "github.com/openshift/api/console/v1" configfake "github.com/openshift/client-go/config/clientset/versioned/fake" consolefake "github.com/openshift/client-go/console/clientset/versioned/fake" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/kubernetes/fake" utillog "github.com/Azure/ARO-RP/pkg/util/log" ) diff --git a/pkg/operator/controllers/checkers/serviceprincipalchecker/checker.go b/pkg/operator/controllers/checkers/serviceprincipalchecker/checker.go index c007259c17d..1773975df5e 100644 --- a/pkg/operator/controllers/checkers/serviceprincipalchecker/checker.go +++ b/pkg/operator/controllers/checkers/serviceprincipalchecker/checker.go @@ -8,6 +8,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/sirupsen/logrus" + "sigs.k8s.io/controller-runtime/pkg/client" "github.com/Azure/ARO-RP/pkg/util/azureclient" diff --git a/pkg/operator/controllers/checkers/serviceprincipalchecker/controller.go b/pkg/operator/controllers/checkers/serviceprincipalchecker/controller.go index 3356e3d9cdb..b1c3363451c 100644 --- a/pkg/operator/controllers/checkers/serviceprincipalchecker/controller.go +++ b/pkg/operator/controllers/checkers/serviceprincipalchecker/controller.go @@ -7,8 +7,8 @@ import ( "context" "time" - operatorv1 "github.com/openshift/api/operator/v1" "github.com/sirupsen/logrus" + corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" @@ -19,6 +19,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" + operatorv1 "github.com/openshift/api/operator/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/operator/predicates" diff --git a/pkg/operator/controllers/checkers/serviceprincipalchecker/controller_test.go b/pkg/operator/controllers/checkers/serviceprincipalchecker/controller_test.go index c14d0f36b45..365d9ceb3ce 100644 --- a/pkg/operator/controllers/checkers/serviceprincipalchecker/controller_test.go +++ b/pkg/operator/controllers/checkers/serviceprincipalchecker/controller_test.go @@ -10,13 +10,14 @@ import ( "testing" "time" - operatorv1 "github.com/openshift/api/operator/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/reconcile" + operatorv1 "github.com/openshift/api/operator/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/util/azureclient" diff --git a/pkg/operator/controllers/cloudproviderconfig/cloudproviderconfig_controller.go b/pkg/operator/controllers/cloudproviderconfig/cloudproviderconfig_controller.go index 809bd075905..fd33afe31a0 100644 --- a/pkg/operator/controllers/cloudproviderconfig/cloudproviderconfig_controller.go +++ b/pkg/operator/controllers/cloudproviderconfig/cloudproviderconfig_controller.go @@ -9,6 +9,7 @@ import ( "fmt" "github.com/sirupsen/logrus" + corev1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/operator/controllers/cloudproviderconfig/cloudproviderconfig_controller_test.go b/pkg/operator/controllers/cloudproviderconfig/cloudproviderconfig_controller_test.go index 0f79bb07381..c34eed2daa2 100644 --- a/pkg/operator/controllers/cloudproviderconfig/cloudproviderconfig_controller_test.go +++ b/pkg/operator/controllers/cloudproviderconfig/cloudproviderconfig_controller_test.go @@ -12,6 +12,7 @@ import ( "github.com/sirupsen/logrus" logtest "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ctrl "sigs.k8s.io/controller-runtime" diff --git a/pkg/operator/controllers/clusteroperatoraro/clusteroperatoraro_controller.go b/pkg/operator/controllers/clusteroperatoraro/clusteroperatoraro_controller.go index b699dcb60fa..23e0d2791f4 100644 --- a/pkg/operator/controllers/clusteroperatoraro/clusteroperatoraro_controller.go +++ b/pkg/operator/controllers/clusteroperatoraro/clusteroperatoraro_controller.go @@ -6,12 +6,8 @@ package clusteroperatoraro import ( "context" - configv1 "github.com/openshift/api/config/v1" - operatorv1 "github.com/openshift/api/operator/v1" - configv1helpers "github.com/openshift/library-go/pkg/config/clusteroperator/v1helpers" - "github.com/openshift/library-go/pkg/operator/status" - operatorv1helpers "github.com/openshift/library-go/pkg/operator/v1helpers" "github.com/sirupsen/logrus" + "k8s.io/apimachinery/pkg/api/equality" kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -23,6 +19,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/reconcile" + configv1 "github.com/openshift/api/config/v1" + operatorv1 "github.com/openshift/api/operator/v1" + configv1helpers "github.com/openshift/library-go/pkg/config/clusteroperator/v1helpers" + "github.com/openshift/library-go/pkg/operator/status" + operatorv1helpers "github.com/openshift/library-go/pkg/operator/v1helpers" + arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/operator/predicates" "github.com/Azure/ARO-RP/pkg/util/version" diff --git a/pkg/operator/controllers/clusteroperatoraro/clusteroperatoraro_controller_test.go b/pkg/operator/controllers/clusteroperatoraro/clusteroperatoraro_controller_test.go index 052dd101793..140681a6fcf 100644 --- a/pkg/operator/controllers/clusteroperatoraro/clusteroperatoraro_controller_test.go +++ b/pkg/operator/controllers/clusteroperatoraro/clusteroperatoraro_controller_test.go @@ -9,15 +9,17 @@ import ( "time" "github.com/google/go-cmp/cmp/cmpopts" - configv1 "github.com/openshift/api/config/v1" - operatorv1 "github.com/openshift/api/operator/v1" "github.com/sirupsen/logrus" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/utils/ptr" ctrl "sigs.k8s.io/controller-runtime" ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake" + configv1 "github.com/openshift/api/config/v1" + operatorv1 "github.com/openshift/api/operator/v1" + arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/util/cmp" _ "github.com/Azure/ARO-RP/pkg/util/scheme" diff --git a/pkg/operator/controllers/cpms/cpms_controller.go b/pkg/operator/controllers/cpms/cpms_controller.go index 918e4d158ae..aebee30437c 100644 --- a/pkg/operator/controllers/cpms/cpms_controller.go +++ b/pkg/operator/controllers/cpms/cpms_controller.go @@ -3,8 +3,8 @@ package cpms import ( "context" - machinev1 "github.com/openshift/api/machine/v1" "github.com/sirupsen/logrus" + kerrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" @@ -15,6 +15,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" + machinev1 "github.com/openshift/api/machine/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/operator/controllers/base" diff --git a/pkg/operator/controllers/cpms/cpms_controller_test.go b/pkg/operator/controllers/cpms/cpms_controller_test.go index 4c2bbbcd811..c8bb5142520 100644 --- a/pkg/operator/controllers/cpms/cpms_controller_test.go +++ b/pkg/operator/controllers/cpms/cpms_controller_test.go @@ -7,14 +7,16 @@ import ( "context" "testing" - machinev1 "github.com/openshift/api/machine/v1" "github.com/sirupsen/logrus" + kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake" + machinev1 "github.com/openshift/api/machine/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" _ "github.com/Azure/ARO-RP/pkg/util/scheme" diff --git a/pkg/operator/controllers/dnsmasq/cluster_controller.go b/pkg/operator/controllers/dnsmasq/cluster_controller.go index 9d6167fc447..ae96768e5fe 100644 --- a/pkg/operator/controllers/dnsmasq/cluster_controller.go +++ b/pkg/operator/controllers/dnsmasq/cluster_controller.go @@ -7,9 +7,8 @@ import ( "context" "fmt" - configv1 "github.com/openshift/api/config/v1" - mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" "github.com/sirupsen/logrus" + kerrors "k8s.io/apimachinery/pkg/api/errors" kruntime "k8s.io/apimachinery/pkg/runtime" ctrl "sigs.k8s.io/controller-runtime" @@ -20,6 +19,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" + configv1 "github.com/openshift/api/config/v1" + mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/operator/controllers/base" diff --git a/pkg/operator/controllers/dnsmasq/cluster_controller_test.go b/pkg/operator/controllers/dnsmasq/cluster_controller_test.go index f7cb499dc13..b301e1881aa 100644 --- a/pkg/operator/controllers/dnsmasq/cluster_controller_test.go +++ b/pkg/operator/controllers/dnsmasq/cluster_controller_test.go @@ -8,15 +8,17 @@ import ( "testing" "time" - configv1 "github.com/openshift/api/config/v1" - operatorv1 "github.com/openshift/api/operator/v1" - mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" "github.com/sirupsen/logrus" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake" + configv1 "github.com/openshift/api/config/v1" + operatorv1 "github.com/openshift/api/operator/v1" + mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/util/clienthelper" diff --git a/pkg/operator/controllers/dnsmasq/dnsmasq.go b/pkg/operator/controllers/dnsmasq/dnsmasq.go index 0dd82453f03..d0c63511e78 100644 --- a/pkg/operator/controllers/dnsmasq/dnsmasq.go +++ b/pkg/operator/controllers/dnsmasq/dnsmasq.go @@ -13,10 +13,12 @@ import ( "github.com/Azure/go-autorest/autorest/to" "github.com/coreos/go-semver/semver" ign3types "github.com/coreos/ignition/v2/config/v3_2/types" - mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" "github.com/vincent-petithory/dataurl" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + + mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" ) const ( diff --git a/pkg/operator/controllers/dnsmasq/machineconfig_controller.go b/pkg/operator/controllers/dnsmasq/machineconfig_controller.go index b045bbeede9..406bfa7a332 100644 --- a/pkg/operator/controllers/dnsmasq/machineconfig_controller.go +++ b/pkg/operator/controllers/dnsmasq/machineconfig_controller.go @@ -7,14 +7,16 @@ import ( "context" "regexp" - mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" "github.com/sirupsen/logrus" + kerrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" + mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" + "github.com/Azure/ARO-RP/pkg/operator" "github.com/Azure/ARO-RP/pkg/operator/controllers/base" "github.com/Azure/ARO-RP/pkg/util/clienthelper" diff --git a/pkg/operator/controllers/dnsmasq/machineconfig_controller_test.go b/pkg/operator/controllers/dnsmasq/machineconfig_controller_test.go index 266957c2b0a..4419a43329d 100644 --- a/pkg/operator/controllers/dnsmasq/machineconfig_controller_test.go +++ b/pkg/operator/controllers/dnsmasq/machineconfig_controller_test.go @@ -8,16 +8,18 @@ import ( "testing" "time" - configv1 "github.com/openshift/api/config/v1" - operatorv1 "github.com/openshift/api/operator/v1" - mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" "github.com/sirupsen/logrus" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake" + configv1 "github.com/openshift/api/config/v1" + operatorv1 "github.com/openshift/api/operator/v1" + mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/util/clienthelper" diff --git a/pkg/operator/controllers/dnsmasq/machineconfigpool_controller.go b/pkg/operator/controllers/dnsmasq/machineconfigpool_controller.go index 1f9932f1d5e..5e34b9f44ba 100644 --- a/pkg/operator/controllers/dnsmasq/machineconfigpool_controller.go +++ b/pkg/operator/controllers/dnsmasq/machineconfigpool_controller.go @@ -6,14 +6,16 @@ package dnsmasq import ( "context" - mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" "github.com/sirupsen/logrus" + kerrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" + mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" + "github.com/Azure/ARO-RP/pkg/operator" "github.com/Azure/ARO-RP/pkg/operator/controllers/base" "github.com/Azure/ARO-RP/pkg/util/clienthelper" diff --git a/pkg/operator/controllers/dnsmasq/machineconfigpool_controller_test.go b/pkg/operator/controllers/dnsmasq/machineconfigpool_controller_test.go index 8c84dc1214d..d831b58b8a6 100644 --- a/pkg/operator/controllers/dnsmasq/machineconfigpool_controller_test.go +++ b/pkg/operator/controllers/dnsmasq/machineconfigpool_controller_test.go @@ -8,16 +8,18 @@ import ( "testing" "time" - configv1 "github.com/openshift/api/config/v1" - operatorv1 "github.com/openshift/api/operator/v1" - mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" "github.com/sirupsen/logrus" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake" + configv1 "github.com/openshift/api/config/v1" + operatorv1 "github.com/openshift/api/operator/v1" + mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/util/clienthelper" diff --git a/pkg/operator/controllers/etchosts/cluster_controller.go b/pkg/operator/controllers/etchosts/cluster_controller.go index 76c900b2308..76039eb9dd3 100644 --- a/pkg/operator/controllers/etchosts/cluster_controller.go +++ b/pkg/operator/controllers/etchosts/cluster_controller.go @@ -6,8 +6,8 @@ package etchosts import ( "context" - mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" "github.com/sirupsen/logrus" + kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" @@ -19,6 +19,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" + mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/operator/controllers/base" diff --git a/pkg/operator/controllers/etchosts/cluster_controller_test.go b/pkg/operator/controllers/etchosts/cluster_controller_test.go index 897e8de80f8..0c7692bbba1 100644 --- a/pkg/operator/controllers/etchosts/cluster_controller_test.go +++ b/pkg/operator/controllers/etchosts/cluster_controller_test.go @@ -8,17 +8,19 @@ import ( "io" "testing" - configv1 "github.com/openshift/api/config/v1" - mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" "github.com/sirupsen/logrus" logtest "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake" + configv1 "github.com/openshift/api/config/v1" + mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/operator/controllers/base" diff --git a/pkg/operator/controllers/etchosts/etchosts.go b/pkg/operator/controllers/etchosts/etchosts.go index f10fff847b0..b7a753469c5 100644 --- a/pkg/operator/controllers/etchosts/etchosts.go +++ b/pkg/operator/controllers/etchosts/etchosts.go @@ -11,11 +11,13 @@ import ( "github.com/Azure/go-autorest/autorest/to" ign3types "github.com/coreos/ignition/v2/config/v3_2/types" - mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" "github.com/pkg/errors" "github.com/vincent-petithory/dataurl" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + + mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" ) const ( diff --git a/pkg/operator/controllers/etchosts/machineconfig_controller.go b/pkg/operator/controllers/etchosts/machineconfig_controller.go index c1a60e04307..147841579a4 100644 --- a/pkg/operator/controllers/etchosts/machineconfig_controller.go +++ b/pkg/operator/controllers/etchosts/machineconfig_controller.go @@ -7,8 +7,8 @@ import ( "context" "regexp" - mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" "github.com/sirupsen/logrus" + kerrors "k8s.io/apimachinery/pkg/api/errors" kruntime "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" @@ -20,6 +20,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" + mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/operator/controllers/base" diff --git a/pkg/operator/controllers/etchosts/machineconfig_controller_test.go b/pkg/operator/controllers/etchosts/machineconfig_controller_test.go index 0e04f245ae6..c0167829d95 100644 --- a/pkg/operator/controllers/etchosts/machineconfig_controller_test.go +++ b/pkg/operator/controllers/etchosts/machineconfig_controller_test.go @@ -12,6 +12,7 @@ import ( logtest "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" + ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake" diff --git a/pkg/operator/controllers/genevalogging/genevalogging.go b/pkg/operator/controllers/genevalogging/genevalogging.go index e0378d58991..1aeeb3e31a7 100644 --- a/pkg/operator/controllers/genevalogging/genevalogging.go +++ b/pkg/operator/controllers/genevalogging/genevalogging.go @@ -9,8 +9,7 @@ import ( "github.com/Azure/go-autorest/autorest/azure" "github.com/Azure/go-autorest/autorest/to" - projectv1 "github.com/openshift/api/project/v1" - securityv1 "github.com/openshift/api/security/v1" + appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" @@ -18,6 +17,9 @@ import ( kruntime "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" + projectv1 "github.com/openshift/api/project/v1" + securityv1 "github.com/openshift/api/security/v1" + pkgoperator "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/util/version" diff --git a/pkg/operator/controllers/genevalogging/genevalogging_controller.go b/pkg/operator/controllers/genevalogging/genevalogging_controller.go index 54fe47468d5..ebe82b5073a 100644 --- a/pkg/operator/controllers/genevalogging/genevalogging_controller.go +++ b/pkg/operator/controllers/genevalogging/genevalogging_controller.go @@ -6,8 +6,8 @@ package genevalogging import ( "context" - securityv1 "github.com/openshift/api/security/v1" "github.com/sirupsen/logrus" + appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" @@ -17,6 +17,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" + securityv1 "github.com/openshift/api/security/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/operator/controllers/base" diff --git a/pkg/operator/controllers/genevalogging/genevalogging_test.go b/pkg/operator/controllers/genevalogging/genevalogging_test.go index fa039d5f320..52ee3ae4c64 100644 --- a/pkg/operator/controllers/genevalogging/genevalogging_test.go +++ b/pkg/operator/controllers/genevalogging/genevalogging_test.go @@ -12,11 +12,9 @@ import ( "testing" "github.com/go-test/deep" - configv1 "github.com/openshift/api/config/v1" - operatorv1 "github.com/openshift/api/operator/v1" - securityv1 "github.com/openshift/api/security/v1" "github.com/sirupsen/logrus" "go.uber.org/mock/gomock" + appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -25,6 +23,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake" + configv1 "github.com/openshift/api/config/v1" + operatorv1 "github.com/openshift/api/operator/v1" + securityv1 "github.com/openshift/api/security/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/operator/controllers/base" diff --git a/pkg/operator/controllers/guardrails/guardrails_config.go b/pkg/operator/controllers/guardrails/guardrails_config.go index be4f4cf1bf7..73f420dcba3 100644 --- a/pkg/operator/controllers/guardrails/guardrails_config.go +++ b/pkg/operator/controllers/guardrails/guardrails_config.go @@ -9,10 +9,11 @@ import ( "strings" "time" - configv1 "github.com/openshift/api/config/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + configv1 "github.com/openshift/api/config/v1" + arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/operator/controllers/guardrails/config" "github.com/Azure/ARO-RP/pkg/util/version" diff --git a/pkg/operator/controllers/guardrails/guardrails_controller.go b/pkg/operator/controllers/guardrails/guardrails_controller.go index 0757939758b..b4af07499be 100644 --- a/pkg/operator/controllers/guardrails/guardrails_controller.go +++ b/pkg/operator/controllers/guardrails/guardrails_controller.go @@ -10,6 +10,7 @@ import ( "time" "github.com/sirupsen/logrus" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/kubernetes" diff --git a/pkg/operator/controllers/guardrails/guardrails_controller_test.go b/pkg/operator/controllers/guardrails/guardrails_controller_test.go index e90cc707651..f5f3191a8d8 100644 --- a/pkg/operator/controllers/guardrails/guardrails_controller_test.go +++ b/pkg/operator/controllers/guardrails/guardrails_controller_test.go @@ -11,6 +11,7 @@ import ( "github.com/sirupsen/logrus" "go.uber.org/mock/gomock" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/reconcile" diff --git a/pkg/operator/controllers/guardrails/template_test.go b/pkg/operator/controllers/guardrails/template_test.go index 2d01046b0e8..3030fc252af 100644 --- a/pkg/operator/controllers/guardrails/template_test.go +++ b/pkg/operator/controllers/guardrails/template_test.go @@ -10,6 +10,7 @@ import ( "github.com/go-test/deep" "go.uber.org/mock/gomock" + appsv1 "k8s.io/api/apps/v1" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/operator/controllers/imageconfig/image_controller.go b/pkg/operator/controllers/imageconfig/image_controller.go index 0c2e68699cb..ebeadab1e6d 100644 --- a/pkg/operator/controllers/imageconfig/image_controller.go +++ b/pkg/operator/controllers/imageconfig/image_controller.go @@ -10,8 +10,8 @@ import ( "strings" "github.com/Azure/go-autorest/autorest/azure" - configv1 "github.com/openshift/api/config/v1" "github.com/sirupsen/logrus" + "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/builder" @@ -19,6 +19,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" + configv1 "github.com/openshift/api/config/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/operator/controllers/base" diff --git a/pkg/operator/controllers/imageconfig/image_controller_test.go b/pkg/operator/controllers/imageconfig/image_controller_test.go index 4287bce5576..aeac0677cdc 100644 --- a/pkg/operator/controllers/imageconfig/image_controller_test.go +++ b/pkg/operator/controllers/imageconfig/image_controller_test.go @@ -9,14 +9,16 @@ import ( "testing" "time" - configv1 "github.com/openshift/api/config/v1" - operatorv1 "github.com/openshift/api/operator/v1" "github.com/sirupsen/logrus" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake" + configv1 "github.com/openshift/api/config/v1" + operatorv1 "github.com/openshift/api/operator/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/util/azureclient" diff --git a/pkg/operator/controllers/ingress/ingress_controller.go b/pkg/operator/controllers/ingress/ingress_controller.go index 6c81c333982..6526c000764 100644 --- a/pkg/operator/controllers/ingress/ingress_controller.go +++ b/pkg/operator/controllers/ingress/ingress_controller.go @@ -7,8 +7,8 @@ import ( "context" "github.com/Azure/go-autorest/autorest/to" - operatorv1 "github.com/openshift/api/operator/v1" "github.com/sirupsen/logrus" + "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/builder" @@ -16,6 +16,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" + operatorv1 "github.com/openshift/api/operator/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/operator/controllers/base" diff --git a/pkg/operator/controllers/ingress/ingress_controller_test.go b/pkg/operator/controllers/ingress/ingress_controller_test.go index fe0cd432432..9466d56d87b 100644 --- a/pkg/operator/controllers/ingress/ingress_controller_test.go +++ b/pkg/operator/controllers/ingress/ingress_controller_test.go @@ -9,13 +9,15 @@ import ( "time" "github.com/Azure/go-autorest/autorest/to" - operatorv1 "github.com/openshift/api/operator/v1" "github.com/sirupsen/logrus" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake" + operatorv1 "github.com/openshift/api/operator/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" _ "github.com/Azure/ARO-RP/pkg/util/scheme" diff --git a/pkg/operator/controllers/machine/machine.go b/pkg/operator/controllers/machine/machine.go index d9257f5ec75..102b789eb3b 100644 --- a/pkg/operator/controllers/machine/machine.go +++ b/pkg/operator/controllers/machine/machine.go @@ -8,9 +8,10 @@ import ( "encoding/json" "fmt" - machinev1beta1 "github.com/openshift/api/machine/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" + machinev1beta1 "github.com/openshift/api/machine/v1beta1" + "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/api/validate" _ "github.com/Azure/ARO-RP/pkg/util/scheme" diff --git a/pkg/operator/controllers/machine/machine_controller.go b/pkg/operator/controllers/machine/machine_controller.go index 1a9c37ff2f8..cab7e90d675 100644 --- a/pkg/operator/controllers/machine/machine_controller.go +++ b/pkg/operator/controllers/machine/machine_controller.go @@ -7,14 +7,16 @@ import ( "context" "strings" - machinev1beta1 "github.com/openshift/api/machine/v1beta1" - operatorv1 "github.com/openshift/api/operator/v1" "github.com/sirupsen/logrus" + "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" + machinev1beta1 "github.com/openshift/api/machine/v1beta1" + operatorv1 "github.com/openshift/api/operator/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/util/conditions" diff --git a/pkg/operator/controllers/machine/machine_controller_test.go b/pkg/operator/controllers/machine/machine_controller_test.go index aad4984ff1e..86e6548cb05 100644 --- a/pkg/operator/controllers/machine/machine_controller_test.go +++ b/pkg/operator/controllers/machine/machine_controller_test.go @@ -10,9 +10,8 @@ import ( "testing" "github.com/Azure/go-autorest/autorest/to" - machinev1beta1 "github.com/openshift/api/machine/v1beta1" - operatorv1 "github.com/openshift/api/operator/v1" "github.com/sirupsen/logrus" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kruntime "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" @@ -20,6 +19,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" + machinev1beta1 "github.com/openshift/api/machine/v1beta1" + operatorv1 "github.com/openshift/api/operator/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" _ "github.com/Azure/ARO-RP/pkg/util/scheme" diff --git a/pkg/operator/controllers/machinehealthcheck/machinehealthcheck_controller.go b/pkg/operator/controllers/machinehealthcheck/machinehealthcheck_controller.go index 74c1690a9cb..89af57b8051 100644 --- a/pkg/operator/controllers/machinehealthcheck/machinehealthcheck_controller.go +++ b/pkg/operator/controllers/machinehealthcheck/machinehealthcheck_controller.go @@ -8,10 +8,9 @@ import ( _ "embed" "time" - configv1 "github.com/openshift/api/config/v1" - machinev1beta1 "github.com/openshift/api/machine/v1beta1" monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" "github.com/sirupsen/logrus" + kruntime "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/kubernetes/scheme" @@ -23,6 +22,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" + configv1 "github.com/openshift/api/config/v1" + machinev1beta1 "github.com/openshift/api/machine/v1beta1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/operator/controllers/base" diff --git a/pkg/operator/controllers/machinehealthcheck/machinehealthcheck_controller_test.go b/pkg/operator/controllers/machinehealthcheck/machinehealthcheck_controller_test.go index a17ce84287c..623b7637a10 100644 --- a/pkg/operator/controllers/machinehealthcheck/machinehealthcheck_controller_test.go +++ b/pkg/operator/controllers/machinehealthcheck/machinehealthcheck_controller_test.go @@ -9,16 +9,18 @@ import ( "testing" "time" - configv1 "github.com/openshift/api/config/v1" - machinev1beta1 "github.com/openshift/api/machine/v1beta1" - operatorv1 "github.com/openshift/api/operator/v1" "github.com/sirupsen/logrus" "go.uber.org/mock/gomock" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kruntime "k8s.io/apimachinery/pkg/runtime" ctrl "sigs.k8s.io/controller-runtime" ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake" + configv1 "github.com/openshift/api/config/v1" + machinev1beta1 "github.com/openshift/api/machine/v1beta1" + operatorv1 "github.com/openshift/api/operator/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" mock_dynamichelper "github.com/Azure/ARO-RP/pkg/util/mocks/dynamichelper" diff --git a/pkg/operator/controllers/machineset/machineset_controller.go b/pkg/operator/controllers/machineset/machineset_controller.go index c78ed4cbd2a..6f1d3051467 100644 --- a/pkg/operator/controllers/machineset/machineset_controller.go +++ b/pkg/operator/controllers/machineset/machineset_controller.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/Azure/go-autorest/autorest/to" - machinev1beta1 "github.com/openshift/api/machine/v1beta1" "github.com/sirupsen/logrus" + "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" @@ -17,6 +17,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" + machinev1beta1 "github.com/openshift/api/machine/v1beta1" + "github.com/Azure/ARO-RP/pkg/operator" "github.com/Azure/ARO-RP/pkg/operator/controllers/base" "github.com/Azure/ARO-RP/pkg/operator/predicates" diff --git a/pkg/operator/controllers/machineset/machineset_controller_test.go b/pkg/operator/controllers/machineset/machineset_controller_test.go index 257a8c7511d..a24cfee23ee 100644 --- a/pkg/operator/controllers/machineset/machineset_controller_test.go +++ b/pkg/operator/controllers/machineset/machineset_controller_test.go @@ -10,15 +10,17 @@ import ( "time" "github.com/Azure/go-autorest/autorest/to" - machinev1beta1 "github.com/openshift/api/machine/v1beta1" - operatorv1 "github.com/openshift/api/operator/v1" "github.com/sirupsen/logrus" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake" + machinev1beta1 "github.com/openshift/api/machine/v1beta1" + operatorv1 "github.com/openshift/api/operator/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/util/cmp" diff --git a/pkg/operator/controllers/monitoring/monitoring_controller.go b/pkg/operator/controllers/monitoring/monitoring_controller.go index 1cc31dd5675..bb4297dd014 100644 --- a/pkg/operator/controllers/monitoring/monitoring_controller.go +++ b/pkg/operator/controllers/monitoring/monitoring_controller.go @@ -9,6 +9,7 @@ import ( "github.com/sirupsen/logrus" "github.com/ugorji/go/codec" + corev1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/operator/controllers/monitoring/monitoring_controller_test.go b/pkg/operator/controllers/monitoring/monitoring_controller_test.go index 1b0065efc46..d5c7345cdad 100644 --- a/pkg/operator/controllers/monitoring/monitoring_controller_test.go +++ b/pkg/operator/controllers/monitoring/monitoring_controller_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - operatorv1 "github.com/openshift/api/operator/v1" "github.com/sirupsen/logrus" "github.com/ugorji/go/codec" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" @@ -19,6 +19,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake" + operatorv1 "github.com/openshift/api/operator/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/operator/controllers/base" diff --git a/pkg/operator/controllers/muo/muo_controller.go b/pkg/operator/controllers/muo/muo_controller.go index 0e05fe8314d..1bfb4504492 100644 --- a/pkg/operator/controllers/muo/muo_controller.go +++ b/pkg/operator/controllers/muo/muo_controller.go @@ -11,6 +11,7 @@ import ( "time" "github.com/sirupsen/logrus" + corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" diff --git a/pkg/operator/controllers/muo/muo_controller_test.go b/pkg/operator/controllers/muo/muo_controller_test.go index f61c98a160c..967a4e54906 100644 --- a/pkg/operator/controllers/muo/muo_controller_test.go +++ b/pkg/operator/controllers/muo/muo_controller_test.go @@ -9,14 +9,16 @@ import ( "testing" "time" - configv1 "github.com/openshift/api/config/v1" "github.com/sirupsen/logrus" "go.uber.org/mock/gomock" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/reconcile" + configv1 "github.com/openshift/api/config/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/operator/controllers/muo/config" diff --git a/pkg/operator/controllers/muo/template_test.go b/pkg/operator/controllers/muo/template_test.go index 120079e8193..333e2fa4e4b 100644 --- a/pkg/operator/controllers/muo/template_test.go +++ b/pkg/operator/controllers/muo/template_test.go @@ -10,6 +10,7 @@ import ( "github.com/go-test/deep" "go.uber.org/mock/gomock" + appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/meta" diff --git a/pkg/operator/controllers/node/node_controller.go b/pkg/operator/controllers/node/node_controller.go index 10dbf5ce834..e7207f7cc86 100644 --- a/pkg/operator/controllers/node/node_controller.go +++ b/pkg/operator/controllers/node/node_controller.go @@ -10,6 +10,7 @@ import ( "time" "github.com/sirupsen/logrus" + corev1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/operator/controllers/node/node_controller_test.go b/pkg/operator/controllers/node/node_controller_test.go index e5f1d74781c..231c980a5dc 100644 --- a/pkg/operator/controllers/node/node_controller_test.go +++ b/pkg/operator/controllers/node/node_controller_test.go @@ -10,14 +10,16 @@ import ( "testing" "time" - operatorv1 "github.com/openshift/api/operator/v1" "github.com/sirupsen/logrus" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" ctrl "sigs.k8s.io/controller-runtime" ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake" + operatorv1 "github.com/openshift/api/operator/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/util/cmp" diff --git a/pkg/operator/controllers/previewfeature/nsgflowlogs/nsgflowlogs_test.go b/pkg/operator/controllers/previewfeature/nsgflowlogs/nsgflowlogs_test.go index ddfcbb1a389..0cb3e4d22df 100644 --- a/pkg/operator/controllers/previewfeature/nsgflowlogs/nsgflowlogs_test.go +++ b/pkg/operator/controllers/previewfeature/nsgflowlogs/nsgflowlogs_test.go @@ -10,6 +10,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v2" "github.com/Azure/go-autorest/autorest/to" "go.uber.org/mock/gomock" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" aropreviewv1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/preview.aro.openshift.io/v1alpha1" diff --git a/pkg/operator/controllers/previewfeature/previewfeature_controller.go b/pkg/operator/controllers/previewfeature/previewfeature_controller.go index c65a9fb7a06..9d2cc286b61 100644 --- a/pkg/operator/controllers/previewfeature/previewfeature_controller.go +++ b/pkg/operator/controllers/previewfeature/previewfeature_controller.go @@ -9,6 +9,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azidentity" "github.com/Azure/go-autorest/autorest/azure" "github.com/sirupsen/logrus" + "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/builder" diff --git a/pkg/operator/controllers/pullsecret/pullsecret_controller.go b/pkg/operator/controllers/pullsecret/pullsecret_controller.go index 9f5957a5625..53008b5ecb6 100644 --- a/pkg/operator/controllers/pullsecret/pullsecret_controller.go +++ b/pkg/operator/controllers/pullsecret/pullsecret_controller.go @@ -16,6 +16,7 @@ import ( "errors" "github.com/sirupsen/logrus" + corev1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/operator/controllers/pullsecret/pullsecret_controller_test.go b/pkg/operator/controllers/pullsecret/pullsecret_controller_test.go index eaca4b83603..78679165e29 100644 --- a/pkg/operator/controllers/pullsecret/pullsecret_controller_test.go +++ b/pkg/operator/controllers/pullsecret/pullsecret_controller_test.go @@ -9,9 +9,9 @@ import ( "reflect" "testing" - operatorv1 "github.com/openshift/api/operator/v1" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" @@ -19,6 +19,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake" + operatorv1 "github.com/openshift/api/operator/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/util/cmp" diff --git a/pkg/operator/controllers/rbac/rbac_controller.go b/pkg/operator/controllers/rbac/rbac_controller.go index d4d57d006ae..f848500a47e 100644 --- a/pkg/operator/controllers/rbac/rbac_controller.go +++ b/pkg/operator/controllers/rbac/rbac_controller.go @@ -7,6 +7,7 @@ import ( "context" "github.com/sirupsen/logrus" + rbacv1 "k8s.io/api/rbac/v1" kruntime "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/operator/controllers/routefix/routefix.go b/pkg/operator/controllers/routefix/routefix.go index cd2d59eea3b..6fababe8206 100644 --- a/pkg/operator/controllers/routefix/routefix.go +++ b/pkg/operator/controllers/routefix/routefix.go @@ -7,8 +7,7 @@ import ( "context" "github.com/Azure/go-autorest/autorest/to" - projectv1 "github.com/openshift/api/project/v1" - securityv1 "github.com/openshift/api/security/v1" + appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" @@ -17,6 +16,9 @@ import ( kruntime "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" + projectv1 "github.com/openshift/api/project/v1" + securityv1 "github.com/openshift/api/security/v1" + arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" ) diff --git a/pkg/operator/controllers/routefix/routefix_controller.go b/pkg/operator/controllers/routefix/routefix_controller.go index 38e42c974a3..ab390c86533 100644 --- a/pkg/operator/controllers/routefix/routefix_controller.go +++ b/pkg/operator/controllers/routefix/routefix_controller.go @@ -6,9 +6,8 @@ package routefix import ( "context" - configv1 "github.com/openshift/api/config/v1" - securityv1 "github.com/openshift/api/security/v1" "github.com/sirupsen/logrus" + appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" @@ -21,6 +20,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" + configv1 "github.com/openshift/api/config/v1" + securityv1 "github.com/openshift/api/security/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/operator/predicates" diff --git a/pkg/operator/controllers/storageaccounts/storageaccount_controller.go b/pkg/operator/controllers/storageaccounts/storageaccount_controller.go index 2aa73ca91d1..505ce5e390d 100644 --- a/pkg/operator/controllers/storageaccounts/storageaccount_controller.go +++ b/pkg/operator/controllers/storageaccounts/storageaccount_controller.go @@ -7,8 +7,8 @@ import ( "context" "github.com/Azure/go-autorest/autorest/azure" - machinev1beta1 "github.com/openshift/api/machine/v1beta1" "github.com/sirupsen/logrus" + "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/builder" @@ -18,6 +18,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" + machinev1beta1 "github.com/openshift/api/machine/v1beta1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/operator/predicates" diff --git a/pkg/operator/controllers/storageaccounts/storageaccounts.go b/pkg/operator/controllers/storageaccounts/storageaccounts.go index b6140dc87ca..6fec26c6c42 100644 --- a/pkg/operator/controllers/storageaccounts/storageaccounts.go +++ b/pkg/operator/controllers/storageaccounts/storageaccounts.go @@ -10,9 +10,11 @@ import ( mgmtstorage "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2021-09-01/storage" "github.com/Azure/go-autorest/autorest/to" - imageregistryv1 "github.com/openshift/api/imageregistry/v1" + "k8s.io/apimachinery/pkg/types" + imageregistryv1 "github.com/openshift/api/imageregistry/v1" + "github.com/Azure/ARO-RP/pkg/util/azureerrors" "github.com/Azure/ARO-RP/pkg/util/stringutils" ) diff --git a/pkg/operator/controllers/storageaccounts/storageaccounts_test.go b/pkg/operator/controllers/storageaccounts/storageaccounts_test.go index 688c7e65446..0adc3fbb327 100644 --- a/pkg/operator/controllers/storageaccounts/storageaccounts_test.go +++ b/pkg/operator/controllers/storageaccounts/storageaccounts_test.go @@ -13,12 +13,14 @@ import ( mgmtstorage "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2021-09-01/storage" "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/to" - imageregistryv1 "github.com/openshift/api/imageregistry/v1" "github.com/sirupsen/logrus" "go.uber.org/mock/gomock" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client/fake" + imageregistryv1 "github.com/openshift/api/imageregistry/v1" + "github.com/Azure/ARO-RP/pkg/api" apisubnet "github.com/Azure/ARO-RP/pkg/api/util/subnet" "github.com/Azure/ARO-RP/pkg/operator" diff --git a/pkg/operator/controllers/subnets/subnet_controller_test.go b/pkg/operator/controllers/subnets/subnet_controller_test.go index 38505184c64..282b4a77212 100644 --- a/pkg/operator/controllers/subnets/subnet_controller_test.go +++ b/pkg/operator/controllers/subnets/subnet_controller_test.go @@ -15,6 +15,7 @@ import ( "github.com/Azure/go-autorest/autorest/to" "github.com/sirupsen/logrus" "go.uber.org/mock/gomock" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client/fake" diff --git a/pkg/operator/controllers/subnets/subnets_controller.go b/pkg/operator/controllers/subnets/subnets_controller.go index 5329ba85ffa..966df59f959 100644 --- a/pkg/operator/controllers/subnets/subnets_controller.go +++ b/pkg/operator/controllers/subnets/subnets_controller.go @@ -9,8 +9,8 @@ import ( "strings" "github.com/Azure/go-autorest/autorest/azure" - machinev1beta1 "github.com/openshift/api/machine/v1beta1" "github.com/sirupsen/logrus" + "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/builder" @@ -20,6 +20,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" + machinev1beta1 "github.com/openshift/api/machine/v1beta1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/operator/predicates" diff --git a/pkg/operator/controllers/workaround/systemreserved.go b/pkg/operator/controllers/workaround/systemreserved.go index 08fcecfe2e7..59ae2ceadc8 100644 --- a/pkg/operator/controllers/workaround/systemreserved.go +++ b/pkg/operator/controllers/workaround/systemreserved.go @@ -7,8 +7,8 @@ import ( "context" "encoding/json" - mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" "github.com/sirupsen/logrus" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kruntime "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" @@ -16,6 +16,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/util/version" diff --git a/pkg/operator/controllers/workaround/systemreserved_test.go b/pkg/operator/controllers/workaround/systemreserved_test.go index 4f2a52953ff..74a41e68f96 100644 --- a/pkg/operator/controllers/workaround/systemreserved_test.go +++ b/pkg/operator/controllers/workaround/systemreserved_test.go @@ -8,14 +8,16 @@ import ( "reflect" "testing" - mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" "go.uber.org/mock/gomock" + kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kruntime "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake" + mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" + "github.com/Azure/ARO-RP/pkg/util/cmp" utillog "github.com/Azure/ARO-RP/pkg/util/log" _ "github.com/Azure/ARO-RP/pkg/util/scheme" diff --git a/pkg/operator/controllers/workaround/workaround_controller.go b/pkg/operator/controllers/workaround/workaround_controller.go index 37571b1421c..4fed24e6b0e 100644 --- a/pkg/operator/controllers/workaround/workaround_controller.go +++ b/pkg/operator/controllers/workaround/workaround_controller.go @@ -7,8 +7,8 @@ import ( "context" "time" - configv1 "github.com/openshift/api/config/v1" "github.com/sirupsen/logrus" + "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/builder" @@ -18,6 +18,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" + configv1 "github.com/openshift/api/config/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/operator/predicates" diff --git a/pkg/operator/controllers/workaround/workaround_controller_test.go b/pkg/operator/controllers/workaround/workaround_controller_test.go index 415739cb7a9..c882f7cffdc 100644 --- a/pkg/operator/controllers/workaround/workaround_controller_test.go +++ b/pkg/operator/controllers/workaround/workaround_controller_test.go @@ -10,13 +10,15 @@ import ( "testing" "time" - configv1 "github.com/openshift/api/config/v1" "go.uber.org/mock/gomock" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ctrl "sigs.k8s.io/controller-runtime" ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/reconcile" + configv1 "github.com/openshift/api/config/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" utillog "github.com/Azure/ARO-RP/pkg/util/log" diff --git a/pkg/operator/deploy/deploy.go b/pkg/operator/deploy/deploy.go index 94135518e5b..69e720c5551 100644 --- a/pkg/operator/deploy/deploy.go +++ b/pkg/operator/deploy/deploy.go @@ -16,8 +16,8 @@ import ( "time" "github.com/hashicorp/go-multierror" - operatorclient "github.com/openshift/client-go/operator/clientset/versioned" "github.com/sirupsen/logrus" + corev1 "k8s.io/api/core/v1" extensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" extensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" @@ -34,6 +34,8 @@ import ( "k8s.io/client-go/util/retry" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + operatorclient "github.com/openshift/client-go/operator/clientset/versioned" + "github.com/Azure/ARO-RP/pkg/api" apisubnet "github.com/Azure/ARO-RP/pkg/api/util/subnet" "github.com/Azure/ARO-RP/pkg/env" diff --git a/pkg/operator/deploy/deploy_test.go b/pkg/operator/deploy/deploy_test.go index d4852a116d1..8587793af81 100644 --- a/pkg/operator/deploy/deploy_test.go +++ b/pkg/operator/deploy/deploy_test.go @@ -9,11 +9,9 @@ import ( "reflect" "testing" - configv1 "github.com/openshift/api/config/v1" - operatorv1 "github.com/openshift/api/operator/v1" - operatorfake "github.com/openshift/client-go/operator/clientset/versioned/fake" "github.com/sirupsen/logrus" "go.uber.org/mock/gomock" + appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -22,6 +20,10 @@ import ( ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/yaml" + configv1 "github.com/openshift/api/config/v1" + operatorv1 "github.com/openshift/api/operator/v1" + operatorfake "github.com/openshift/client-go/operator/clientset/versioned/fake" + "github.com/Azure/ARO-RP/pkg/api" pkgoperator "github.com/Azure/ARO-RP/pkg/operator" "github.com/Azure/ARO-RP/pkg/util/clienthelper" diff --git a/pkg/operator/helpers.go b/pkg/operator/helpers.go index 9c31390c8a2..421b42a27aa 100644 --- a/pkg/operator/helpers.go +++ b/pkg/operator/helpers.go @@ -6,10 +6,11 @@ package operator import ( "context" - configv1 "github.com/openshift/api/config/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" + configv1 "github.com/openshift/api/config/v1" + arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/util/version" ) diff --git a/pkg/operator/helpers_test.go b/pkg/operator/helpers_test.go index 3ba62c7b792..11cf8a13473 100644 --- a/pkg/operator/helpers_test.go +++ b/pkg/operator/helpers_test.go @@ -7,10 +7,11 @@ import ( "context" "testing" - configv1 "github.com/openshift/api/config/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake" + configv1 "github.com/openshift/api/config/v1" + arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" _ "github.com/Azure/ARO-RP/pkg/util/scheme" utilerror "github.com/Azure/ARO-RP/test/util/error" diff --git a/pkg/portal/cluster/clusteroperators.go b/pkg/portal/cluster/clusteroperators.go index 0a32d057f56..fa3ad7f869d 100644 --- a/pkg/portal/cluster/clusteroperators.go +++ b/pkg/portal/cluster/clusteroperators.go @@ -6,8 +6,9 @@ package cluster import ( "context" - configv1 "github.com/openshift/api/config/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + configv1 "github.com/openshift/api/config/v1" ) // Type for listing different operator conditions such as "progressing", "degraded" etc diff --git a/pkg/portal/cluster/clusteroperators_test.go b/pkg/portal/cluster/clusteroperators_test.go index 70ce80b37dc..61603c4cb88 100644 --- a/pkg/portal/cluster/clusteroperators_test.go +++ b/pkg/portal/cluster/clusteroperators_test.go @@ -10,9 +10,11 @@ import ( "testing" "github.com/go-test/deep" + + kruntime "k8s.io/apimachinery/pkg/runtime" + configv1 "github.com/openshift/api/config/v1" configfake "github.com/openshift/client-go/config/clientset/versioned/fake" - kruntime "k8s.io/apimachinery/pkg/runtime" testlog "github.com/Azure/ARO-RP/test/util/log" ) diff --git a/pkg/portal/cluster/fetcher.go b/pkg/portal/cluster/fetcher.go index 3960bfb9a92..f24835c1895 100644 --- a/pkg/portal/cluster/fetcher.go +++ b/pkg/portal/cluster/fetcher.go @@ -8,11 +8,13 @@ import ( "net/http" "time" - configclient "github.com/openshift/client-go/config/clientset/versioned" - machineclient "github.com/openshift/client-go/machine/clientset/versioned" "github.com/sirupsen/logrus" + "k8s.io/client-go/kubernetes" + configclient "github.com/openshift/client-go/config/clientset/versioned" + machineclient "github.com/openshift/client-go/machine/clientset/versioned" + "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/proxy" "github.com/Azure/ARO-RP/pkg/util/restconfig" diff --git a/pkg/portal/cluster/machines.go b/pkg/portal/cluster/machines.go index 4107aeaa932..861c60d0804 100644 --- a/pkg/portal/cluster/machines.go +++ b/pkg/portal/cluster/machines.go @@ -6,8 +6,9 @@ package cluster import ( "context" - machinev1beta1 "github.com/openshift/api/machine/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + machinev1beta1 "github.com/openshift/api/machine/v1beta1" ) type MachinesInformation struct { diff --git a/pkg/portal/cluster/machines_test.go b/pkg/portal/cluster/machines_test.go index a98b32f5a8a..f87da6991d7 100644 --- a/pkg/portal/cluster/machines_test.go +++ b/pkg/portal/cluster/machines_test.go @@ -11,9 +11,11 @@ import ( "testing" "github.com/go-test/deep" + + kruntime "k8s.io/apimachinery/pkg/runtime" + machinev1beta1 "github.com/openshift/api/machine/v1beta1" machinefake "github.com/openshift/client-go/machine/clientset/versioned/fake" - kruntime "k8s.io/apimachinery/pkg/runtime" testlog "github.com/Azure/ARO-RP/test/util/log" ) diff --git a/pkg/portal/cluster/machinesets.go b/pkg/portal/cluster/machinesets.go index 6940862acaa..bcb1b4f164e 100644 --- a/pkg/portal/cluster/machinesets.go +++ b/pkg/portal/cluster/machinesets.go @@ -7,8 +7,9 @@ import ( "context" "encoding/json" - machinev1beta1 "github.com/openshift/api/machine/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + machinev1beta1 "github.com/openshift/api/machine/v1beta1" ) type OsDiskManagedDisk struct { diff --git a/pkg/portal/cluster/machinesets_test.go b/pkg/portal/cluster/machinesets_test.go index 71951283e5f..f6f1eb7a786 100644 --- a/pkg/portal/cluster/machinesets_test.go +++ b/pkg/portal/cluster/machinesets_test.go @@ -11,9 +11,11 @@ import ( "time" "github.com/go-test/deep" + + kruntime "k8s.io/apimachinery/pkg/runtime" + machinev1beta1 "github.com/openshift/api/machine/v1beta1" machinefake "github.com/openshift/client-go/machine/clientset/versioned/fake" - kruntime "k8s.io/apimachinery/pkg/runtime" testlog "github.com/Azure/ARO-RP/test/util/log" ) diff --git a/pkg/portal/cluster/nodes_test.go b/pkg/portal/cluster/nodes_test.go index 46bfd7a6e85..9624dbb845b 100644 --- a/pkg/portal/cluster/nodes_test.go +++ b/pkg/portal/cluster/nodes_test.go @@ -11,6 +11,7 @@ import ( "testing" "github.com/go-test/deep" + corev1 "k8s.io/api/core/v1" kruntime "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes/fake" diff --git a/pkg/portal/kubeconfig/kubeconfig.go b/pkg/portal/kubeconfig/kubeconfig.go index 478cc243893..6ab6b0da4ff 100644 --- a/pkg/portal/kubeconfig/kubeconfig.go +++ b/pkg/portal/kubeconfig/kubeconfig.go @@ -15,6 +15,7 @@ import ( "time" "github.com/sirupsen/logrus" + clientcmdv1 "k8s.io/client-go/tools/clientcmd/api/v1" "github.com/Azure/ARO-RP/pkg/api" diff --git a/pkg/portal/kubeconfig/proxy_test.go b/pkg/portal/kubeconfig/proxy_test.go index 9f539a4f956..109b7547905 100644 --- a/pkg/portal/kubeconfig/proxy_test.go +++ b/pkg/portal/kubeconfig/proxy_test.go @@ -17,6 +17,7 @@ import ( "github.com/gorilla/mux" "go.uber.org/mock/gomock" + clientcmdv1 "k8s.io/client-go/tools/clientcmd/api/v1" "github.com/Azure/ARO-RP/pkg/api" diff --git a/pkg/portal/prometheus/proxy_test.go b/pkg/portal/prometheus/proxy_test.go index d1b908c5b44..17d9a554b6e 100644 --- a/pkg/portal/prometheus/proxy_test.go +++ b/pkg/portal/prometheus/proxy_test.go @@ -23,6 +23,7 @@ import ( "github.com/gorilla/mux" "github.com/sirupsen/logrus" "go.uber.org/mock/gomock" + corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/httpstream" "k8s.io/apimachinery/pkg/util/httpstream/spdy" diff --git a/pkg/portal/security_test.go b/pkg/portal/security_test.go index 3009f35c121..223655ef4ad 100644 --- a/pkg/portal/security_test.go +++ b/pkg/portal/security_test.go @@ -19,6 +19,7 @@ import ( "github.com/gorilla/sessions" "github.com/sirupsen/logrus" "go.uber.org/mock/gomock" + "k8s.io/utils/strings/slices" "github.com/Azure/ARO-RP/pkg/database" diff --git a/pkg/swagger/paths.go b/pkg/swagger/paths.go index aab30bcc8ed..64b25757444 100644 --- a/pkg/swagger/paths.go +++ b/pkg/swagger/paths.go @@ -9,6 +9,7 @@ import ( "golang.org/x/text/cases" "golang.org/x/text/language" + "k8s.io/utils/strings/slices" ) diff --git a/pkg/util/arm/deploy_test.go b/pkg/util/arm/deploy_test.go index 5db199a5b0d..95e5b096f21 100644 --- a/pkg/util/arm/deploy_test.go +++ b/pkg/util/arm/deploy_test.go @@ -12,6 +12,7 @@ import ( "github.com/Azure/go-autorest/autorest/azure" "github.com/sirupsen/logrus" "go.uber.org/mock/gomock" + "k8s.io/apimachinery/pkg/util/wait" mock_features "github.com/Azure/ARO-RP/pkg/util/mocks/azureclient/mgmt/features" diff --git a/pkg/util/azureclient/mgmt/features/deployments_addons.go b/pkg/util/azureclient/mgmt/features/deployments_addons.go index 5942b929b3a..8f8947bedf4 100644 --- a/pkg/util/azureclient/mgmt/features/deployments_addons.go +++ b/pkg/util/azureclient/mgmt/features/deployments_addons.go @@ -8,6 +8,7 @@ import ( "fmt" mgmtfeatures "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-07-01/features" + "k8s.io/apimachinery/pkg/util/wait" ) diff --git a/pkg/util/clienthelper/clienthelper.go b/pkg/util/clienthelper/clienthelper.go index 2593a83f3f3..9c00f21488f 100644 --- a/pkg/util/clienthelper/clienthelper.go +++ b/pkg/util/clienthelper/clienthelper.go @@ -11,11 +11,9 @@ import ( "strings" "github.com/go-test/deep" - machinev1beta1 "github.com/openshift/api/machine/v1beta1" - hivev1 "github.com/openshift/hive/apis/hive/v1" - mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" "github.com/sirupsen/logrus" "golang.org/x/exp/maps" + appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" extensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" @@ -30,6 +28,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/apiutil" + machinev1beta1 "github.com/openshift/api/machine/v1beta1" + hivev1 "github.com/openshift/hive/apis/hive/v1" + mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" + arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" _ "github.com/Azure/ARO-RP/pkg/util/scheme" ) diff --git a/pkg/util/clienthelper/clienthelper_test.go b/pkg/util/clienthelper/clienthelper_test.go index b41b1827017..94ef7f34bdd 100644 --- a/pkg/util/clienthelper/clienthelper_test.go +++ b/pkg/util/clienthelper/clienthelper_test.go @@ -12,9 +12,8 @@ import ( "github.com/Azure/go-autorest/autorest/to" "github.com/go-test/deep" - machinev1beta1 "github.com/openshift/api/machine/v1beta1" - mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" "github.com/sirupsen/logrus" + admissionregistrationv1 "k8s.io/api/admissionregistration/v1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" @@ -29,6 +28,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" + machinev1beta1 "github.com/openshift/api/machine/v1beta1" + mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" + arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/util/cmp" testclienthelper "github.com/Azure/ARO-RP/test/util/clienthelper" diff --git a/pkg/util/clienthelper/createorder.go b/pkg/util/clienthelper/createorder.go index 2a0040cef7f..a1d1fef23ae 100644 --- a/pkg/util/clienthelper/createorder.go +++ b/pkg/util/clienthelper/createorder.go @@ -6,11 +6,12 @@ package clienthelper import ( "reflect" - securityv1 "github.com/openshift/api/security/v1" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" extensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" kruntime "k8s.io/apimachinery/pkg/runtime" + + securityv1 "github.com/openshift/api/security/v1" ) // rather than list every object, just list the ones whose creation really has diff --git a/pkg/util/clienthelper/createorder_test.go b/pkg/util/clienthelper/createorder_test.go index ce63f82d87f..2007dd9e552 100644 --- a/pkg/util/clienthelper/createorder_test.go +++ b/pkg/util/clienthelper/createorder_test.go @@ -8,10 +8,11 @@ import ( "sort" "testing" - securityv1 "github.com/openshift/api/security/v1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" kruntime "k8s.io/apimachinery/pkg/runtime" + + securityv1 "github.com/openshift/api/security/v1" ) func TestCreateOrder(t *testing.T) { diff --git a/pkg/util/cluster/cluster.go b/pkg/util/cluster/cluster.go index 826af71b36f..609708356d6 100644 --- a/pkg/util/cluster/cluster.go +++ b/pkg/util/cluster/cluster.go @@ -29,6 +29,7 @@ import ( "github.com/Azure/go-autorest/autorest/to" "github.com/jongio/azidext/go/azidext" "github.com/sirupsen/logrus" + "k8s.io/apimachinery/pkg/util/wait" "github.com/Azure/ARO-RP/pkg/api" diff --git a/pkg/util/clusterauthorizer/authorizer.go b/pkg/util/clusterauthorizer/authorizer.go index 1ee120cc1b3..b54d895844e 100644 --- a/pkg/util/clusterauthorizer/authorizer.go +++ b/pkg/util/clusterauthorizer/authorizer.go @@ -13,6 +13,7 @@ import ( "github.com/Azure/go-autorest/autorest" "github.com/jongio/azidext/go/azidext" "github.com/sirupsen/logrus" + "sigs.k8s.io/controller-runtime/pkg/client" "github.com/Azure/ARO-RP/pkg/api" diff --git a/pkg/util/clusterauthorizer/authorizer_test.go b/pkg/util/clusterauthorizer/authorizer_test.go index 83f22e8a1d0..a77d4d86a4e 100644 --- a/pkg/util/clusterauthorizer/authorizer_test.go +++ b/pkg/util/clusterauthorizer/authorizer_test.go @@ -7,6 +7,7 @@ import ( "testing" "github.com/sirupsen/logrus" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake" diff --git a/pkg/util/clusterdata/cluster_version.go b/pkg/util/clusterdata/cluster_version.go index 6c0d3bd7c3a..e2d4dedbf67 100644 --- a/pkg/util/clusterdata/cluster_version.go +++ b/pkg/util/clusterdata/cluster_version.go @@ -6,13 +6,15 @@ package clusterdata import ( "context" - configclient "github.com/openshift/client-go/config/clientset/versioned" - machineclient "github.com/openshift/client-go/machine/clientset/versioned" - operatorclient "github.com/openshift/client-go/operator/clientset/versioned" "github.com/sirupsen/logrus" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" + configclient "github.com/openshift/client-go/config/clientset/versioned" + machineclient "github.com/openshift/client-go/machine/clientset/versioned" + operatorclient "github.com/openshift/client-go/operator/clientset/versioned" + "github.com/Azure/ARO-RP/pkg/api" ) diff --git a/pkg/util/clusterdata/cluster_version_test.go b/pkg/util/clusterdata/cluster_version_test.go index f4e11a2914b..a342d3d1458 100644 --- a/pkg/util/clusterdata/cluster_version_test.go +++ b/pkg/util/clusterdata/cluster_version_test.go @@ -8,11 +8,13 @@ import ( "reflect" "testing" + "github.com/sirupsen/logrus" + + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + configv1 "github.com/openshift/api/config/v1" configclient "github.com/openshift/client-go/config/clientset/versioned" configfake "github.com/openshift/client-go/config/clientset/versioned/fake" - "github.com/sirupsen/logrus" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/util/cmp" diff --git a/pkg/util/clusterdata/clusterdata.go b/pkg/util/clusterdata/clusterdata.go index 9b499ff03eb..04806c1f68e 100644 --- a/pkg/util/clusterdata/clusterdata.go +++ b/pkg/util/clusterdata/clusterdata.go @@ -9,11 +9,13 @@ import ( "sync" "time" + "github.com/sirupsen/logrus" + + "k8s.io/client-go/kubernetes" + configclient "github.com/openshift/client-go/config/clientset/versioned" machineclient "github.com/openshift/client-go/machine/clientset/versioned" operatorclient "github.com/openshift/client-go/operator/clientset/versioned" - "github.com/sirupsen/logrus" - "k8s.io/client-go/kubernetes" "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/metrics" diff --git a/pkg/util/clusterdata/ingress_profile.go b/pkg/util/clusterdata/ingress_profile.go index 96bca225290..81828d3429b 100644 --- a/pkg/util/clusterdata/ingress_profile.go +++ b/pkg/util/clusterdata/ingress_profile.go @@ -7,13 +7,15 @@ import ( "context" "sort" + "github.com/sirupsen/logrus" + + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/kubernetes" + operatorv1 "github.com/openshift/api/operator/v1" configclient "github.com/openshift/client-go/config/clientset/versioned" machineclient "github.com/openshift/client-go/machine/clientset/versioned" operatorclient "github.com/openshift/client-go/operator/clientset/versioned" - "github.com/sirupsen/logrus" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/kubernetes" "github.com/Azure/ARO-RP/pkg/api" ) diff --git a/pkg/util/clusterdata/ingress_profile_test.go b/pkg/util/clusterdata/ingress_profile_test.go index 70c4e6b3ada..b2818a53c68 100644 --- a/pkg/util/clusterdata/ingress_profile_test.go +++ b/pkg/util/clusterdata/ingress_profile_test.go @@ -8,15 +8,17 @@ import ( "reflect" "testing" - operatorv1 "github.com/openshift/api/operator/v1" - operatorclient "github.com/openshift/client-go/operator/clientset/versioned" - operatorfake "github.com/openshift/client-go/operator/clientset/versioned/fake" "github.com/sirupsen/logrus" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/fake" + operatorv1 "github.com/openshift/api/operator/v1" + operatorclient "github.com/openshift/client-go/operator/clientset/versioned" + operatorfake "github.com/openshift/client-go/operator/clientset/versioned/fake" + "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/util/cmp" ) diff --git a/pkg/util/clusterdata/service_principal.go b/pkg/util/clusterdata/service_principal.go index 081e052fd51..7d80893e778 100644 --- a/pkg/util/clusterdata/service_principal.go +++ b/pkg/util/clusterdata/service_principal.go @@ -6,13 +6,15 @@ package clusterdata import ( "context" - configclient "github.com/openshift/client-go/config/clientset/versioned" - machineclient "github.com/openshift/client-go/machine/clientset/versioned" - operatorclient "github.com/openshift/client-go/operator/clientset/versioned" "github.com/sirupsen/logrus" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" + configclient "github.com/openshift/client-go/config/clientset/versioned" + machineclient "github.com/openshift/client-go/machine/clientset/versioned" + operatorclient "github.com/openshift/client-go/operator/clientset/versioned" + "github.com/Azure/ARO-RP/pkg/api" ) diff --git a/pkg/util/clusterdata/service_principal_test.go b/pkg/util/clusterdata/service_principal_test.go index 9a0b95f3e73..01343d3ca8d 100644 --- a/pkg/util/clusterdata/service_principal_test.go +++ b/pkg/util/clusterdata/service_principal_test.go @@ -9,6 +9,7 @@ import ( "testing" "github.com/sirupsen/logrus" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" diff --git a/pkg/util/clusterdata/worker_profile.go b/pkg/util/clusterdata/worker_profile.go index ca00635f8be..0b71c9012c0 100644 --- a/pkg/util/clusterdata/worker_profile.go +++ b/pkg/util/clusterdata/worker_profile.go @@ -10,13 +10,15 @@ import ( "sort" "github.com/Azure/go-autorest/autorest/azure" + "github.com/sirupsen/logrus" + + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/kubernetes" + machinev1beta1 "github.com/openshift/api/machine/v1beta1" configclient "github.com/openshift/client-go/config/clientset/versioned" machineclient "github.com/openshift/client-go/machine/clientset/versioned" operatorclient "github.com/openshift/client-go/operator/clientset/versioned" - "github.com/sirupsen/logrus" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/kubernetes" "github.com/Azure/ARO-RP/pkg/api" _ "github.com/Azure/ARO-RP/pkg/util/scheme" diff --git a/pkg/util/clusterdata/worker_profile_test.go b/pkg/util/clusterdata/worker_profile_test.go index f89452bec2c..dd51435e9c0 100644 --- a/pkg/util/clusterdata/worker_profile_test.go +++ b/pkg/util/clusterdata/worker_profile_test.go @@ -11,14 +11,16 @@ import ( "testing" "github.com/Azure/go-autorest/autorest/to" - machinev1beta1 "github.com/openshift/api/machine/v1beta1" - machineclient "github.com/openshift/client-go/machine/clientset/versioned" - machinefake "github.com/openshift/client-go/machine/clientset/versioned/fake" "github.com/sirupsen/logrus" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kruntime "k8s.io/apimachinery/pkg/runtime" ktesting "k8s.io/client-go/testing" + machinev1beta1 "github.com/openshift/api/machine/v1beta1" + machineclient "github.com/openshift/client-go/machine/clientset/versioned" + machinefake "github.com/openshift/client-go/machine/clientset/versioned/fake" + "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/util/cmp" errorHandling "github.com/Azure/ARO-RP/test/util/error" diff --git a/pkg/util/clusteroperators/isavailable_test.go b/pkg/util/clusteroperators/isavailable_test.go index 71672f799eb..a1e9f631f16 100644 --- a/pkg/util/clusteroperators/isavailable_test.go +++ b/pkg/util/clusteroperators/isavailable_test.go @@ -6,8 +6,9 @@ package clusteroperators import ( "testing" - configv1 "github.com/openshift/api/config/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + configv1 "github.com/openshift/api/config/v1" ) func TestIsOperatorAvailable(t *testing.T) { diff --git a/pkg/util/conditions/condition.go b/pkg/util/conditions/condition.go index cc87afac96d..15e0b2368a1 100644 --- a/pkg/util/conditions/condition.go +++ b/pkg/util/conditions/condition.go @@ -7,13 +7,14 @@ import ( "context" "strings" - operatorv1 "github.com/openshift/api/operator/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/util/retry" "k8s.io/utils/clock" "sigs.k8s.io/controller-runtime/pkg/client" + operatorv1 "github.com/openshift/api/operator/v1" + "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/util/version" diff --git a/pkg/util/conditions/condition_test.go b/pkg/util/conditions/condition_test.go index c86062f6b28..7490e57c5e9 100644 --- a/pkg/util/conditions/condition_test.go +++ b/pkg/util/conditions/condition_test.go @@ -8,12 +8,13 @@ import ( "testing" "time" - operatorv1 "github.com/openshift/api/operator/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" clockTesting "k8s.io/utils/clock/testing" "sigs.k8s.io/controller-runtime/pkg/client/fake" + operatorv1 "github.com/openshift/api/operator/v1" + arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/util/cmp" _ "github.com/Azure/ARO-RP/pkg/util/scheme" diff --git a/pkg/util/deployer/deploy_test.go b/pkg/util/deployer/deploy_test.go index be2ea2761d6..91cbc9da7c5 100644 --- a/pkg/util/deployer/deploy_test.go +++ b/pkg/util/deployer/deploy_test.go @@ -13,6 +13,7 @@ import ( "github.com/go-test/deep" "go.uber.org/mock/gomock" + appsv1 "k8s.io/api/apps/v1" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/util/dynamichelper/createorder.go b/pkg/util/dynamichelper/createorder.go index 140d220a718..436ecf708d0 100644 --- a/pkg/util/dynamichelper/createorder.go +++ b/pkg/util/dynamichelper/createorder.go @@ -6,12 +6,13 @@ package dynamichelper import ( "reflect" - securityv1 "github.com/openshift/api/security/v1" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" extensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" extensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" kruntime "k8s.io/apimachinery/pkg/runtime" + + securityv1 "github.com/openshift/api/security/v1" ) // rather than list every object, just list the ones whose creation really has diff --git a/pkg/util/dynamichelper/createorder_test.go b/pkg/util/dynamichelper/createorder_test.go index dfa20cb9f10..82c0564896c 100644 --- a/pkg/util/dynamichelper/createorder_test.go +++ b/pkg/util/dynamichelper/createorder_test.go @@ -8,10 +8,11 @@ import ( "sort" "testing" - securityv1 "github.com/openshift/api/security/v1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" kruntime "k8s.io/apimachinery/pkg/runtime" + + securityv1 "github.com/openshift/api/security/v1" ) func TestCreateOrder(t *testing.T) { diff --git a/pkg/util/dynamichelper/discovery/cache_fallback_discovery_client.go b/pkg/util/dynamichelper/discovery/cache_fallback_discovery_client.go index 1a8773a46d1..e36dd7ed455 100644 --- a/pkg/util/dynamichelper/discovery/cache_fallback_discovery_client.go +++ b/pkg/util/dynamichelper/discovery/cache_fallback_discovery_client.go @@ -10,6 +10,7 @@ import ( "path/filepath" "github.com/sirupsen/logrus" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kruntime "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/discovery" diff --git a/pkg/util/dynamichelper/discovery/cache_fallback_discovery_client_test.go b/pkg/util/dynamichelper/discovery/cache_fallback_discovery_client_test.go index f8540f0ae1d..8678dbf2731 100644 --- a/pkg/util/dynamichelper/discovery/cache_fallback_discovery_client_test.go +++ b/pkg/util/dynamichelper/discovery/cache_fallback_discovery_client_test.go @@ -12,6 +12,7 @@ import ( "testing" openapi_v2 "github.com/google/gnostic/openapiv2" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kversion "k8s.io/apimachinery/pkg/version" "k8s.io/client-go/discovery" diff --git a/pkg/util/dynamichelper/dynamichelper.go b/pkg/util/dynamichelper/dynamichelper.go index 50b8708fdde..be2d6dde99e 100644 --- a/pkg/util/dynamichelper/dynamichelper.go +++ b/pkg/util/dynamichelper/dynamichelper.go @@ -9,11 +9,9 @@ import ( "reflect" "strings" - machinev1beta1 "github.com/openshift/api/machine/v1beta1" - hivev1 "github.com/openshift/hive/apis/hive/v1" - mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" "github.com/sirupsen/logrus" "golang.org/x/exp/maps" + appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" extensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" @@ -29,6 +27,10 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/util/retry" + machinev1beta1 "github.com/openshift/api/machine/v1beta1" + hivev1 "github.com/openshift/hive/apis/hive/v1" + mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" + arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/util/cmp" _ "github.com/Azure/ARO-RP/pkg/util/scheme" diff --git a/pkg/util/dynamichelper/dynamichelper_test.go b/pkg/util/dynamichelper/dynamichelper_test.go index a6e36bc21a2..d05ef374f7c 100644 --- a/pkg/util/dynamichelper/dynamichelper_test.go +++ b/pkg/util/dynamichelper/dynamichelper_test.go @@ -11,9 +11,8 @@ import ( "time" "github.com/Azure/go-autorest/autorest/to" - machinev1beta1 "github.com/openshift/api/machine/v1beta1" - mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" "github.com/sirupsen/logrus" + admissionregistrationv1 "k8s.io/api/admissionregistration/v1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" @@ -27,6 +26,9 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" + machinev1beta1 "github.com/openshift/api/machine/v1beta1" + mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" + arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/util/cmp" ) diff --git a/pkg/util/dynamichelper/gvrresolver.go b/pkg/util/dynamichelper/gvrresolver.go index 72aebbcf22e..637fe3e1079 100644 --- a/pkg/util/dynamichelper/gvrresolver.go +++ b/pkg/util/dynamichelper/gvrresolver.go @@ -5,6 +5,7 @@ package dynamichelper import ( "github.com/sirupsen/logrus" + "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/discovery" "k8s.io/client-go/rest" diff --git a/pkg/util/keyvault/keyvault.go b/pkg/util/keyvault/keyvault.go index 4503a233095..be8b3856757 100644 --- a/pkg/util/keyvault/keyvault.go +++ b/pkg/util/keyvault/keyvault.go @@ -19,6 +19,7 @@ import ( "github.com/Azure/go-autorest/autorest/azure" "github.com/Azure/go-autorest/autorest/to" "github.com/davecgh/go-spew/spew" + "k8s.io/apimachinery/pkg/util/wait" "github.com/Azure/ARO-RP/pkg/util/azureclient/keyvault" diff --git a/pkg/util/liveconfig/hive.go b/pkg/util/liveconfig/hive.go index 9c6370d7264..8dd563fb0ff 100644 --- a/pkg/util/liveconfig/hive.go +++ b/pkg/util/liveconfig/hive.go @@ -11,6 +11,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" armcontainerservice "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v6" + "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" diff --git a/pkg/util/log/hive.go b/pkg/util/log/hive.go index 4bc1616c396..87599a15366 100644 --- a/pkg/util/log/hive.go +++ b/pkg/util/log/hive.go @@ -8,6 +8,7 @@ import ( "strings" "github.com/Azure/go-autorest/autorest/azure" + hivev1 "github.com/openshift/hive/apis/hive/v1" "github.com/Azure/ARO-RP/pkg/api" diff --git a/pkg/util/mocks/adminactions/kubeactions.go b/pkg/util/mocks/adminactions/kubeactions.go index 8fa4e2ea1a0..0df1386db7d 100644 --- a/pkg/util/mocks/adminactions/kubeactions.go +++ b/pkg/util/mocks/adminactions/kubeactions.go @@ -14,6 +14,7 @@ import ( reflect "reflect" gomock "go.uber.org/mock/gomock" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" unstructured "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/util/mocks/clusterdata/clusterdata.go b/pkg/util/mocks/clusterdata/clusterdata.go index 65f403b4327..9d49e1a5b99 100644 --- a/pkg/util/mocks/clusterdata/clusterdata.go +++ b/pkg/util/mocks/clusterdata/clusterdata.go @@ -13,13 +13,15 @@ import ( context "context" reflect "reflect" - versioned "github.com/openshift/client-go/config/clientset/versioned" - versioned0 "github.com/openshift/client-go/machine/clientset/versioned" - versioned1 "github.com/openshift/client-go/operator/clientset/versioned" logrus "github.com/sirupsen/logrus" gomock "go.uber.org/mock/gomock" + kubernetes "k8s.io/client-go/kubernetes" + versioned "github.com/openshift/client-go/config/clientset/versioned" + versioned0 "github.com/openshift/client-go/machine/clientset/versioned" + versioned1 "github.com/openshift/client-go/operator/clientset/versioned" + api "github.com/Azure/ARO-RP/pkg/api" ) diff --git a/pkg/util/mocks/deployer/deployer.go b/pkg/util/mocks/deployer/deployer.go index 5d4545ab105..f155b006f93 100644 --- a/pkg/util/mocks/deployer/deployer.go +++ b/pkg/util/mocks/deployer/deployer.go @@ -15,6 +15,7 @@ import ( reflect "reflect" gomock "go.uber.org/mock/gomock" + runtime "k8s.io/apimachinery/pkg/runtime" v1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" diff --git a/pkg/util/mocks/dynamichelper/dynamichelper.go b/pkg/util/mocks/dynamichelper/dynamichelper.go index a2137d6af33..f7ab9001f7e 100644 --- a/pkg/util/mocks/dynamichelper/dynamichelper.go +++ b/pkg/util/mocks/dynamichelper/dynamichelper.go @@ -14,6 +14,7 @@ import ( reflect "reflect" gomock "go.uber.org/mock/gomock" + runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/util/mocks/hive/hive.go b/pkg/util/mocks/hive/hive.go index 69619432fe4..e74a8fe1be3 100644 --- a/pkg/util/mocks/hive/hive.go +++ b/pkg/util/mocks/hive/hive.go @@ -13,12 +13,14 @@ import ( context "context" reflect "reflect" - v1 "github.com/openshift/hive/apis/hive/v1" - v1alpha1 "github.com/openshift/hive/apis/hiveinternal/v1alpha1" gomock "go.uber.org/mock/gomock" + v10 "k8s.io/api/core/v1" runtime "k8s.io/apimachinery/pkg/runtime" + v1 "github.com/openshift/hive/apis/hive/v1" + v1alpha1 "github.com/openshift/hive/apis/hiveinternal/v1alpha1" + api "github.com/Azure/ARO-RP/pkg/api" ) diff --git a/pkg/util/mocks/net/net.go b/pkg/util/mocks/net/net.go index 6100c732397..060bef902f2 100644 --- a/pkg/util/mocks/net/net.go +++ b/pkg/util/mocks/net/net.go @@ -13,12 +13,14 @@ import ( context "context" reflect "reflect" - v1 "github.com/openshift/api/config/v1" - v10 "github.com/openshift/client-go/config/applyconfigurations/config/v1" gomock "go.uber.org/mock/gomock" + v11 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" + + v1 "github.com/openshift/api/config/v1" + v10 "github.com/openshift/client-go/config/applyconfigurations/config/v1" ) // MockDNSIClient is a mock of DNSIClient interface. diff --git a/pkg/util/mocks/samples/samples.go b/pkg/util/mocks/samples/samples.go index 8345a9784b0..ddf5adcc5d2 100644 --- a/pkg/util/mocks/samples/samples.go +++ b/pkg/util/mocks/samples/samples.go @@ -13,14 +13,16 @@ import ( context "context" reflect "reflect" - v1 "github.com/openshift/api/samples/v1" - v10 "github.com/openshift/client-go/samples/applyconfigurations/samples/v1" - v11 "github.com/openshift/client-go/samples/clientset/versioned/typed/samples/v1" gomock "go.uber.org/mock/gomock" + v12 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + + v1 "github.com/openshift/api/samples/v1" + v10 "github.com/openshift/client-go/samples/applyconfigurations/samples/v1" + v11 "github.com/openshift/client-go/samples/clientset/versioned/typed/samples/v1" ) // MockSamplesV1Interface is a mock of SamplesV1Interface interface. diff --git a/pkg/util/mocks/samplesclient/versioned.go b/pkg/util/mocks/samplesclient/versioned.go index 9c82e6fa62d..a2d99e6a252 100644 --- a/pkg/util/mocks/samplesclient/versioned.go +++ b/pkg/util/mocks/samplesclient/versioned.go @@ -12,9 +12,11 @@ package mock_versioned import ( reflect "reflect" - v1 "github.com/openshift/client-go/samples/clientset/versioned/typed/samples/v1" gomock "go.uber.org/mock/gomock" + discovery "k8s.io/client-go/discovery" + + v1 "github.com/openshift/client-go/samples/clientset/versioned/typed/samples/v1" ) // MockInterface is a mock of Interface interface. diff --git a/pkg/util/net/net.go b/pkg/util/net/net.go index 4512d3fd152..9fb15cc0d28 100644 --- a/pkg/util/net/net.go +++ b/pkg/util/net/net.go @@ -12,14 +12,16 @@ import ( mgmtprivatedns "github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns" "github.com/Azure/go-autorest/autorest/azure" - configclient "github.com/openshift/client-go/config/clientset/versioned" - v1 "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1" - mcoclient "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned" "github.com/sirupsen/logrus" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" "k8s.io/client-go/util/retry" + configclient "github.com/openshift/client-go/config/clientset/versioned" + v1 "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1" + mcoclient "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned" + "github.com/Azure/ARO-RP/pkg/util/azureclient/mgmt/privatedns" "github.com/Azure/ARO-RP/pkg/util/ready" "github.com/Azure/ARO-RP/pkg/util/stringutils" diff --git a/pkg/util/net/net_test.go b/pkg/util/net/net_test.go index b33f2250441..2552664a376 100644 --- a/pkg/util/net/net_test.go +++ b/pkg/util/net/net_test.go @@ -10,17 +10,19 @@ import ( mgmtprivatedns "github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns" "github.com/Azure/go-autorest/autorest/to" + "go.uber.org/mock/gomock" + + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/kubernetes" + "k8s.io/client-go/kubernetes/fake" + configv1 "github.com/openshift/api/config/v1" configclient "github.com/openshift/client-go/config/clientset/versioned" configfake "github.com/openshift/client-go/config/clientset/versioned/fake" mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" mcoclient "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned" mcofake "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned/fake" - "go.uber.org/mock/gomock" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/kubernetes" - "k8s.io/client-go/kubernetes/fake" "github.com/Azure/ARO-RP/pkg/api" utillog "github.com/Azure/ARO-RP/pkg/util/log" diff --git a/pkg/util/portforward/portforward.go b/pkg/util/portforward/portforward.go index 16851edb357..c1fe165c206 100644 --- a/pkg/util/portforward/portforward.go +++ b/pkg/util/portforward/portforward.go @@ -9,6 +9,7 @@ import ( "net/http" "github.com/sirupsen/logrus" + corev1 "k8s.io/api/core/v1" "k8s.io/client-go/rest" ) diff --git a/pkg/util/portforward/streamconn.go b/pkg/util/portforward/streamconn.go index f923e822db3..0c06b3812cd 100644 --- a/pkg/util/portforward/streamconn.go +++ b/pkg/util/portforward/streamconn.go @@ -10,6 +10,7 @@ import ( "time" "github.com/sirupsen/logrus" + "k8s.io/apimachinery/pkg/util/httpstream" "github.com/Azure/ARO-RP/pkg/util/recover" diff --git a/pkg/util/ready/ready.go b/pkg/util/ready/ready.go index 67e7d841df2..c504dfc80db 100644 --- a/pkg/util/ready/ready.go +++ b/pkg/util/ready/ready.go @@ -8,14 +8,15 @@ import ( "fmt" "net" - mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" - mcoclientv1 "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned/typed/machineconfiguration.openshift.io/v1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" appsv1client "k8s.io/client-go/kubernetes/typed/apps/v1" corev1client "k8s.io/client-go/kubernetes/typed/core/v1" + + mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" + mcoclientv1 "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned/typed/machineconfiguration.openshift.io/v1" ) // NodeIsReady returns true if a Node is considered ready diff --git a/pkg/util/ready/ready_test.go b/pkg/util/ready/ready_test.go index e28a6a5a5c3..8f652245b2e 100644 --- a/pkg/util/ready/ready_test.go +++ b/pkg/util/ready/ready_test.go @@ -8,8 +8,6 @@ import ( "errors" "testing" - mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" - mcofake "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned/fake" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -17,6 +15,9 @@ import ( "k8s.io/client-go/kubernetes/fake" ktesting "k8s.io/client-go/testing" + mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" + mcofake "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned/fake" + utilerror "github.com/Azure/ARO-RP/test/util/error" ) diff --git a/pkg/util/scheme/scheme.go b/pkg/util/scheme/scheme.go index 481e80cfa1e..d05072e6684 100644 --- a/pkg/util/scheme/scheme.go +++ b/pkg/util/scheme/scheme.go @@ -5,6 +5,18 @@ package scheme import ( templatesv1 "github.com/open-policy-agent/frameworks/constraint/pkg/apis/templates/v1" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + + appsv1 "k8s.io/api/apps/v1" + corev1 "k8s.io/api/core/v1" + rbacv1 "k8s.io/api/rbac/v1" + extensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" + utilruntime "k8s.io/apimachinery/pkg/util/runtime" + "k8s.io/client-go/kubernetes/scheme" + appsv1defaults "k8s.io/kubernetes/pkg/apis/apps/v1" + corev1defaults "k8s.io/kubernetes/pkg/apis/core/v1" + rbacv1defaults "k8s.io/kubernetes/pkg/apis/rbac/v1" + configv1 "github.com/openshift/api/config/v1" consolev1 "github.com/openshift/api/console/v1" imageregistryv1 "github.com/openshift/api/imageregistry/v1" @@ -16,16 +28,6 @@ import ( hivev1 "github.com/openshift/hive/apis/hive/v1" hivev1alpha1 "github.com/openshift/hive/apis/hiveinternal/v1alpha1" mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" - monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" - appsv1 "k8s.io/api/apps/v1" - corev1 "k8s.io/api/core/v1" - rbacv1 "k8s.io/api/rbac/v1" - extensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - utilruntime "k8s.io/apimachinery/pkg/util/runtime" - "k8s.io/client-go/kubernetes/scheme" - appsv1defaults "k8s.io/kubernetes/pkg/apis/apps/v1" - corev1defaults "k8s.io/kubernetes/pkg/apis/core/v1" - rbacv1defaults "k8s.io/kubernetes/pkg/apis/rbac/v1" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" aropreviewv1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/preview.aro.openshift.io/v1alpha1" diff --git a/pkg/util/steps/condition.go b/pkg/util/steps/condition.go index bea81425d8f..18d41078d44 100644 --- a/pkg/util/steps/condition.go +++ b/pkg/util/steps/condition.go @@ -12,6 +12,7 @@ import ( "time" "github.com/sirupsen/logrus" + "k8s.io/apimachinery/pkg/util/wait" "github.com/Azure/ARO-RP/pkg/api" diff --git a/pkg/util/steps/refreshing.go b/pkg/util/steps/refreshing.go index 8138ecda695..96d37aa9046 100644 --- a/pkg/util/steps/refreshing.go +++ b/pkg/util/steps/refreshing.go @@ -11,6 +11,7 @@ import ( "time" "github.com/sirupsen/logrus" + "k8s.io/apimachinery/pkg/util/wait" "github.com/Azure/ARO-RP/pkg/api" diff --git a/pkg/util/steps/runner_test.go b/pkg/util/steps/runner_test.go index ce124322412..1aa670ffce8 100644 --- a/pkg/util/steps/runner_test.go +++ b/pkg/util/steps/runner_test.go @@ -13,6 +13,7 @@ import ( "github.com/onsi/gomega/types" "github.com/sirupsen/logrus" "go.uber.org/mock/gomock" + "k8s.io/apimachinery/pkg/util/wait" "github.com/Azure/ARO-RP/pkg/util/graph/graphsdk/models/odataerrors" diff --git a/pkg/util/subnet/cluster_subnets.go b/pkg/util/subnet/cluster_subnets.go index 64a8d2dc4fb..1c3e2f28953 100644 --- a/pkg/util/subnet/cluster_subnets.go +++ b/pkg/util/subnet/cluster_subnets.go @@ -9,10 +9,12 @@ import ( "strings" "github.com/Azure/go-autorest/autorest/azure" - machinev1beta1 "github.com/openshift/api/machine/v1beta1" + "k8s.io/apimachinery/pkg/labels" kruntime "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client" + + machinev1beta1 "github.com/openshift/api/machine/v1beta1" ) const ( diff --git a/pkg/util/subnet/cluster_subnets_test.go b/pkg/util/subnet/cluster_subnets_test.go index e5ddadc828b..8c35239f76f 100644 --- a/pkg/util/subnet/cluster_subnets_test.go +++ b/pkg/util/subnet/cluster_subnets_test.go @@ -8,11 +8,13 @@ import ( "testing" "github.com/google/go-cmp/cmp" - machinev1beta1 "github.com/openshift/api/machine/v1beta1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kruntime "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client/fake" + machinev1beta1 "github.com/openshift/api/machine/v1beta1" + _ "github.com/Azure/ARO-RP/pkg/util/scheme" utilerror "github.com/Azure/ARO-RP/test/util/error" ) diff --git a/pkg/util/version/clusterversion.go b/pkg/util/version/clusterversion.go index 00cbb020fa6..c0deb345e55 100644 --- a/pkg/util/version/clusterversion.go +++ b/pkg/util/version/clusterversion.go @@ -7,9 +7,10 @@ import ( "context" "errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + configv1 "github.com/openshift/api/config/v1" configclient "github.com/openshift/client-go/config/clientset/versioned" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // GetClusterVersion fetches the version of the openshift cluster. diff --git a/pkg/util/version/clusterversion_test.go b/pkg/util/version/clusterversion_test.go index f3c8d0a4fe6..abc78e9a956 100644 --- a/pkg/util/version/clusterversion_test.go +++ b/pkg/util/version/clusterversion_test.go @@ -7,9 +7,10 @@ import ( "reflect" "testing" - configv1 "github.com/openshift/api/config/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + configv1 "github.com/openshift/api/config/v1" + utilerror "github.com/Azure/ARO-RP/test/util/error" ) diff --git a/pkg/validate/dynamic/diskencryptionset.go b/pkg/validate/dynamic/diskencryptionset.go index 0e01a6a474c..3db668e3cd9 100644 --- a/pkg/validate/dynamic/diskencryptionset.go +++ b/pkg/validate/dynamic/diskencryptionset.go @@ -11,6 +11,7 @@ import ( "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/azure" + "k8s.io/apimachinery/pkg/util/wait" "github.com/Azure/ARO-RP/pkg/api" diff --git a/pkg/validate/dynamic/dynamic.go b/pkg/validate/dynamic/dynamic.go index b9e57681a72..8c5fd514066 100644 --- a/pkg/validate/dynamic/dynamic.go +++ b/pkg/validate/dynamic/dynamic.go @@ -19,6 +19,7 @@ import ( "github.com/Azure/go-autorest/autorest/azure" "github.com/apparentlymart/go-cidr/cidr" "github.com/sirupsen/logrus" + "k8s.io/apimachinery/pkg/util/wait" "github.com/Azure/ARO-RP/pkg/api" diff --git a/pkg/validate/dynamic/platformworkloadidentityprofile_test.go b/pkg/validate/dynamic/platformworkloadidentityprofile_test.go index 0b4b85c3bc2..92d6c5c6f50 100644 --- a/pkg/validate/dynamic/platformworkloadidentityprofile_test.go +++ b/pkg/validate/dynamic/platformworkloadidentityprofile_test.go @@ -16,6 +16,7 @@ import ( "github.com/Azure/go-autorest/autorest/azure" "github.com/sirupsen/logrus" "go.uber.org/mock/gomock" + "k8s.io/utils/ptr" "github.com/Azure/ARO-RP/pkg/api" diff --git a/test/e2e/admin_portal.go b/test/e2e/admin_portal.go index 9ac655d9b8f..f91ce1cdee5 100644 --- a/test/e2e/admin_portal.go +++ b/test/e2e/admin_portal.go @@ -12,7 +12,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - conditions "github.com/serge1peshcoff/selenium-go-conditions" "github.com/tebeka/selenium" ) diff --git a/test/e2e/adminapi.go b/test/e2e/adminapi.go index fea6a36178a..8ec8ba6279d 100644 --- a/test/e2e/adminapi.go +++ b/test/e2e/adminapi.go @@ -14,7 +14,6 @@ import ( "net/url" . "github.com/onsi/gomega" - "github.com/sirupsen/logrus" "github.com/Azure/ARO-RP/pkg/api/admin" diff --git a/test/e2e/adminapi_redeployvm.go b/test/e2e/adminapi_redeployvm.go index 6853a2cce2a..11bfefd2130 100644 --- a/test/e2e/adminapi_redeployvm.go +++ b/test/e2e/adminapi_redeployvm.go @@ -12,10 +12,10 @@ import ( "strings" "time" + mgmtcompute "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - mgmtcompute "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/e2e/adminapi_resources.go b/test/e2e/adminapi_resources.go index 881db1c0c7d..30e7ba67774 100644 --- a/test/e2e/adminapi_resources.go +++ b/test/e2e/adminapi_resources.go @@ -9,11 +9,10 @@ import ( "net/http" "strings" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - mgmtfeatures "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-07-01/features" "github.com/Azure/go-autorest/autorest/azure" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" apisubnet "github.com/Azure/ARO-RP/pkg/api/util/subnet" "github.com/Azure/ARO-RP/pkg/util/stringutils" diff --git a/test/e2e/cluster.go b/test/e2e/cluster.go index 32c82188036..7a6fc30b80e 100644 --- a/test/e2e/cluster.go +++ b/test/e2e/cluster.go @@ -8,13 +8,13 @@ import ( "fmt" "strings" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v2" "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2021-09-01/storage" "github.com/Azure/go-autorest/autorest/azure" "github.com/Azure/go-autorest/autorest/to" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/test/e2e/disk_encryption.go b/test/e2e/disk_encryption.go index 91db01629b9..00138c9a1d2 100644 --- a/test/e2e/disk_encryption.go +++ b/test/e2e/disk_encryption.go @@ -6,10 +6,10 @@ package e2e import ( "context" + mgmtcompute "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - mgmtcompute "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/Azure/ARO-RP/pkg/util/stringutils" diff --git a/test/e2e/dns.go b/test/e2e/dns.go index 1d94d619e10..f6d9d834860 100644 --- a/test/e2e/dns.go +++ b/test/e2e/dns.go @@ -11,10 +11,10 @@ import ( "strings" "time" + "github.com/Azure/go-autorest/autorest/to" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/Azure/go-autorest/autorest/to" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index 1798fa2175b..278c4502dd5 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -12,7 +12,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/onsi/gomega/format" "github.com/sirupsen/logrus" diff --git a/test/e2e/helpers.go b/test/e2e/helpers.go index f3d3faad5ab..3fc9611a501 100644 --- a/test/e2e/helpers.go +++ b/test/e2e/helpers.go @@ -13,8 +13,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - projectv1 "github.com/openshift/api/project/v1" - projectclient "github.com/openshift/client-go/project/clientset/versioned" authorizationv1 "k8s.io/api/authorization/v1" corev1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" @@ -24,6 +22,9 @@ import ( "k8s.io/apimachinery/pkg/util/yaml" "k8s.io/client-go/kubernetes" + projectv1 "github.com/openshift/api/project/v1" + projectclient "github.com/openshift/client-go/project/clientset/versioned" + "github.com/Azure/ARO-RP/test/util/dynamic" ) diff --git a/test/e2e/hive.go b/test/e2e/hive.go index 8048bb7faf6..58cbfcc3cab 100644 --- a/test/e2e/hive.go +++ b/test/e2e/hive.go @@ -12,9 +12,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - hivev1 "github.com/openshift/hive/apis/hive/v1" "sigs.k8s.io/controller-runtime/pkg/client" + hivev1 "github.com/openshift/hive/apis/hive/v1" + "github.com/Azure/ARO-RP/pkg/api/admin" "github.com/Azure/ARO-RP/pkg/hive" ) diff --git a/test/e2e/ocp_alerts.go b/test/e2e/ocp_alerts.go index 7eaae919b36..2076727b242 100644 --- a/test/e2e/ocp_alerts.go +++ b/test/e2e/ocp_alerts.go @@ -13,11 +13,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/prometheus/client_golang/api" prometheusv1 "github.com/prometheus/client_golang/api/prometheus/v1" "github.com/prometheus/common/config" "github.com/prometheus/common/model" + authenticationv1 "k8s.io/api/authentication/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/test/e2e/ocp_cluster.go b/test/e2e/ocp_cluster.go index b047495c707..11aa53b017f 100644 --- a/test/e2e/ocp_cluster.go +++ b/test/e2e/ocp_cluster.go @@ -11,10 +11,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - configv1 "github.com/openshift/api/config/v1" - operatorv1 "github.com/openshift/api/operator/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + configv1 "github.com/openshift/api/config/v1" + operatorv1 "github.com/openshift/api/operator/v1" ) var _ = Describe("Cluster Operators", Label(smoke), func() { diff --git a/test/e2e/ocp_machine.go b/test/e2e/ocp_machine.go index 4750ecb89e4..8f97caf7ded 100644 --- a/test/e2e/ocp_machine.go +++ b/test/e2e/ocp_machine.go @@ -10,10 +10,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - machinev1beta1 "github.com/openshift/api/machine/v1beta1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + machinev1beta1 "github.com/openshift/api/machine/v1beta1" + "github.com/Azure/ARO-RP/pkg/util/pointerutils" ) diff --git a/test/e2e/operator.go b/test/e2e/operator.go index d1f6cb5ea3d..2e5822e4fc8 100644 --- a/test/e2e/operator.go +++ b/test/e2e/operator.go @@ -11,18 +11,13 @@ import ( "strings" "time" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v2" "github.com/Azure/go-autorest/autorest/azure" "github.com/Azure/go-autorest/autorest/to" - configv1 "github.com/openshift/api/config/v1" - machinev1 "github.com/openshift/api/machine/v1" - machinev1beta1 "github.com/openshift/api/machine/v1beta1" - cov1Helpers "github.com/openshift/library-go/pkg/config/clusteroperator/v1helpers" - mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "github.com/ugorji/go/codec" + corev1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -30,6 +25,12 @@ import ( "k8s.io/client-go/util/retry" "sigs.k8s.io/yaml" + configv1 "github.com/openshift/api/config/v1" + machinev1 "github.com/openshift/api/machine/v1" + machinev1beta1 "github.com/openshift/api/machine/v1beta1" + cov1Helpers "github.com/openshift/library-go/pkg/config/clusteroperator/v1helpers" + mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" + apisubnet "github.com/Azure/ARO-RP/pkg/api/util/subnet" "github.com/Azure/ARO-RP/pkg/operator" arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" diff --git a/test/e2e/setup.go b/test/e2e/setup.go index 4e05a3c03bd..cffecbe5849 100644 --- a/test/e2e/setup.go +++ b/test/e2e/setup.go @@ -16,23 +16,17 @@ import ( "regexp" "time" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/azure-sdk-for-go/sdk/azidentity" "github.com/davecgh/go-spew/spew" "github.com/jongio/azidext/go/azidext" - configclient "github.com/openshift/client-go/config/clientset/versioned" - machineclient "github.com/openshift/client-go/machine/clientset/versioned" - projectclient "github.com/openshift/client-go/project/clientset/versioned" - routeclient "github.com/openshift/client-go/route/clientset/versioned" - securityclient "github.com/openshift/client-go/security/clientset/versioned" - mcoclient "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" monitoringclient "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned" "github.com/sirupsen/logrus" "github.com/tebeka/selenium" + "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" @@ -40,6 +34,13 @@ import ( "k8s.io/client-go/tools/clientcmd/api/latest" "sigs.k8s.io/controller-runtime/pkg/client" + configclient "github.com/openshift/client-go/config/clientset/versioned" + machineclient "github.com/openshift/client-go/machine/clientset/versioned" + projectclient "github.com/openshift/client-go/project/clientset/versioned" + routeclient "github.com/openshift/client-go/route/clientset/versioned" + securityclient "github.com/openshift/client-go/security/clientset/versioned" + mcoclient "github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned" + "github.com/Azure/ARO-RP/pkg/api/admin" "github.com/Azure/ARO-RP/pkg/env" "github.com/Azure/ARO-RP/pkg/hive" diff --git a/test/e2e/update.go b/test/e2e/update.go index abb30fe8510..e730ca2f56d 100644 --- a/test/e2e/update.go +++ b/test/e2e/update.go @@ -8,15 +8,16 @@ import ( "math/rand" "strconv" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v2" + "github.com/Azure/go-autorest/autorest/to" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v2" - "github.com/Azure/go-autorest/autorest/to" - cloudcredentialv1 "github.com/openshift/cloud-credential-operator/pkg/apis/cloudcredential/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + cloudcredentialv1 "github.com/openshift/cloud-credential-operator/pkg/apis/cloudcredential/v1" + mgmtredhatopenshift20231122 "github.com/Azure/ARO-RP/pkg/client/services/redhatopenshift/mgmt/2023-11-22/redhatopenshift" "github.com/Azure/ARO-RP/pkg/util/stringutils" ) diff --git a/test/util/clienthelper/helpers.go b/test/util/clienthelper/helpers.go index a6bf8672cab..9d85cbd3232 100644 --- a/test/util/clienthelper/helpers.go +++ b/test/util/clienthelper/helpers.go @@ -7,6 +7,7 @@ import ( "errors" "github.com/go-test/deep" + "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/test/util/conditions/conditions.go b/test/util/conditions/conditions.go index 4d1dc5b7eeb..43ef13d9fc1 100644 --- a/test/util/conditions/conditions.go +++ b/test/util/conditions/conditions.go @@ -10,11 +10,13 @@ import ( "time" "github.com/google/go-cmp/cmp/cmpopts" - operatorv1 "github.com/openshift/api/operator/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" + operatorv1 "github.com/openshift/api/operator/v1" + arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1" "github.com/Azure/ARO-RP/pkg/util/cmp" ) diff --git a/test/util/kubeadminkubeconfig/kubeconfig.go b/test/util/kubeadminkubeconfig/kubeconfig.go index 8209d4c4618..54d46d98013 100644 --- a/test/util/kubeadminkubeconfig/kubeconfig.go +++ b/test/util/kubeadminkubeconfig/kubeconfig.go @@ -12,6 +12,7 @@ import ( "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/azure" "github.com/sirupsen/logrus" + "k8s.io/apimachinery/pkg/util/wait" clientcmdv1 "k8s.io/client-go/tools/clientcmd/api/v1"