From 019066219db51bb307ffc0e6e95e8014b9f5346d Mon Sep 17 00:00:00 2001 From: redhat-chai-bot Date: Mon, 3 Aug 2026 15:00:16 +0000 Subject: [PATCH] refactor(backend): move controller util packages to backend/pkg/utils Relocate utility packages out of backend/pkg/controllers into a dedicated backend/pkg/utils tree. Package names are unchanged except where noted: controllers/controllerutils -> utils/controllerutils controllers/statusutils -> utils/statusutils controllers/validationutils -> utils/validationutils controllers/operation -> utils/operationutils (package renamed from "operation" to "operationutils") Also move generic_operation.go from the operation package into controllerutils: its package declaration becomes "controllerutils", the self-qualified controllerutils.* references are dropped, and NewGenericOperationController / OperationSynchronizer now live in controllerutils. Callers now use controllerutils.NewGenericOperationController; the two dispatch files that only used that symbol drop their now-unused operationutils import. All import paths across the backend and test-integration modules are updated to the new locations. No functional changes; go.mod/go.sum are untouched. Co-Authored-By: Claude Opus 4.8 --- backend/pkg/app/backend.go | 4 +-- ...ual_machine_resource_skus_cached_reader.go | 2 +- .../controllers/billing/create_billing_doc.go | 2 +- .../billing/create_billing_doc_test.go | 2 +- .../billing/orphaned_billing_cleanup.go | 2 +- ...uster_cluster_service_create_controller.go | 2 +- ..._cluster_service_create_controller_test.go | 2 +- ...ng_cluster_service_id_assign_controller.go | 2 +- ...uster_service_id_assign_controller_test.go | 2 +- ...ate_service_provider_cluster_controller.go | 2 +- ...ervice_provider_cluster_controller_test.go | 2 +- .../operations/dispatch_request_credential.go | 5 ++-- .../dispatch_request_credential_test.go | 2 +- .../operations/dispatch_revoke_credentials.go | 5 ++-- .../dispatch_revoke_credentials_test.go | 2 +- .../operation_request_credential.go | 6 ++-- .../operation_request_credential_test.go | 2 +- .../operation_revoke_credentials.go | 6 ++-- .../operation_revoke_credentials_test.go | 2 +- ...uster_managed_resource_group_controller.go | 2 +- ...ster_child_resources_cleanup_controller.go | 2 +- ...child_resources_cleanup_controller_test.go | 2 +- ...ster_service_delete_dispatch_controller.go | 2 +- ...service_delete_dispatch_controller_test.go | 2 +- .../cluster_cluster_service_id_clearer.go | 2 +- ...cluster_cluster_service_id_clearer_test.go | 2 +- .../deletion/cluster_deletion_controller.go | 2 +- .../cluster_deletion_controller_test.go | 2 +- .../operations/operation_cluster_create.go | 6 ++-- .../operation_cluster_create_test.go | 2 +- .../operations/operation_cluster_delete.go | 6 ++-- .../operation_cluster_delete_legacy.go | 4 +-- .../operation_cluster_delete_test.go | 2 +- .../operations/operation_cluster_update.go | 6 ++-- ...ration_cluster_update_state_calculation.go | 2 +- ...n_cluster_update_state_calculation_test.go | 2 +- .../operation_cluster_update_test.go | 2 +- .../management_cluster_placement_sync.go | 2 +- .../management_cluster_placement_sync_test.go | 2 +- .../cluster_base_domain_prefix_sync.go | 2 +- .../cluster_base_domain_prefix_sync_test.go | 2 +- .../properties/cluster_properties_sync.go | 2 +- .../cluster_properties_sync_test.go | 2 +- .../desired_control_plane_size_sync.go | 2 +- .../desired_control_plane_size_sync_test.go | 2 +- .../cluster/properties/identity_migration.go | 2 +- .../properties/identity_migration_test.go | 2 +- .../serviceprovidercluster_properties_sync.go | 2 +- ...iceprovidercluster_properties_sync_test.go | 2 +- ..._cluster_scoped_read_desires_controller.go | 2 +- ...ter_scoped_read_desires_controller_test.go | 2 +- .../status/cluster_degraded_aggregator.go | 4 +-- .../cluster_degraded_aggregator_test.go | 4 +-- .../cluster_requirements_valid_aggregator.go | 4 +-- ...ster_requirements_valid_aggregator_test.go | 4 +-- ...ster_service_update_dispatch_controller.go | 2 +- ...service_update_dispatch_controller_test.go | 2 +- .../cluster_validation_controller.go | 4 +-- ...control_plane_active_version_controller.go | 2 +- ...ol_plane_active_version_controller_test.go | 2 +- ...ontrol_plane_desired_version_controller.go | 2 +- ...l_plane_desired_version_controller_test.go | 2 +- ...rigger_control_plane_upgrade_controller.go | 2 +- .../cosmosmigration/cosmos_migration.go | 2 +- .../cosmosmigration/cosmos_migration_test.go | 2 +- .../pkg/controllers/datadump/billing_dump.go | 2 +- .../controllers/datadump/billing_dump_test.go | 2 +- .../pkg/controllers/datadump/cs_state_dump.go | 2 +- .../datadump/cs_state_dump_test.go | 2 +- .../datadump/dump_cluster_recursive.go | 2 +- .../datadump/dump_management_cluster.go | 2 +- .../datadump/dump_subscription_non_cluster.go | 2 +- backend/pkg/controllers/example/do_nothing.go | 2 +- ..._auth_cluster_service_create_controller.go | 2 +- ..._cluster_service_create_controller_test.go | 2 +- ...auth_child_resources_cleanup_controller.go | 2 +- ...child_resources_cleanup_controller_test.go | 2 +- ...ster_service_delete_dispatch_controller.go | 2 +- ...service_delete_dispatch_controller_test.go | 2 +- ...xternal_auth_cluster_service_id_clearer.go | 2 +- ...al_auth_cluster_service_id_clearer_test.go | 2 +- .../external_auth_deletion_controller.go | 2 +- .../external_auth_deletion_controller_test.go | 2 +- .../operation_external_auth_create.go | 6 ++-- .../operation_external_auth_create_test.go | 2 +- .../operation_external_auth_delete.go | 6 ++-- .../operation_external_auth_delete_legacy.go | 2 +- .../operation_external_auth_delete_test.go | 4 +-- .../operation_external_auth_update.go | 6 ++-- ..._external_auth_update_state_calculation.go | 2 +- ...rnal_auth_update_state_calculation_test.go | 2 +- .../operation_external_auth_update_test.go | 2 +- .../externalauth_degraded_aggregator.go | 4 +-- .../externalauth_degraded_aggregator_test.go | 4 +-- ...ster_service_update_dispatch_controller.go | 2 +- ...service_update_dispatch_controller_test.go | 2 +- .../controllers/metrics/metrics_controller.go | 2 +- .../mismatch/backfill_cluster_uid.go | 2 +- .../cluster_service_cluster_matching.go | 2 +- .../mismatch/delete_orphaned_cosmos.go | 2 +- .../mismatch/missing_resource_id.go | 2 +- ...te_service_provider_nodepool_controller.go | 2 +- ...rvice_provider_nodepool_controller_test.go | 2 +- ..._pool_cluster_service_create_controller.go | 2 +- ..._cluster_service_create_controller_test.go | 2 +- ...pool_child_resources_cleanup_controller.go | 2 +- ...child_resources_cleanup_controller_test.go | 2 +- ...ster_service_delete_dispatch_controller.go | 2 +- ...service_delete_dispatch_controller_test.go | 2 +- .../node_pool_cluster_service_id_clearer.go | 2 +- ...de_pool_cluster_service_id_clearer_test.go | 2 +- .../deletion/node_pool_deletion_controller.go | 2 +- .../node_pool_deletion_controller_test.go | 2 +- .../operations/operation_node_pool_create.go | 6 ++-- .../operation_node_pool_create_test.go | 4 +-- .../operations/operation_node_pool_delete.go | 6 ++-- .../operation_node_pool_delete_test.go | 4 +-- .../operations/operation_node_pool_update.go | 6 ++-- ...tion_node_pool_update_state_calculation.go | 2 +- ...node_pool_update_state_calculation_test.go | 2 +- .../operation_node_pool_update_test.go | 4 +-- ...nodepool_scoped_read_desires_controller.go | 2 +- .../status/nodepool_degraded_aggregator.go | 4 +-- .../nodepool_degraded_aggregator_test.go | 4 +-- .../nodepool_requirements_valid_aggregator.go | 4 +-- ...pool_requirements_valid_aggregator_test.go | 4 +-- ...ster_service_update_dispatch_controller.go | 2 +- ...service_update_dispatch_controller_test.go | 2 +- .../nodepool_validation_controller.go | 4 +-- .../nodepool_validation_controller_test.go | 4 +-- .../nodepool_active_version_controller.go | 2 +- ...nodepool_active_version_controller_test.go | 2 +- ...odepool_active_version_real_cosmos_test.go | 2 +- .../version/nodepool_version_controller.go | 2 +- .../nodepool_version_controller_test.go | 2 +- .../trigger_node_pool_upgrade_controller.go | 2 +- ...igger_node_pool_upgrade_controller_test.go | 2 +- .../cluster_watching_controller.go | 0 .../cluster_watching_controller_test.go | 0 .../controllerutils/controller_metrics.go | 0 .../controllerutils/cooldown.go | 0 .../controllerutils/cosmos.go | 0 .../controllerutils/cs_maestro_utils.go | 0 .../external_auth_watching_controller.go | 0 .../controllerutils}/generic_operation.go | 29 +++++++++---------- .../generic_watching_controller.go | 0 .../generic_watching_controller_test.go | 0 .../management_cluster_content_controller.go | 0 ...agement_cluster_content_controller_test.go | 0 .../management_cluster_watching_controller.go | 0 .../nodepool_watching_controller.go | 0 .../controllerutils/read_desire.go | 0 .../subscription_watching_controller.go | 0 .../controllerutils/util.go | 0 .../controllerutils/util_test.go | 0 .../operation => utils/operationutils}/doc.go | 4 +-- .../operationutils}/operation_state.go | 2 +- .../operationutils}/operation_state_test.go | 2 +- .../operationtesting/fixtures.go | 2 +- .../operationtesting/readdesire.go | 0 .../operationutils}/utils.go | 2 +- .../operationutils}/utils_test.go | 2 +- .../statusutils/firstobservedbad.go | 0 .../statusutils/helpers.go | 0 .../statusutils/helpers_test.go | 0 .../statusutils/inertia.go | 0 .../statusutils/inertia_test.go | 0 .../statusutils/requirements_valid.go | 0 .../statusutils/requirements_valid_test.go | 0 .../statusutils/testhelpers.go | 0 .../statusutils/union_condition.go | 0 .../statusutils/union_condition_test.go | 0 .../always_success_validation.go | 0 .../azure_cluster_mis_existence_validation.go | 0 ...ter_resource_group_existence_validation.go | 0 .../azure_rp_registration_validation.go | 0 .../validationutils/cluster_validation.go | 0 .../validationutils/nodepool_validation.go | 0 internal/controllerutils/cooldown.go | 2 +- .../unioninformers/kubeapplier/controller.go | 2 +- .../controllers/do_nothing/do_nothing_test.go | 2 +- .../mismatches/delete_orphaned_cosmos_test.go | 2 +- .../backend/launch/notification_test.go | 2 +- .../controllertesthelpers/basic_controller.go | 2 +- ...cluster_cluster_service_update_dispatch.go | 2 +- .../utils/integrationutils/utils.go | 2 +- 186 files changed, 209 insertions(+), 212 deletions(-) rename backend/pkg/{controllers => utils}/controllerutils/cluster_watching_controller.go (100%) rename backend/pkg/{controllers => utils}/controllerutils/cluster_watching_controller_test.go (100%) rename backend/pkg/{controllers => utils}/controllerutils/controller_metrics.go (100%) rename backend/pkg/{controllers => utils}/controllerutils/cooldown.go (100%) rename backend/pkg/{controllers => utils}/controllerutils/cosmos.go (100%) rename backend/pkg/{controllers => utils}/controllerutils/cs_maestro_utils.go (100%) rename backend/pkg/{controllers => utils}/controllerutils/external_auth_watching_controller.go (100%) rename backend/pkg/{controllers/operation => utils/controllerutils}/generic_operation.go (87%) rename backend/pkg/{controllers => utils}/controllerutils/generic_watching_controller.go (100%) rename backend/pkg/{controllers => utils}/controllerutils/generic_watching_controller_test.go (100%) rename backend/pkg/{controllers => utils}/controllerutils/management_cluster_content_controller.go (100%) rename backend/pkg/{controllers => utils}/controllerutils/management_cluster_content_controller_test.go (100%) rename backend/pkg/{controllers => utils}/controllerutils/management_cluster_watching_controller.go (100%) rename backend/pkg/{controllers => utils}/controllerutils/nodepool_watching_controller.go (100%) rename backend/pkg/{controllers => utils}/controllerutils/read_desire.go (100%) rename backend/pkg/{controllers => utils}/controllerutils/subscription_watching_controller.go (100%) rename backend/pkg/{controllers => utils}/controllerutils/util.go (100%) rename backend/pkg/{controllers => utils}/controllerutils/util_test.go (100%) rename backend/pkg/{controllers/operation => utils/operationutils}/doc.go (96%) rename backend/pkg/{controllers/operation => utils/operationutils}/operation_state.go (99%) rename backend/pkg/{controllers/operation => utils/operationutils}/operation_state_test.go (99%) rename backend/pkg/{controllers/operation => utils/operationutils}/operationtesting/fixtures.go (99%) rename backend/pkg/{controllers/operation => utils/operationutils}/operationtesting/readdesire.go (100%) rename backend/pkg/{controllers/operation => utils/operationutils}/utils.go (99%) rename backend/pkg/{controllers/operation => utils/operationutils}/utils_test.go (99%) rename backend/pkg/{controllers => utils}/statusutils/firstobservedbad.go (100%) rename backend/pkg/{controllers => utils}/statusutils/helpers.go (100%) rename backend/pkg/{controllers => utils}/statusutils/helpers_test.go (100%) rename backend/pkg/{controllers => utils}/statusutils/inertia.go (100%) rename backend/pkg/{controllers => utils}/statusutils/inertia_test.go (100%) rename backend/pkg/{controllers => utils}/statusutils/requirements_valid.go (100%) rename backend/pkg/{controllers => utils}/statusutils/requirements_valid_test.go (100%) rename backend/pkg/{controllers => utils}/statusutils/testhelpers.go (100%) rename backend/pkg/{controllers => utils}/statusutils/union_condition.go (100%) rename backend/pkg/{controllers => utils}/statusutils/union_condition_test.go (100%) rename backend/pkg/{controllers => utils}/validationutils/always_success_validation.go (100%) rename backend/pkg/{controllers => utils}/validationutils/azure_cluster_mis_existence_validation.go (100%) rename backend/pkg/{controllers => utils}/validationutils/azure_cluster_resource_group_existence_validation.go (100%) rename backend/pkg/{controllers => utils}/validationutils/azure_rp_registration_validation.go (100%) rename backend/pkg/{controllers => utils}/validationutils/cluster_validation.go (100%) rename backend/pkg/{controllers => utils}/validationutils/nodepool_validation.go (100%) diff --git a/backend/pkg/app/backend.go b/backend/pkg/app/backend.go index edf2d47de37..1848d2df417 100644 --- a/backend/pkg/app/backend.go +++ b/backend/pkg/app/backend.go @@ -48,7 +48,6 @@ import ( clusterupdate "github.com/Azure/ARO-HCP/backend/pkg/controllers/cluster/update" clustervalidation "github.com/Azure/ARO-HCP/backend/pkg/controllers/cluster/validation" clusterversion "github.com/Azure/ARO-HCP/backend/pkg/controllers/cluster/version" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/controllers/cosmosmigration" "github.com/Azure/ARO-HCP/backend/pkg/controllers/datadump" "github.com/Azure/ARO-HCP/backend/pkg/controllers/example" @@ -66,8 +65,9 @@ import ( nodepoolstatus "github.com/Azure/ARO-HCP/backend/pkg/controllers/nodepool/status" nodepoolupdate "github.com/Azure/ARO-HCP/backend/pkg/controllers/nodepool/update" nodepoolversion "github.com/Azure/ARO-HCP/backend/pkg/controllers/nodepool/version" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/validationutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" + "github.com/Azure/ARO-HCP/backend/pkg/utils/validationutils" internalazure "github.com/Azure/ARO-HCP/internal/azure" "github.com/Azure/ARO-HCP/internal/database" dbinformers "github.com/Azure/ARO-HCP/internal/database/informers" diff --git a/backend/pkg/azure/cachedreader/virtual_machine_resource_skus_cached_reader.go b/backend/pkg/azure/cachedreader/virtual_machine_resource_skus_cached_reader.go index 2ff7901a502..714266c810b 100644 --- a/backend/pkg/azure/cachedreader/virtual_machine_resource_skus_cached_reader.go +++ b/backend/pkg/azure/cachedreader/virtual_machine_resource_skus_cached_reader.go @@ -30,7 +30,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v6" azureclient "github.com/Azure/ARO-HCP/backend/pkg/azure/client" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/utils" ) diff --git a/backend/pkg/controllers/billing/create_billing_doc.go b/backend/pkg/controllers/billing/create_billing_doc.go index c681f6eee55..71fe110d9c5 100644 --- a/backend/pkg/controllers/billing/create_billing_doc.go +++ b/backend/pkg/controllers/billing/create_billing_doc.go @@ -23,8 +23,8 @@ import ( utilsclock "k8s.io/utils/clock" "k8s.io/utils/ptr" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" controllerutil "github.com/Azure/ARO-HCP/internal/controllerutils" diff --git a/backend/pkg/controllers/billing/create_billing_doc_test.go b/backend/pkg/controllers/billing/create_billing_doc_test.go index 1a1b482d360..ee09baffc2e 100644 --- a/backend/pkg/controllers/billing/create_billing_doc_test.go +++ b/backend/pkg/controllers/billing/create_billing_doc_test.go @@ -29,8 +29,8 @@ import ( azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/database" diff --git a/backend/pkg/controllers/billing/orphaned_billing_cleanup.go b/backend/pkg/controllers/billing/orphaned_billing_cleanup.go index cade27f3dd1..6e603a87f40 100644 --- a/backend/pkg/controllers/billing/orphaned_billing_cleanup.go +++ b/backend/pkg/controllers/billing/orphaned_billing_cleanup.go @@ -24,8 +24,8 @@ import ( "k8s.io/client-go/util/workqueue" utilsclock "k8s.io/utils/clock" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/utils" ) diff --git a/backend/pkg/controllers/cluster/creation/cluster_cluster_service_create_controller.go b/backend/pkg/controllers/cluster/creation/cluster_cluster_service_create_controller.go index fa390cf003a..0282942029d 100644 --- a/backend/pkg/controllers/cluster/creation/cluster_cluster_service_create_controller.go +++ b/backend/pkg/controllers/cluster/creation/cluster_cluster_service_create_controller.go @@ -22,9 +22,9 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" controllerutil "github.com/Azure/ARO-HCP/internal/controllerutils" "github.com/Azure/ARO-HCP/internal/database" diff --git a/backend/pkg/controllers/cluster/creation/cluster_cluster_service_create_controller_test.go b/backend/pkg/controllers/cluster/creation/cluster_cluster_service_create_controller_test.go index 045ee316b46..ce88757b6d4 100644 --- a/backend/pkg/controllers/cluster/creation/cluster_cluster_service_create_controller_test.go +++ b/backend/pkg/controllers/cluster/creation/cluster_cluster_service_create_controller_test.go @@ -32,8 +32,8 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/databasetesting" diff --git a/backend/pkg/controllers/cluster/creation/cluster_pending_cluster_service_id_assign_controller.go b/backend/pkg/controllers/cluster/creation/cluster_pending_cluster_service_id_assign_controller.go index 48dc8aa9201..0ff131ed982 100644 --- a/backend/pkg/controllers/cluster/creation/cluster_pending_cluster_service_id_assign_controller.go +++ b/backend/pkg/controllers/cluster/creation/cluster_pending_cluster_service_id_assign_controller.go @@ -19,9 +19,9 @@ import ( "fmt" "time" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/ocm" diff --git a/backend/pkg/controllers/cluster/creation/cluster_pending_cluster_service_id_assign_controller_test.go b/backend/pkg/controllers/cluster/creation/cluster_pending_cluster_service_id_assign_controller_test.go index fc0b551fe65..46fefa609de 100644 --- a/backend/pkg/controllers/cluster/creation/cluster_pending_cluster_service_id_assign_controller_test.go +++ b/backend/pkg/controllers/cluster/creation/cluster_pending_cluster_service_id_assign_controller_test.go @@ -25,8 +25,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/databasetesting" "github.com/Azure/ARO-HCP/internal/utils" diff --git a/backend/pkg/controllers/cluster/creation/create_service_provider_cluster_controller.go b/backend/pkg/controllers/cluster/creation/create_service_provider_cluster_controller.go index d103229727a..559959b3d61 100644 --- a/backend/pkg/controllers/cluster/creation/create_service_provider_cluster_controller.go +++ b/backend/pkg/controllers/cluster/creation/create_service_provider_cluster_controller.go @@ -19,9 +19,9 @@ import ( "fmt" "time" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/utils" ) diff --git a/backend/pkg/controllers/cluster/creation/create_service_provider_cluster_controller_test.go b/backend/pkg/controllers/cluster/creation/create_service_provider_cluster_controller_test.go index 5d71125768b..2e823a00099 100644 --- a/backend/pkg/controllers/cluster/creation/create_service_provider_cluster_controller_test.go +++ b/backend/pkg/controllers/cluster/creation/create_service_provider_cluster_controller_test.go @@ -28,9 +28,9 @@ import ( azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listers" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/database" diff --git a/backend/pkg/controllers/cluster/credentials/operations/dispatch_request_credential.go b/backend/pkg/controllers/cluster/credentials/operations/dispatch_request_credential.go index b234dd8a084..94200b6e54d 100644 --- a/backend/pkg/controllers/cluster/credentials/operations/dispatch_request_credential.go +++ b/backend/pkg/controllers/cluster/credentials/operations/dispatch_request_credential.go @@ -22,8 +22,7 @@ import ( "k8s.io/client-go/tools/cache" utilsclock "k8s.io/utils/clock" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" - operationbase "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/ocm" @@ -58,7 +57,7 @@ func NewDispatchRequestCredentialController( clustersServiceClient: clustersServiceClient, } - controller := operationbase.NewGenericOperationController( + controller := controllerutils.NewGenericOperationController( "DispatchRequestCredential", syncer, 10*time.Second, diff --git a/backend/pkg/controllers/cluster/credentials/operations/dispatch_request_credential_test.go b/backend/pkg/controllers/cluster/credentials/operations/dispatch_request_credential_test.go index bdd35692a40..9c6903cebaf 100644 --- a/backend/pkg/controllers/cluster/credentials/operations/dispatch_request_credential_test.go +++ b/backend/pkg/controllers/cluster/credentials/operations/dispatch_request_credential_test.go @@ -27,7 +27,7 @@ import ( cmv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1" - operationtesting "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation/operationtesting" + operationtesting "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils/operationtesting" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/database" diff --git a/backend/pkg/controllers/cluster/credentials/operations/dispatch_revoke_credentials.go b/backend/pkg/controllers/cluster/credentials/operations/dispatch_revoke_credentials.go index 27d8021b9cd..73c29928b2e 100644 --- a/backend/pkg/controllers/cluster/credentials/operations/dispatch_revoke_credentials.go +++ b/backend/pkg/controllers/cluster/credentials/operations/dispatch_revoke_credentials.go @@ -27,8 +27,7 @@ import ( ocmerrors "github.com/openshift-online/ocm-sdk-go/errors" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" - operationbase "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/database" @@ -63,7 +62,7 @@ func NewDispatchRevokeCredentialsController( clustersServiceClient: clustersServiceClient, } - controller := operationbase.NewGenericOperationController( + controller := controllerutils.NewGenericOperationController( "DispatchRevokeCredentials", syncer, 10*time.Second, diff --git a/backend/pkg/controllers/cluster/credentials/operations/dispatch_revoke_credentials_test.go b/backend/pkg/controllers/cluster/credentials/operations/dispatch_revoke_credentials_test.go index 62269e87e43..6a48d5e1b8a 100644 --- a/backend/pkg/controllers/cluster/credentials/operations/dispatch_revoke_credentials_test.go +++ b/backend/pkg/controllers/cluster/credentials/operations/dispatch_revoke_credentials_test.go @@ -25,7 +25,7 @@ import ( utilsclock "k8s.io/utils/clock" - operationtesting "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation/operationtesting" + operationtesting "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils/operationtesting" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/databasetesting" diff --git a/backend/pkg/controllers/cluster/credentials/operations/operation_request_credential.go b/backend/pkg/controllers/cluster/credentials/operations/operation_request_credential.go index 3e3a1dea1e2..c823ee9c893 100644 --- a/backend/pkg/controllers/cluster/credentials/operations/operation_request_credential.go +++ b/backend/pkg/controllers/cluster/credentials/operations/operation_request_credential.go @@ -25,8 +25,8 @@ import ( cmv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" - operationbase "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" + operationbase "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/database" @@ -70,7 +70,7 @@ func NewOperationRequestCredentialController( notificationClient: notificationClient, } - controller := operationbase.NewGenericOperationController( + controller := controllerutils.NewGenericOperationController( "OperationRequestCredential", syncer, 10*time.Second, diff --git a/backend/pkg/controllers/cluster/credentials/operations/operation_request_credential_test.go b/backend/pkg/controllers/cluster/credentials/operations/operation_request_credential_test.go index f1585464858..f2f412a0c18 100644 --- a/backend/pkg/controllers/cluster/credentials/operations/operation_request_credential_test.go +++ b/backend/pkg/controllers/cluster/credentials/operations/operation_request_credential_test.go @@ -28,7 +28,7 @@ import ( cmv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1" - operationtesting "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation/operationtesting" + operationtesting "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils/operationtesting" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/database" diff --git a/backend/pkg/controllers/cluster/credentials/operations/operation_revoke_credentials.go b/backend/pkg/controllers/cluster/credentials/operations/operation_revoke_credentials.go index b9f1871c949..d3af3801396 100644 --- a/backend/pkg/controllers/cluster/credentials/operations/operation_revoke_credentials.go +++ b/backend/pkg/controllers/cluster/credentials/operations/operation_revoke_credentials.go @@ -25,8 +25,8 @@ import ( cmv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" - operationbase "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" + operationbase "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/database" @@ -69,7 +69,7 @@ func NewOperationRevokeCredentialsController( notificationClient: notificationClient, } - controller := operationbase.NewGenericOperationController( + controller := controllerutils.NewGenericOperationController( "OperationRevokeCredentials", syncer, 10*time.Second, diff --git a/backend/pkg/controllers/cluster/credentials/operations/operation_revoke_credentials_test.go b/backend/pkg/controllers/cluster/credentials/operations/operation_revoke_credentials_test.go index a67b908c07e..74e700615f4 100644 --- a/backend/pkg/controllers/cluster/credentials/operations/operation_revoke_credentials_test.go +++ b/backend/pkg/controllers/cluster/credentials/operations/operation_revoke_credentials_test.go @@ -27,7 +27,7 @@ import ( cmv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1" - operationtesting "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation/operationtesting" + operationtesting "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils/operationtesting" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/database" diff --git a/backend/pkg/controllers/cluster/deletion/clean_orphaned_cluster_managed_resource_group_controller.go b/backend/pkg/controllers/cluster/deletion/clean_orphaned_cluster_managed_resource_group_controller.go index 5dda2c2278e..b3c728f99b2 100644 --- a/backend/pkg/controllers/cluster/deletion/clean_orphaned_cluster_managed_resource_group_controller.go +++ b/backend/pkg/controllers/cluster/deletion/clean_orphaned_cluster_managed_resource_group_controller.go @@ -37,9 +37,9 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" azureclient "github.com/Azure/ARO-HCP/backend/pkg/azure/client" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" controllerutil "github.com/Azure/ARO-HCP/internal/controllerutils" "github.com/Azure/ARO-HCP/internal/database" diff --git a/backend/pkg/controllers/cluster/deletion/cluster_child_resources_cleanup_controller.go b/backend/pkg/controllers/cluster/deletion/cluster_child_resources_cleanup_controller.go index 32c57d7aa53..0aec952cd4b 100644 --- a/backend/pkg/controllers/cluster/deletion/cluster_child_resources_cleanup_controller.go +++ b/backend/pkg/controllers/cluster/deletion/cluster_child_resources_cleanup_controller.go @@ -22,9 +22,9 @@ import ( azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/utils" diff --git a/backend/pkg/controllers/cluster/deletion/cluster_child_resources_cleanup_controller_test.go b/backend/pkg/controllers/cluster/deletion/cluster_child_resources_cleanup_controller_test.go index 4799c4bc99e..1939bd7b906 100644 --- a/backend/pkg/controllers/cluster/deletion/cluster_child_resources_cleanup_controller_test.go +++ b/backend/pkg/controllers/cluster/deletion/cluster_child_resources_cleanup_controller_test.go @@ -28,8 +28,8 @@ import ( azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/api/kubeapplier" diff --git a/backend/pkg/controllers/cluster/deletion/cluster_cluster_service_delete_dispatch_controller.go b/backend/pkg/controllers/cluster/deletion/cluster_cluster_service_delete_dispatch_controller.go index e400e2cce43..de39e1d5957 100644 --- a/backend/pkg/controllers/cluster/deletion/cluster_cluster_service_delete_dispatch_controller.go +++ b/backend/pkg/controllers/cluster/deletion/cluster_cluster_service_delete_dispatch_controller.go @@ -28,9 +28,9 @@ import ( ocmerrors "github.com/openshift-online/ocm-sdk-go/errors" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/ocm" diff --git a/backend/pkg/controllers/cluster/deletion/cluster_cluster_service_delete_dispatch_controller_test.go b/backend/pkg/controllers/cluster/deletion/cluster_cluster_service_delete_dispatch_controller_test.go index f7113ac3049..dd6c160d09a 100644 --- a/backend/pkg/controllers/cluster/deletion/cluster_cluster_service_delete_dispatch_controller_test.go +++ b/backend/pkg/controllers/cluster/deletion/cluster_cluster_service_delete_dispatch_controller_test.go @@ -35,8 +35,8 @@ import ( ocmerrors "github.com/openshift-online/ocm-sdk-go/errors" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/databasetesting" diff --git a/backend/pkg/controllers/cluster/deletion/cluster_cluster_service_id_clearer.go b/backend/pkg/controllers/cluster/deletion/cluster_cluster_service_id_clearer.go index c46637a778e..bc2d480979e 100644 --- a/backend/pkg/controllers/cluster/deletion/cluster_cluster_service_id_clearer.go +++ b/backend/pkg/controllers/cluster/deletion/cluster_cluster_service_id_clearer.go @@ -23,9 +23,9 @@ import ( ocmerrors "github.com/openshift-online/ocm-sdk-go/errors" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/ocm" diff --git a/backend/pkg/controllers/cluster/deletion/cluster_cluster_service_id_clearer_test.go b/backend/pkg/controllers/cluster/deletion/cluster_cluster_service_id_clearer_test.go index fd80375fc81..fcfd3010e87 100644 --- a/backend/pkg/controllers/cluster/deletion/cluster_cluster_service_id_clearer_test.go +++ b/backend/pkg/controllers/cluster/deletion/cluster_cluster_service_id_clearer_test.go @@ -27,8 +27,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/databasetesting" "github.com/Azure/ARO-HCP/internal/ocm" diff --git a/backend/pkg/controllers/cluster/deletion/cluster_deletion_controller.go b/backend/pkg/controllers/cluster/deletion/cluster_deletion_controller.go index 3da677cf22d..b09abc3a458 100644 --- a/backend/pkg/controllers/cluster/deletion/cluster_deletion_controller.go +++ b/backend/pkg/controllers/cluster/deletion/cluster_deletion_controller.go @@ -25,9 +25,9 @@ import ( azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/utils" diff --git a/backend/pkg/controllers/cluster/deletion/cluster_deletion_controller_test.go b/backend/pkg/controllers/cluster/deletion/cluster_deletion_controller_test.go index 66f8cf79ce2..7bd92f21976 100644 --- a/backend/pkg/controllers/cluster/deletion/cluster_deletion_controller_test.go +++ b/backend/pkg/controllers/cluster/deletion/cluster_deletion_controller_test.go @@ -29,8 +29,8 @@ import ( azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/database" diff --git a/backend/pkg/controllers/cluster/operations/operation_cluster_create.go b/backend/pkg/controllers/cluster/operations/operation_cluster_create.go index 739b98be3b7..3e0860670d0 100644 --- a/backend/pkg/controllers/cluster/operations/operation_cluster_create.go +++ b/backend/pkg/controllers/cluster/operations/operation_cluster_create.go @@ -34,11 +34,11 @@ import ( configv1 "github.com/openshift/api/config/v1" "github.com/openshift/hypershift/api/hypershift/v1beta1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" - operationbase "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/kubeapplierhelpers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" + operationbase "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/api/kubeapplier" @@ -99,7 +99,7 @@ func NewOperationClusterCreateController( notificationClient: notificationClient, } - controller := operationbase.NewGenericOperationController( + controller := controllerutils.NewGenericOperationController( "OperationClusterCreate", syncer, 10*time.Second, diff --git a/backend/pkg/controllers/cluster/operations/operation_cluster_create_test.go b/backend/pkg/controllers/cluster/operations/operation_cluster_create_test.go index d69742e8e2e..2c6973afb9a 100644 --- a/backend/pkg/controllers/cluster/operations/operation_cluster_create_test.go +++ b/backend/pkg/controllers/cluster/operations/operation_cluster_create_test.go @@ -35,9 +35,9 @@ import ( configv1 "github.com/openshift/api/config/v1" "github.com/openshift/hypershift/api/hypershift/v1beta1" - operationtesting "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation/operationtesting" "github.com/Azure/ARO-HCP/backend/pkg/listers" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + operationtesting "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils/operationtesting" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/api/kubeapplier" diff --git a/backend/pkg/controllers/cluster/operations/operation_cluster_delete.go b/backend/pkg/controllers/cluster/operations/operation_cluster_delete.go index e44517b7bc0..fbf8304eb26 100644 --- a/backend/pkg/controllers/cluster/operations/operation_cluster_delete.go +++ b/backend/pkg/controllers/cluster/operations/operation_cluster_delete.go @@ -30,9 +30,9 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" ocmerrors "github.com/openshift-online/ocm-sdk-go/errors" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" - operationbase "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation" "github.com/Azure/ARO-HCP/backend/pkg/kubeapplierhelpers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" + operationbase "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/api/kubeapplier" @@ -95,7 +95,7 @@ func NewOperationClusterDeleteController( notificationClient: notificationClient, } - controller := operationbase.NewGenericOperationController( + controller := controllerutils.NewGenericOperationController( "OperationClusterDelete", syncer, 10*time.Second, diff --git a/backend/pkg/controllers/cluster/operations/operation_cluster_delete_legacy.go b/backend/pkg/controllers/cluster/operations/operation_cluster_delete_legacy.go index 1745e8ec435..c62a560e753 100644 --- a/backend/pkg/controllers/cluster/operations/operation_cluster_delete_legacy.go +++ b/backend/pkg/controllers/cluster/operations/operation_cluster_delete_legacy.go @@ -22,8 +22,8 @@ import ( ocmerrors "github.com/openshift-online/ocm-sdk-go/errors" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" - operationbase "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" + operationbase "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/utils" diff --git a/backend/pkg/controllers/cluster/operations/operation_cluster_delete_test.go b/backend/pkg/controllers/cluster/operations/operation_cluster_delete_test.go index e4e0008d5db..210238f6195 100644 --- a/backend/pkg/controllers/cluster/operations/operation_cluster_delete_test.go +++ b/backend/pkg/controllers/cluster/operations/operation_cluster_delete_test.go @@ -31,7 +31,7 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" ocmerrors "github.com/openshift-online/ocm-sdk-go/errors" - operationtesting "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation/operationtesting" + operationtesting "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils/operationtesting" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/database" diff --git a/backend/pkg/controllers/cluster/operations/operation_cluster_update.go b/backend/pkg/controllers/cluster/operations/operation_cluster_update.go index af3206b58c6..7ab3a8db697 100644 --- a/backend/pkg/controllers/cluster/operations/operation_cluster_update.go +++ b/backend/pkg/controllers/cluster/operations/operation_cluster_update.go @@ -33,10 +33,10 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" - operationbase "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" + operationbase "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/database" @@ -96,7 +96,7 @@ func NewOperationClusterUpdateController( desiredVersionMismatchFirstSeen: lru.New(100000), } - controller := operationbase.NewGenericOperationController( + controller := controllerutils.NewGenericOperationController( "OperationClusterUpdate", syncer, 10*time.Second, diff --git a/backend/pkg/controllers/cluster/operations/operation_cluster_update_state_calculation.go b/backend/pkg/controllers/cluster/operations/operation_cluster_update_state_calculation.go index 6eae5f2d930..4baacdf930e 100644 --- a/backend/pkg/controllers/cluster/operations/operation_cluster_update_state_calculation.go +++ b/backend/pkg/controllers/cluster/operations/operation_cluster_update_state_calculation.go @@ -28,8 +28,8 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" "github.com/openshift/hypershift/api/hypershift/v1beta1" - operationbase "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation" "github.com/Azure/ARO-HCP/backend/pkg/kubeapplierhelpers" + operationbase "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/ocm" diff --git a/backend/pkg/controllers/cluster/operations/operation_cluster_update_state_calculation_test.go b/backend/pkg/controllers/cluster/operations/operation_cluster_update_state_calculation_test.go index 635ced39579..f62c426b24c 100644 --- a/backend/pkg/controllers/cluster/operations/operation_cluster_update_state_calculation_test.go +++ b/backend/pkg/controllers/cluster/operations/operation_cluster_update_state_calculation_test.go @@ -35,8 +35,8 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" "github.com/openshift/hypershift/api/hypershift/v1beta1" - operationtesting "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation/operationtesting" "github.com/Azure/ARO-HCP/backend/pkg/kubeapplierhelpers" + operationtesting "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils/operationtesting" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/api/kubeapplier" diff --git a/backend/pkg/controllers/cluster/operations/operation_cluster_update_test.go b/backend/pkg/controllers/cluster/operations/operation_cluster_update_test.go index 3584e94fac2..cd320b8af25 100644 --- a/backend/pkg/controllers/cluster/operations/operation_cluster_update_test.go +++ b/backend/pkg/controllers/cluster/operations/operation_cluster_update_test.go @@ -37,9 +37,9 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" "github.com/openshift/hypershift/api/hypershift/v1beta1" - operationtesting "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation/operationtesting" "github.com/Azure/ARO-HCP/backend/pkg/listers" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + operationtesting "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils/operationtesting" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/api/kubeapplier" diff --git a/backend/pkg/controllers/cluster/placement/management_cluster_placement_sync.go b/backend/pkg/controllers/cluster/placement/management_cluster_placement_sync.go index 76da646d9bd..39c082b3019 100644 --- a/backend/pkg/controllers/cluster/placement/management_cluster_placement_sync.go +++ b/backend/pkg/controllers/cluster/placement/management_cluster_placement_sync.go @@ -19,9 +19,9 @@ import ( "fmt" "time" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" dblisters "github.com/Azure/ARO-HCP/internal/database/listers" diff --git a/backend/pkg/controllers/cluster/placement/management_cluster_placement_sync_test.go b/backend/pkg/controllers/cluster/placement/management_cluster_placement_sync_test.go index c64cf42ce49..4cf8c2801ae 100644 --- a/backend/pkg/controllers/cluster/placement/management_cluster_placement_sync_test.go +++ b/backend/pkg/controllers/cluster/placement/management_cluster_placement_sync_test.go @@ -30,8 +30,8 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/api/fleet" diff --git a/backend/pkg/controllers/cluster/properties/cluster_base_domain_prefix_sync.go b/backend/pkg/controllers/cluster/properties/cluster_base_domain_prefix_sync.go index b88971cd26d..5461746ce12 100644 --- a/backend/pkg/controllers/cluster/properties/cluster_base_domain_prefix_sync.go +++ b/backend/pkg/controllers/cluster/properties/cluster_base_domain_prefix_sync.go @@ -21,9 +21,9 @@ import ( "k8s.io/apimachinery/pkg/api/equality" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" unionkubeapplierinformers "github.com/Azure/ARO-HCP/internal/database/unioninformers/kubeapplier" diff --git a/backend/pkg/controllers/cluster/properties/cluster_base_domain_prefix_sync_test.go b/backend/pkg/controllers/cluster/properties/cluster_base_domain_prefix_sync_test.go index 3895fdfc889..93c180b5894 100644 --- a/backend/pkg/controllers/cluster/properties/cluster_base_domain_prefix_sync_test.go +++ b/backend/pkg/controllers/cluster/properties/cluster_base_domain_prefix_sync_test.go @@ -24,8 +24,8 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/databasetesting" "github.com/Azure/ARO-HCP/internal/ocm" diff --git a/backend/pkg/controllers/cluster/properties/cluster_properties_sync.go b/backend/pkg/controllers/cluster/properties/cluster_properties_sync.go index f4364b6fd23..2b37eb62fcc 100644 --- a/backend/pkg/controllers/cluster/properties/cluster_properties_sync.go +++ b/backend/pkg/controllers/cluster/properties/cluster_properties_sync.go @@ -24,10 +24,10 @@ import ( "k8s.io/apimachinery/pkg/api/equality" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/kubeapplierhelpers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/database" dblisters "github.com/Azure/ARO-HCP/internal/database/listers" unionkubeapplierinformers "github.com/Azure/ARO-HCP/internal/database/unioninformers/kubeapplier" diff --git a/backend/pkg/controllers/cluster/properties/cluster_properties_sync_test.go b/backend/pkg/controllers/cluster/properties/cluster_properties_sync_test.go index ee652b0d914..2e4e3878855 100644 --- a/backend/pkg/controllers/cluster/properties/cluster_properties_sync_test.go +++ b/backend/pkg/controllers/cluster/properties/cluster_properties_sync_test.go @@ -23,8 +23,8 @@ import ( hsv1beta1 "github.com/openshift/hypershift/api/hypershift/v1beta1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/kubeapplier" "github.com/Azure/ARO-HCP/internal/databasetesting" diff --git a/backend/pkg/controllers/cluster/properties/desired_control_plane_size_sync.go b/backend/pkg/controllers/cluster/properties/desired_control_plane_size_sync.go index efde3622c10..9ddeacfd5c1 100644 --- a/backend/pkg/controllers/cluster/properties/desired_control_plane_size_sync.go +++ b/backend/pkg/controllers/cluster/properties/desired_control_plane_size_sync.go @@ -21,9 +21,9 @@ import ( "k8s.io/utils/ptr" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" unionkubeapplierinformers "github.com/Azure/ARO-HCP/internal/database/unioninformers/kubeapplier" diff --git a/backend/pkg/controllers/cluster/properties/desired_control_plane_size_sync_test.go b/backend/pkg/controllers/cluster/properties/desired_control_plane_size_sync_test.go index ca16dd68839..59efb76bce8 100644 --- a/backend/pkg/controllers/cluster/properties/desired_control_plane_size_sync_test.go +++ b/backend/pkg/controllers/cluster/properties/desired_control_plane_size_sync_test.go @@ -28,8 +28,8 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/databasetesting" diff --git a/backend/pkg/controllers/cluster/properties/identity_migration.go b/backend/pkg/controllers/cluster/properties/identity_migration.go index 9f82b6829e1..c416e528159 100644 --- a/backend/pkg/controllers/cluster/properties/identity_migration.go +++ b/backend/pkg/controllers/cluster/properties/identity_migration.go @@ -21,9 +21,9 @@ import ( "k8s.io/utils/ptr" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/database" diff --git a/backend/pkg/controllers/cluster/properties/identity_migration_test.go b/backend/pkg/controllers/cluster/properties/identity_migration_test.go index c8fc3fc4d1e..bf7ee2df123 100644 --- a/backend/pkg/controllers/cluster/properties/identity_migration_test.go +++ b/backend/pkg/controllers/cluster/properties/identity_migration_test.go @@ -27,8 +27,8 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/databasetesting" diff --git a/backend/pkg/controllers/cluster/properties/serviceprovidercluster_properties_sync.go b/backend/pkg/controllers/cluster/properties/serviceprovidercluster_properties_sync.go index e3de0cbacbd..f4a52b386f3 100644 --- a/backend/pkg/controllers/cluster/properties/serviceprovidercluster_properties_sync.go +++ b/backend/pkg/controllers/cluster/properties/serviceprovidercluster_properties_sync.go @@ -22,10 +22,10 @@ import ( "k8s.io/apimachinery/pkg/api/equality" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/kubeapplierhelpers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/database" dblisters "github.com/Azure/ARO-HCP/internal/database/listers" unionkubeapplierinformers "github.com/Azure/ARO-HCP/internal/database/unioninformers/kubeapplier" diff --git a/backend/pkg/controllers/cluster/properties/serviceprovidercluster_properties_sync_test.go b/backend/pkg/controllers/cluster/properties/serviceprovidercluster_properties_sync_test.go index a0b60df51f7..bac7c5fb095 100644 --- a/backend/pkg/controllers/cluster/properties/serviceprovidercluster_properties_sync_test.go +++ b/backend/pkg/controllers/cluster/properties/serviceprovidercluster_properties_sync_test.go @@ -23,8 +23,8 @@ import ( hsv1beta1 "github.com/openshift/hypershift/api/hypershift/v1beta1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/kubeapplier" "github.com/Azure/ARO-HCP/internal/databasetesting" diff --git a/backend/pkg/controllers/cluster/readdesires/create_cluster_scoped_read_desires_controller.go b/backend/pkg/controllers/cluster/readdesires/create_cluster_scoped_read_desires_controller.go index 446337481e3..7eecf4100d4 100644 --- a/backend/pkg/controllers/cluster/readdesires/create_cluster_scoped_read_desires_controller.go +++ b/backend/pkg/controllers/cluster/readdesires/create_cluster_scoped_read_desires_controller.go @@ -23,10 +23,10 @@ import ( hsv1beta1 "github.com/openshift/hypershift/api/hypershift/v1beta1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/kubeapplierhelpers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/kubeapplier" "github.com/Azure/ARO-HCP/internal/database" diff --git a/backend/pkg/controllers/cluster/readdesires/create_cluster_scoped_read_desires_controller_test.go b/backend/pkg/controllers/cluster/readdesires/create_cluster_scoped_read_desires_controller_test.go index 0328cf00211..a91ba8f4f3d 100644 --- a/backend/pkg/controllers/cluster/readdesires/create_cluster_scoped_read_desires_controller_test.go +++ b/backend/pkg/controllers/cluster/readdesires/create_cluster_scoped_read_desires_controller_test.go @@ -27,9 +27,9 @@ import ( hsv1beta1 "github.com/openshift/hypershift/api/hypershift/v1beta1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/kubeapplierhelpers" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/api/kubeapplier" diff --git a/backend/pkg/controllers/cluster/status/cluster_degraded_aggregator.go b/backend/pkg/controllers/cluster/status/cluster_degraded_aggregator.go index 80181f9ba15..62f3e9c0e74 100644 --- a/backend/pkg/controllers/cluster/status/cluster_degraded_aggregator.go +++ b/backend/pkg/controllers/cluster/status/cluster_degraded_aggregator.go @@ -24,10 +24,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilsclock "k8s.io/utils/clock" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/statusutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" + "github.com/Azure/ARO-HCP/backend/pkg/utils/statusutils" "github.com/Azure/ARO-HCP/internal/database" unionkubeapplierinformers "github.com/Azure/ARO-HCP/internal/database/unioninformers/kubeapplier" "github.com/Azure/ARO-HCP/internal/utils" diff --git a/backend/pkg/controllers/cluster/status/cluster_degraded_aggregator_test.go b/backend/pkg/controllers/cluster/status/cluster_degraded_aggregator_test.go index 03cc024b439..8a993d06d00 100644 --- a/backend/pkg/controllers/cluster/status/cluster_degraded_aggregator_test.go +++ b/backend/pkg/controllers/cluster/status/cluster_degraded_aggregator_test.go @@ -30,9 +30,9 @@ import ( azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/statusutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" + "github.com/Azure/ARO-HCP/backend/pkg/utils/statusutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/databasetesting" diff --git a/backend/pkg/controllers/cluster/status/cluster_requirements_valid_aggregator.go b/backend/pkg/controllers/cluster/status/cluster_requirements_valid_aggregator.go index 01da82bc252..e862b2921c3 100644 --- a/backend/pkg/controllers/cluster/status/cluster_requirements_valid_aggregator.go +++ b/backend/pkg/controllers/cluster/status/cluster_requirements_valid_aggregator.go @@ -22,10 +22,10 @@ import ( "k8s.io/apimachinery/pkg/api/equality" apimeta "k8s.io/apimachinery/pkg/api/meta" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/statusutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" + "github.com/Azure/ARO-HCP/backend/pkg/utils/statusutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/utils" diff --git a/backend/pkg/controllers/cluster/status/cluster_requirements_valid_aggregator_test.go b/backend/pkg/controllers/cluster/status/cluster_requirements_valid_aggregator_test.go index 5a39d85b924..515cfe9b99c 100644 --- a/backend/pkg/controllers/cluster/status/cluster_requirements_valid_aggregator_test.go +++ b/backend/pkg/controllers/cluster/status/cluster_requirements_valid_aggregator_test.go @@ -28,9 +28,9 @@ import ( azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/statusutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" + "github.com/Azure/ARO-HCP/backend/pkg/utils/statusutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/databasetesting" diff --git a/backend/pkg/controllers/cluster/update/cluster_cluster_service_update_dispatch_controller.go b/backend/pkg/controllers/cluster/update/cluster_cluster_service_update_dispatch_controller.go index baca47ff15e..38064ac95de 100644 --- a/backend/pkg/controllers/cluster/update/cluster_cluster_service_update_dispatch_controller.go +++ b/backend/pkg/controllers/cluster/update/cluster_cluster_service_update_dispatch_controller.go @@ -28,9 +28,9 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" ocmerrors "github.com/openshift-online/ocm-sdk-go/errors" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" controllerutil "github.com/Azure/ARO-HCP/internal/controllerutils" "github.com/Azure/ARO-HCP/internal/database" diff --git a/backend/pkg/controllers/cluster/update/cluster_cluster_service_update_dispatch_controller_test.go b/backend/pkg/controllers/cluster/update/cluster_cluster_service_update_dispatch_controller_test.go index 65f851f09b8..b058fc8a316 100644 --- a/backend/pkg/controllers/cluster/update/cluster_cluster_service_update_dispatch_controller_test.go +++ b/backend/pkg/controllers/cluster/update/cluster_cluster_service_update_dispatch_controller_test.go @@ -32,9 +32,9 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" ocmerrors "github.com/openshift-online/ocm-sdk-go/errors" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listers" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" controllerutil "github.com/Azure/ARO-HCP/internal/controllerutils" diff --git a/backend/pkg/controllers/cluster/validation/cluster_validation_controller.go b/backend/pkg/controllers/cluster/validation/cluster_validation_controller.go index d8427ba87c2..6a6bd3723c1 100644 --- a/backend/pkg/controllers/cluster/validation/cluster_validation_controller.go +++ b/backend/pkg/controllers/cluster/validation/cluster_validation_controller.go @@ -22,10 +22,10 @@ import ( "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/validationutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" + "github.com/Azure/ARO-HCP/backend/pkg/utils/validationutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/utils" diff --git a/backend/pkg/controllers/cluster/version/control_plane_active_version_controller.go b/backend/pkg/controllers/cluster/version/control_plane_active_version_controller.go index b693c440fda..260cdcb4cc2 100644 --- a/backend/pkg/controllers/cluster/version/control_plane_active_version_controller.go +++ b/backend/pkg/controllers/cluster/version/control_plane_active_version_controller.go @@ -24,10 +24,10 @@ import ( configv1 "github.com/openshift/api/config/v1" hsv1beta1 "github.com/openshift/hypershift/api/hypershift/v1beta1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/kubeapplierhelpers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" controllerutil "github.com/Azure/ARO-HCP/internal/controllerutils" "github.com/Azure/ARO-HCP/internal/database" diff --git a/backend/pkg/controllers/cluster/version/control_plane_active_version_controller_test.go b/backend/pkg/controllers/cluster/version/control_plane_active_version_controller_test.go index 145658083d3..961097e12e2 100644 --- a/backend/pkg/controllers/cluster/version/control_plane_active_version_controller_test.go +++ b/backend/pkg/controllers/cluster/version/control_plane_active_version_controller_test.go @@ -33,8 +33,8 @@ import ( configv1 "github.com/openshift/api/config/v1" hsv1beta1 "github.com/openshift/hypershift/api/hypershift/v1beta1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/api/kubeapplier" diff --git a/backend/pkg/controllers/cluster/version/control_plane_desired_version_controller.go b/backend/pkg/controllers/cluster/version/control_plane_desired_version_controller.go index 9f1e1b25d14..7d0807805a4 100644 --- a/backend/pkg/controllers/cluster/version/control_plane_desired_version_controller.go +++ b/backend/pkg/controllers/cluster/version/control_plane_desired_version_controller.go @@ -32,10 +32,10 @@ import ( cvocincinnati "github.com/openshift/cluster-version-operator/pkg/cincinnati" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/kubeapplierhelpers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/admission" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/cincinnati" diff --git a/backend/pkg/controllers/cluster/version/control_plane_desired_version_controller_test.go b/backend/pkg/controllers/cluster/version/control_plane_desired_version_controller_test.go index 3846c3d85cc..32806a67652 100644 --- a/backend/pkg/controllers/cluster/version/control_plane_desired_version_controller_test.go +++ b/backend/pkg/controllers/cluster/version/control_plane_desired_version_controller_test.go @@ -37,9 +37,9 @@ import ( configv1 "github.com/openshift/api/config/v1" cvocincinnati "github.com/openshift/cluster-version-operator/pkg/cincinnati" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listers" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/cincinnati" diff --git a/backend/pkg/controllers/cluster/version/trigger_control_plane_upgrade_controller.go b/backend/pkg/controllers/cluster/version/trigger_control_plane_upgrade_controller.go index 9e5ec62edef..7f3278f999c 100644 --- a/backend/pkg/controllers/cluster/version/trigger_control_plane_upgrade_controller.go +++ b/backend/pkg/controllers/cluster/version/trigger_control_plane_upgrade_controller.go @@ -25,9 +25,9 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" unionkubeapplierinformers "github.com/Azure/ARO-HCP/internal/database/unioninformers/kubeapplier" diff --git a/backend/pkg/controllers/cosmosmigration/cosmos_migration.go b/backend/pkg/controllers/cosmosmigration/cosmos_migration.go index da975244b45..a248c2b3f59 100644 --- a/backend/pkg/controllers/cosmosmigration/cosmos_migration.go +++ b/backend/pkg/controllers/cosmosmigration/cosmos_migration.go @@ -23,8 +23,8 @@ import ( "github.com/go-logr/logr" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/api/kubeapplier" diff --git a/backend/pkg/controllers/cosmosmigration/cosmos_migration_test.go b/backend/pkg/controllers/cosmosmigration/cosmos_migration_test.go index fe6f5f34812..0c37a9149d5 100644 --- a/backend/pkg/controllers/cosmosmigration/cosmos_migration_test.go +++ b/backend/pkg/controllers/cosmosmigration/cosmos_migration_test.go @@ -28,7 +28,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/data/azcosmos" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/databasetesting" diff --git a/backend/pkg/controllers/datadump/billing_dump.go b/backend/pkg/controllers/datadump/billing_dump.go index 0c2e844f0dd..1cee6878d61 100644 --- a/backend/pkg/controllers/datadump/billing_dump.go +++ b/backend/pkg/controllers/datadump/billing_dump.go @@ -18,9 +18,9 @@ import ( "context" "time" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" controllerutil "github.com/Azure/ARO-HCP/internal/controllerutils" "github.com/Azure/ARO-HCP/internal/database" unionkubeapplierinformers "github.com/Azure/ARO-HCP/internal/database/unioninformers/kubeapplier" diff --git a/backend/pkg/controllers/datadump/billing_dump_test.go b/backend/pkg/controllers/datadump/billing_dump_test.go index f9b2b979c89..d0e23218c96 100644 --- a/backend/pkg/controllers/datadump/billing_dump_test.go +++ b/backend/pkg/controllers/datadump/billing_dump_test.go @@ -22,7 +22,7 @@ import ( azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/databasetesting" ) diff --git a/backend/pkg/controllers/datadump/cs_state_dump.go b/backend/pkg/controllers/datadump/cs_state_dump.go index 0005f2fdd91..578d438d431 100644 --- a/backend/pkg/controllers/datadump/cs_state_dump.go +++ b/backend/pkg/controllers/datadump/cs_state_dump.go @@ -24,9 +24,9 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" cmv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" controllerutil "github.com/Azure/ARO-HCP/internal/controllerutils" "github.com/Azure/ARO-HCP/internal/database" unionkubeapplierinformers "github.com/Azure/ARO-HCP/internal/database/unioninformers/kubeapplier" diff --git a/backend/pkg/controllers/datadump/cs_state_dump_test.go b/backend/pkg/controllers/datadump/cs_state_dump_test.go index 0f898d45a6a..6dfce8a7966 100644 --- a/backend/pkg/controllers/datadump/cs_state_dump_test.go +++ b/backend/pkg/controllers/datadump/cs_state_dump_test.go @@ -28,7 +28,7 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/databasetesting" diff --git a/backend/pkg/controllers/datadump/dump_cluster_recursive.go b/backend/pkg/controllers/datadump/dump_cluster_recursive.go index 90c18abf115..b317afe853b 100644 --- a/backend/pkg/controllers/datadump/dump_cluster_recursive.go +++ b/backend/pkg/controllers/datadump/dump_cluster_recursive.go @@ -18,9 +18,9 @@ import ( "context" "time" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" controllerutil "github.com/Azure/ARO-HCP/internal/controllerutils" "github.com/Azure/ARO-HCP/internal/database" dblisters "github.com/Azure/ARO-HCP/internal/database/listers" diff --git a/backend/pkg/controllers/datadump/dump_management_cluster.go b/backend/pkg/controllers/datadump/dump_management_cluster.go index f510932fd98..65052db1b92 100644 --- a/backend/pkg/controllers/datadump/dump_management_cluster.go +++ b/backend/pkg/controllers/datadump/dump_management_cluster.go @@ -19,7 +19,7 @@ import ( "fmt" "time" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" controllerutil "github.com/Azure/ARO-HCP/internal/controllerutils" "github.com/Azure/ARO-HCP/internal/database" dbinformers "github.com/Azure/ARO-HCP/internal/database/informers" diff --git a/backend/pkg/controllers/datadump/dump_subscription_non_cluster.go b/backend/pkg/controllers/datadump/dump_subscription_non_cluster.go index 22262fdc879..f63c51c1463 100644 --- a/backend/pkg/controllers/datadump/dump_subscription_non_cluster.go +++ b/backend/pkg/controllers/datadump/dump_subscription_non_cluster.go @@ -19,8 +19,8 @@ import ( "fmt" "time" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" controllerutil "github.com/Azure/ARO-HCP/internal/controllerutils" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/serverutils" diff --git a/backend/pkg/controllers/example/do_nothing.go b/backend/pkg/controllers/example/do_nothing.go index 4ef145cb312..e911ec198f8 100644 --- a/backend/pkg/controllers/example/do_nothing.go +++ b/backend/pkg/controllers/example/do_nothing.go @@ -25,8 +25,8 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/util/workqueue" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/utils" ) diff --git a/backend/pkg/controllers/externalauth/creation/external_auth_cluster_service_create_controller.go b/backend/pkg/controllers/externalauth/creation/external_auth_cluster_service_create_controller.go index eb39d049c7f..5eef3763ed5 100644 --- a/backend/pkg/controllers/externalauth/creation/external_auth_cluster_service_create_controller.go +++ b/backend/pkg/controllers/externalauth/creation/external_auth_cluster_service_create_controller.go @@ -25,9 +25,9 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" ocmerrors "github.com/openshift-online/ocm-sdk-go/errors" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" controllerutil "github.com/Azure/ARO-HCP/internal/controllerutils" "github.com/Azure/ARO-HCP/internal/database" diff --git a/backend/pkg/controllers/externalauth/creation/external_auth_cluster_service_create_controller_test.go b/backend/pkg/controllers/externalauth/creation/external_auth_cluster_service_create_controller_test.go index b3e8c76530c..07a4cea8145 100644 --- a/backend/pkg/controllers/externalauth/creation/external_auth_cluster_service_create_controller_test.go +++ b/backend/pkg/controllers/externalauth/creation/external_auth_cluster_service_create_controller_test.go @@ -33,8 +33,8 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" ocmerrors "github.com/openshift-online/ocm-sdk-go/errors" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/databasetesting" diff --git a/backend/pkg/controllers/externalauth/deletion/external_auth_child_resources_cleanup_controller.go b/backend/pkg/controllers/externalauth/deletion/external_auth_child_resources_cleanup_controller.go index cec2599eecc..71510969c00 100644 --- a/backend/pkg/controllers/externalauth/deletion/external_auth_child_resources_cleanup_controller.go +++ b/backend/pkg/controllers/externalauth/deletion/external_auth_child_resources_cleanup_controller.go @@ -22,9 +22,9 @@ import ( azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/utils" diff --git a/backend/pkg/controllers/externalauth/deletion/external_auth_child_resources_cleanup_controller_test.go b/backend/pkg/controllers/externalauth/deletion/external_auth_child_resources_cleanup_controller_test.go index d2a0884ae5e..1f2e164bba9 100644 --- a/backend/pkg/controllers/externalauth/deletion/external_auth_child_resources_cleanup_controller_test.go +++ b/backend/pkg/controllers/externalauth/deletion/external_auth_child_resources_cleanup_controller_test.go @@ -29,8 +29,8 @@ import ( azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/database" diff --git a/backend/pkg/controllers/externalauth/deletion/external_auth_cluster_service_delete_dispatch_controller.go b/backend/pkg/controllers/externalauth/deletion/external_auth_cluster_service_delete_dispatch_controller.go index 863ae41c081..1da9d566f04 100644 --- a/backend/pkg/controllers/externalauth/deletion/external_auth_cluster_service_delete_dispatch_controller.go +++ b/backend/pkg/controllers/externalauth/deletion/external_auth_cluster_service_delete_dispatch_controller.go @@ -28,9 +28,9 @@ import ( ocmerrors "github.com/openshift-online/ocm-sdk-go/errors" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/ocm" diff --git a/backend/pkg/controllers/externalauth/deletion/external_auth_cluster_service_delete_dispatch_controller_test.go b/backend/pkg/controllers/externalauth/deletion/external_auth_cluster_service_delete_dispatch_controller_test.go index d1466610ad2..85541522c22 100644 --- a/backend/pkg/controllers/externalauth/deletion/external_auth_cluster_service_delete_dispatch_controller_test.go +++ b/backend/pkg/controllers/externalauth/deletion/external_auth_cluster_service_delete_dispatch_controller_test.go @@ -35,8 +35,8 @@ import ( ocmerrors "github.com/openshift-online/ocm-sdk-go/errors" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/databasetesting" diff --git a/backend/pkg/controllers/externalauth/deletion/external_auth_cluster_service_id_clearer.go b/backend/pkg/controllers/externalauth/deletion/external_auth_cluster_service_id_clearer.go index a56821c0b18..7674a20985c 100644 --- a/backend/pkg/controllers/externalauth/deletion/external_auth_cluster_service_id_clearer.go +++ b/backend/pkg/controllers/externalauth/deletion/external_auth_cluster_service_id_clearer.go @@ -23,9 +23,9 @@ import ( ocmerrors "github.com/openshift-online/ocm-sdk-go/errors" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/ocm" diff --git a/backend/pkg/controllers/externalauth/deletion/external_auth_cluster_service_id_clearer_test.go b/backend/pkg/controllers/externalauth/deletion/external_auth_cluster_service_id_clearer_test.go index 07cc0461da6..816df81daad 100644 --- a/backend/pkg/controllers/externalauth/deletion/external_auth_cluster_service_id_clearer_test.go +++ b/backend/pkg/controllers/externalauth/deletion/external_auth_cluster_service_id_clearer_test.go @@ -29,8 +29,8 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/databasetesting" "github.com/Azure/ARO-HCP/internal/ocm" diff --git a/backend/pkg/controllers/externalauth/deletion/external_auth_deletion_controller.go b/backend/pkg/controllers/externalauth/deletion/external_auth_deletion_controller.go index 4113e0a4b02..e2a59174736 100644 --- a/backend/pkg/controllers/externalauth/deletion/external_auth_deletion_controller.go +++ b/backend/pkg/controllers/externalauth/deletion/external_auth_deletion_controller.go @@ -20,9 +20,9 @@ import ( "strings" "time" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/utils" diff --git a/backend/pkg/controllers/externalauth/deletion/external_auth_deletion_controller_test.go b/backend/pkg/controllers/externalauth/deletion/external_auth_deletion_controller_test.go index c134002c520..bc7bd98a8be 100644 --- a/backend/pkg/controllers/externalauth/deletion/external_auth_deletion_controller_test.go +++ b/backend/pkg/controllers/externalauth/deletion/external_auth_deletion_controller_test.go @@ -25,8 +25,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/databasetesting" diff --git a/backend/pkg/controllers/externalauth/operations/operation_external_auth_create.go b/backend/pkg/controllers/externalauth/operations/operation_external_auth_create.go index bb5e541f927..29eab4d1ee9 100644 --- a/backend/pkg/controllers/externalauth/operations/operation_external_auth_create.go +++ b/backend/pkg/controllers/externalauth/operations/operation_external_auth_create.go @@ -26,10 +26,10 @@ import ( "k8s.io/client-go/tools/cache" utilsclock "k8s.io/utils/clock" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" - operationbase "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" + operationbase "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/database" @@ -80,7 +80,7 @@ func NewOperationExternalAuthCreateController( notificationClient: notificationClient, } - controller := operationbase.NewGenericOperationController( + controller := controllerutils.NewGenericOperationController( "OperationExternalAuthCreate", syncer, 10*time.Second, diff --git a/backend/pkg/controllers/externalauth/operations/operation_external_auth_create_test.go b/backend/pkg/controllers/externalauth/operations/operation_external_auth_create_test.go index 835a6d1e078..d69cd340fef 100644 --- a/backend/pkg/controllers/externalauth/operations/operation_external_auth_create_test.go +++ b/backend/pkg/controllers/externalauth/operations/operation_external_auth_create_test.go @@ -30,8 +30,8 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" - operationtesting "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation/operationtesting" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + operationtesting "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils/operationtesting" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/database" diff --git a/backend/pkg/controllers/externalauth/operations/operation_external_auth_delete.go b/backend/pkg/controllers/externalauth/operations/operation_external_auth_delete.go index cdd76a57774..0859b68698b 100644 --- a/backend/pkg/controllers/externalauth/operations/operation_external_auth_delete.go +++ b/backend/pkg/controllers/externalauth/operations/operation_external_auth_delete.go @@ -27,8 +27,8 @@ import ( ocmerrors "github.com/openshift-online/ocm-sdk-go/errors" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" - operationbase "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" + operationbase "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/ocm" @@ -80,7 +80,7 @@ func NewOperationExternalAuthDeleteController( notificationClient: notificationClient, } - controller := operationbase.NewGenericOperationController( + controller := controllerutils.NewGenericOperationController( "OperationExternalAuthDelete", syncer, 10*time.Second, diff --git a/backend/pkg/controllers/externalauth/operations/operation_external_auth_delete_legacy.go b/backend/pkg/controllers/externalauth/operations/operation_external_auth_delete_legacy.go index 065f3cddfbd..48192289be4 100644 --- a/backend/pkg/controllers/externalauth/operations/operation_external_auth_delete_legacy.go +++ b/backend/pkg/controllers/externalauth/operations/operation_external_auth_delete_legacy.go @@ -22,7 +22,7 @@ import ( ocmerrors "github.com/openshift-online/ocm-sdk-go/errors" - operationbase "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation" + operationbase "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/utils" diff --git a/backend/pkg/controllers/externalauth/operations/operation_external_auth_delete_test.go b/backend/pkg/controllers/externalauth/operations/operation_external_auth_delete_test.go index a7a681e3104..22d9a7ef940 100644 --- a/backend/pkg/controllers/externalauth/operations/operation_external_auth_delete_test.go +++ b/backend/pkg/controllers/externalauth/operations/operation_external_auth_delete_test.go @@ -31,8 +31,8 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" ocmerrors "github.com/openshift-online/ocm-sdk-go/errors" - operationbase "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation" - operationtesting "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation/operationtesting" + operationbase "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils" + operationtesting "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils/operationtesting" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/database" diff --git a/backend/pkg/controllers/externalauth/operations/operation_external_auth_update.go b/backend/pkg/controllers/externalauth/operations/operation_external_auth_update.go index 4ddcf0b0b14..2c54409c29b 100644 --- a/backend/pkg/controllers/externalauth/operations/operation_external_auth_update.go +++ b/backend/pkg/controllers/externalauth/operations/operation_external_auth_update.go @@ -26,10 +26,10 @@ import ( "k8s.io/client-go/tools/cache" utilsclock "k8s.io/utils/clock" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" - operationbase "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" + operationbase "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/database" @@ -84,7 +84,7 @@ func NewOperationExternalAuthUpdateController( notificationClient: notificationClient, } - controller := operationbase.NewGenericOperationController( + controller := controllerutils.NewGenericOperationController( "OperationExternalAuthUpdate", syncer, 10*time.Second, diff --git a/backend/pkg/controllers/externalauth/operations/operation_external_auth_update_state_calculation.go b/backend/pkg/controllers/externalauth/operations/operation_external_auth_update_state_calculation.go index 9ae648771cc..f26a793e36c 100644 --- a/backend/pkg/controllers/externalauth/operations/operation_external_auth_update_state_calculation.go +++ b/backend/pkg/controllers/externalauth/operations/operation_external_auth_update_state_calculation.go @@ -24,8 +24,8 @@ import ( configv1 "github.com/openshift/api/config/v1" "github.com/openshift/hypershift/api/hypershift/v1beta1" - operationbase "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation" "github.com/Azure/ARO-HCP/backend/pkg/kubeapplierhelpers" + operationbase "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/ocm" diff --git a/backend/pkg/controllers/externalauth/operations/operation_external_auth_update_state_calculation_test.go b/backend/pkg/controllers/externalauth/operations/operation_external_auth_update_state_calculation_test.go index c71fc420832..b471bbe70d6 100644 --- a/backend/pkg/controllers/externalauth/operations/operation_external_auth_update_state_calculation_test.go +++ b/backend/pkg/controllers/externalauth/operations/operation_external_auth_update_state_calculation_test.go @@ -27,7 +27,7 @@ import ( configv1 "github.com/openshift/api/config/v1" "github.com/openshift/hypershift/api/hypershift/v1beta1" - operationtesting "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation/operationtesting" + operationtesting "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils/operationtesting" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/api/kubeapplier" diff --git a/backend/pkg/controllers/externalauth/operations/operation_external_auth_update_test.go b/backend/pkg/controllers/externalauth/operations/operation_external_auth_update_test.go index 49f735cf55f..3160c1dab68 100644 --- a/backend/pkg/controllers/externalauth/operations/operation_external_auth_update_test.go +++ b/backend/pkg/controllers/externalauth/operations/operation_external_auth_update_test.go @@ -32,9 +32,9 @@ import ( configv1 "github.com/openshift/api/config/v1" "github.com/openshift/hypershift/api/hypershift/v1beta1" - operationtesting "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation/operationtesting" "github.com/Azure/ARO-HCP/backend/pkg/listers" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + operationtesting "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils/operationtesting" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/api/kubeapplier" diff --git a/backend/pkg/controllers/externalauth/status/externalauth_degraded_aggregator.go b/backend/pkg/controllers/externalauth/status/externalauth_degraded_aggregator.go index 2fb26c3e566..2e8f7dc3a16 100644 --- a/backend/pkg/controllers/externalauth/status/externalauth_degraded_aggregator.go +++ b/backend/pkg/controllers/externalauth/status/externalauth_degraded_aggregator.go @@ -24,10 +24,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilsclock "k8s.io/utils/clock" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/statusutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" + "github.com/Azure/ARO-HCP/backend/pkg/utils/statusutils" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/utils" ) diff --git a/backend/pkg/controllers/externalauth/status/externalauth_degraded_aggregator_test.go b/backend/pkg/controllers/externalauth/status/externalauth_degraded_aggregator_test.go index 4e81e608a49..f2eaa7e168d 100644 --- a/backend/pkg/controllers/externalauth/status/externalauth_degraded_aggregator_test.go +++ b/backend/pkg/controllers/externalauth/status/externalauth_degraded_aggregator_test.go @@ -30,9 +30,9 @@ import ( azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/statusutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" + "github.com/Azure/ARO-HCP/backend/pkg/utils/statusutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/databasetesting" diff --git a/backend/pkg/controllers/externalauth/update/external_auth_cluster_service_update_dispatch_controller.go b/backend/pkg/controllers/externalauth/update/external_auth_cluster_service_update_dispatch_controller.go index de0f2122e73..fafb69aae48 100644 --- a/backend/pkg/controllers/externalauth/update/external_auth_cluster_service_update_dispatch_controller.go +++ b/backend/pkg/controllers/externalauth/update/external_auth_cluster_service_update_dispatch_controller.go @@ -28,9 +28,9 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" ocmerrors "github.com/openshift-online/ocm-sdk-go/errors" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" controllerutil "github.com/Azure/ARO-HCP/internal/controllerutils" "github.com/Azure/ARO-HCP/internal/database" diff --git a/backend/pkg/controllers/externalauth/update/external_auth_cluster_service_update_dispatch_controller_test.go b/backend/pkg/controllers/externalauth/update/external_auth_cluster_service_update_dispatch_controller_test.go index 61f4e94acc5..4eda7495814 100644 --- a/backend/pkg/controllers/externalauth/update/external_auth_cluster_service_update_dispatch_controller_test.go +++ b/backend/pkg/controllers/externalauth/update/external_auth_cluster_service_update_dispatch_controller_test.go @@ -32,8 +32,8 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" ocmerrors "github.com/openshift-online/ocm-sdk-go/errors" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" controllerutil "github.com/Azure/ARO-HCP/internal/controllerutils" diff --git a/backend/pkg/controllers/metrics/metrics_controller.go b/backend/pkg/controllers/metrics/metrics_controller.go index 39ecb33c1d7..688551bdad0 100644 --- a/backend/pkg/controllers/metrics/metrics_controller.go +++ b/backend/pkg/controllers/metrics/metrics_controller.go @@ -27,7 +27,7 @@ import ( azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/utils" ) diff --git a/backend/pkg/controllers/mismatch/backfill_cluster_uid.go b/backend/pkg/controllers/mismatch/backfill_cluster_uid.go index faa27541d80..65114740bee 100644 --- a/backend/pkg/controllers/mismatch/backfill_cluster_uid.go +++ b/backend/pkg/controllers/mismatch/backfill_cluster_uid.go @@ -23,8 +23,8 @@ import ( utilsclock "k8s.io/utils/clock" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" controllerutil "github.com/Azure/ARO-HCP/internal/controllerutils" "github.com/Azure/ARO-HCP/internal/database" diff --git a/backend/pkg/controllers/mismatch/cluster_service_cluster_matching.go b/backend/pkg/controllers/mismatch/cluster_service_cluster_matching.go index 965015bc8b0..c1cea1d7e7c 100644 --- a/backend/pkg/controllers/mismatch/cluster_service_cluster_matching.go +++ b/backend/pkg/controllers/mismatch/cluster_service_cluster_matching.go @@ -26,8 +26,8 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/ocm" diff --git a/backend/pkg/controllers/mismatch/delete_orphaned_cosmos.go b/backend/pkg/controllers/mismatch/delete_orphaned_cosmos.go index 8b8d43c8865..dee5b579812 100644 --- a/backend/pkg/controllers/mismatch/delete_orphaned_cosmos.go +++ b/backend/pkg/controllers/mismatch/delete_orphaned_cosmos.go @@ -29,8 +29,8 @@ import ( azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/database" diff --git a/backend/pkg/controllers/mismatch/missing_resource_id.go b/backend/pkg/controllers/mismatch/missing_resource_id.go index dd7253110b2..45961c5d3cd 100644 --- a/backend/pkg/controllers/mismatch/missing_resource_id.go +++ b/backend/pkg/controllers/mismatch/missing_resource_id.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/util/workqueue" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/utils" diff --git a/backend/pkg/controllers/nodepool/creation/create_service_provider_nodepool_controller.go b/backend/pkg/controllers/nodepool/creation/create_service_provider_nodepool_controller.go index 959d55e94dd..a4a9a95d392 100644 --- a/backend/pkg/controllers/nodepool/creation/create_service_provider_nodepool_controller.go +++ b/backend/pkg/controllers/nodepool/creation/create_service_provider_nodepool_controller.go @@ -19,9 +19,9 @@ import ( "fmt" "time" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/utils" ) diff --git a/backend/pkg/controllers/nodepool/creation/create_service_provider_nodepool_controller_test.go b/backend/pkg/controllers/nodepool/creation/create_service_provider_nodepool_controller_test.go index 01e1aa33df0..ebaca3bc556 100644 --- a/backend/pkg/controllers/nodepool/creation/create_service_provider_nodepool_controller_test.go +++ b/backend/pkg/controllers/nodepool/creation/create_service_provider_nodepool_controller_test.go @@ -28,9 +28,9 @@ import ( azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listers" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/database" diff --git a/backend/pkg/controllers/nodepool/creation/node_pool_cluster_service_create_controller.go b/backend/pkg/controllers/nodepool/creation/node_pool_cluster_service_create_controller.go index 2d5ad47ebd7..95ed4118c78 100644 --- a/backend/pkg/controllers/nodepool/creation/node_pool_cluster_service_create_controller.go +++ b/backend/pkg/controllers/nodepool/creation/node_pool_cluster_service_create_controller.go @@ -25,9 +25,9 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" ocmerrors "github.com/openshift-online/ocm-sdk-go/errors" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" unionkubeapplierinformers "github.com/Azure/ARO-HCP/internal/database/unioninformers/kubeapplier" diff --git a/backend/pkg/controllers/nodepool/creation/node_pool_cluster_service_create_controller_test.go b/backend/pkg/controllers/nodepool/creation/node_pool_cluster_service_create_controller_test.go index 7ff139a6aed..0ffab6c2445 100644 --- a/backend/pkg/controllers/nodepool/creation/node_pool_cluster_service_create_controller_test.go +++ b/backend/pkg/controllers/nodepool/creation/node_pool_cluster_service_create_controller_test.go @@ -34,8 +34,8 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" ocmerrors "github.com/openshift-online/ocm-sdk-go/errors" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/databasetesting" diff --git a/backend/pkg/controllers/nodepool/deletion/node_pool_child_resources_cleanup_controller.go b/backend/pkg/controllers/nodepool/deletion/node_pool_child_resources_cleanup_controller.go index ec95843188c..9ecf6cc2d3c 100644 --- a/backend/pkg/controllers/nodepool/deletion/node_pool_child_resources_cleanup_controller.go +++ b/backend/pkg/controllers/nodepool/deletion/node_pool_child_resources_cleanup_controller.go @@ -22,9 +22,9 @@ import ( azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" unionkubeapplierinformers "github.com/Azure/ARO-HCP/internal/database/unioninformers/kubeapplier" diff --git a/backend/pkg/controllers/nodepool/deletion/node_pool_child_resources_cleanup_controller_test.go b/backend/pkg/controllers/nodepool/deletion/node_pool_child_resources_cleanup_controller_test.go index d40d78498da..f0104cf856a 100644 --- a/backend/pkg/controllers/nodepool/deletion/node_pool_child_resources_cleanup_controller_test.go +++ b/backend/pkg/controllers/nodepool/deletion/node_pool_child_resources_cleanup_controller_test.go @@ -28,8 +28,8 @@ import ( azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/api/kubeapplier" diff --git a/backend/pkg/controllers/nodepool/deletion/node_pool_cluster_service_delete_dispatch_controller.go b/backend/pkg/controllers/nodepool/deletion/node_pool_cluster_service_delete_dispatch_controller.go index 1359b1ea350..b1243125e34 100644 --- a/backend/pkg/controllers/nodepool/deletion/node_pool_cluster_service_delete_dispatch_controller.go +++ b/backend/pkg/controllers/nodepool/deletion/node_pool_cluster_service_delete_dispatch_controller.go @@ -28,9 +28,9 @@ import ( ocmerrors "github.com/openshift-online/ocm-sdk-go/errors" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" unionkubeapplierinformers "github.com/Azure/ARO-HCP/internal/database/unioninformers/kubeapplier" diff --git a/backend/pkg/controllers/nodepool/deletion/node_pool_cluster_service_delete_dispatch_controller_test.go b/backend/pkg/controllers/nodepool/deletion/node_pool_cluster_service_delete_dispatch_controller_test.go index 3da5f4eee4d..55843a58f0e 100644 --- a/backend/pkg/controllers/nodepool/deletion/node_pool_cluster_service_delete_dispatch_controller_test.go +++ b/backend/pkg/controllers/nodepool/deletion/node_pool_cluster_service_delete_dispatch_controller_test.go @@ -35,8 +35,8 @@ import ( ocmerrors "github.com/openshift-online/ocm-sdk-go/errors" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/databasetesting" diff --git a/backend/pkg/controllers/nodepool/deletion/node_pool_cluster_service_id_clearer.go b/backend/pkg/controllers/nodepool/deletion/node_pool_cluster_service_id_clearer.go index d2927478f56..7bd39496e11 100644 --- a/backend/pkg/controllers/nodepool/deletion/node_pool_cluster_service_id_clearer.go +++ b/backend/pkg/controllers/nodepool/deletion/node_pool_cluster_service_id_clearer.go @@ -23,9 +23,9 @@ import ( ocmerrors "github.com/openshift-online/ocm-sdk-go/errors" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" unionkubeapplierinformers "github.com/Azure/ARO-HCP/internal/database/unioninformers/kubeapplier" diff --git a/backend/pkg/controllers/nodepool/deletion/node_pool_cluster_service_id_clearer_test.go b/backend/pkg/controllers/nodepool/deletion/node_pool_cluster_service_id_clearer_test.go index e10febb2cdd..dce778c40c6 100644 --- a/backend/pkg/controllers/nodepool/deletion/node_pool_cluster_service_id_clearer_test.go +++ b/backend/pkg/controllers/nodepool/deletion/node_pool_cluster_service_id_clearer_test.go @@ -29,8 +29,8 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/databasetesting" "github.com/Azure/ARO-HCP/internal/ocm" diff --git a/backend/pkg/controllers/nodepool/deletion/node_pool_deletion_controller.go b/backend/pkg/controllers/nodepool/deletion/node_pool_deletion_controller.go index 5368969e15e..b8cafe4024d 100644 --- a/backend/pkg/controllers/nodepool/deletion/node_pool_deletion_controller.go +++ b/backend/pkg/controllers/nodepool/deletion/node_pool_deletion_controller.go @@ -20,9 +20,9 @@ import ( "strings" "time" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" unionkubeapplierinformers "github.com/Azure/ARO-HCP/internal/database/unioninformers/kubeapplier" diff --git a/backend/pkg/controllers/nodepool/deletion/node_pool_deletion_controller_test.go b/backend/pkg/controllers/nodepool/deletion/node_pool_deletion_controller_test.go index bc59ad20128..8590e005e68 100644 --- a/backend/pkg/controllers/nodepool/deletion/node_pool_deletion_controller_test.go +++ b/backend/pkg/controllers/nodepool/deletion/node_pool_deletion_controller_test.go @@ -25,8 +25,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/databasetesting" diff --git a/backend/pkg/controllers/nodepool/operations/operation_node_pool_create.go b/backend/pkg/controllers/nodepool/operations/operation_node_pool_create.go index b30829708f0..32dbe3c3cda 100644 --- a/backend/pkg/controllers/nodepool/operations/operation_node_pool_create.go +++ b/backend/pkg/controllers/nodepool/operations/operation_node_pool_create.go @@ -26,10 +26,10 @@ import ( "k8s.io/client-go/tools/cache" utilsclock "k8s.io/utils/clock" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" - operationbase "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" + operationbase "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/database" @@ -80,7 +80,7 @@ func NewOperationNodePoolCreateController( notificationClient: notificationClient, } - controller := operationbase.NewGenericOperationController( + controller := controllerutils.NewGenericOperationController( "OperationNodePoolCreate", syncer, 10*time.Second, diff --git a/backend/pkg/controllers/nodepool/operations/operation_node_pool_create_test.go b/backend/pkg/controllers/nodepool/operations/operation_node_pool_create_test.go index 0013368476f..11ea6581966 100644 --- a/backend/pkg/controllers/nodepool/operations/operation_node_pool_create_test.go +++ b/backend/pkg/controllers/nodepool/operations/operation_node_pool_create_test.go @@ -30,10 +30,10 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" - operationbase "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation" - operationtesting "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation/operationtesting" "github.com/Azure/ARO-HCP/backend/pkg/listers" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + operationbase "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils" + operationtesting "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils/operationtesting" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/database" diff --git a/backend/pkg/controllers/nodepool/operations/operation_node_pool_delete.go b/backend/pkg/controllers/nodepool/operations/operation_node_pool_delete.go index f20be2f4028..26937f63dd1 100644 --- a/backend/pkg/controllers/nodepool/operations/operation_node_pool_delete.go +++ b/backend/pkg/controllers/nodepool/operations/operation_node_pool_delete.go @@ -27,8 +27,8 @@ import ( ocmerrors "github.com/openshift-online/ocm-sdk-go/errors" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" - operationbase "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" + operationbase "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/ocm" @@ -79,7 +79,7 @@ func NewOperationNodePoolDeleteController( notificationClient: notificationClient, } - controller := operationbase.NewGenericOperationController( + controller := controllerutils.NewGenericOperationController( "OperationNodePoolDelete", syncer, 10*time.Second, diff --git a/backend/pkg/controllers/nodepool/operations/operation_node_pool_delete_test.go b/backend/pkg/controllers/nodepool/operations/operation_node_pool_delete_test.go index 2ee3bb15877..14ac7a1b2a8 100644 --- a/backend/pkg/controllers/nodepool/operations/operation_node_pool_delete_test.go +++ b/backend/pkg/controllers/nodepool/operations/operation_node_pool_delete_test.go @@ -31,8 +31,8 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" ocmerrors "github.com/openshift-online/ocm-sdk-go/errors" - operationbase "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation" - operationtesting "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation/operationtesting" + operationbase "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils" + operationtesting "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils/operationtesting" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/database" diff --git a/backend/pkg/controllers/nodepool/operations/operation_node_pool_update.go b/backend/pkg/controllers/nodepool/operations/operation_node_pool_update.go index 37dcac73de6..c1333e4ad10 100644 --- a/backend/pkg/controllers/nodepool/operations/operation_node_pool_update.go +++ b/backend/pkg/controllers/nodepool/operations/operation_node_pool_update.go @@ -33,11 +33,11 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" nodepoolversion "github.com/Azure/ARO-HCP/backend/pkg/controllers/nodepool/version" - operationbase "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" + operationbase "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/database" @@ -97,7 +97,7 @@ func NewOperationNodePoolUpdateController( desiredVersionMismatchFirstSeen: lru.New(100000), } - controller := operationbase.NewGenericOperationController( + controller := controllerutils.NewGenericOperationController( "OperationNodePoolUpdate", syncer, 10*time.Second, diff --git a/backend/pkg/controllers/nodepool/operations/operation_node_pool_update_state_calculation.go b/backend/pkg/controllers/nodepool/operations/operation_node_pool_update_state_calculation.go index 67b47d8a8a5..4a5be1f59a7 100644 --- a/backend/pkg/controllers/nodepool/operations/operation_node_pool_update_state_calculation.go +++ b/backend/pkg/controllers/nodepool/operations/operation_node_pool_update_state_calculation.go @@ -27,8 +27,8 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" "github.com/openshift/hypershift/api/hypershift/v1beta1" - operationbase "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation" "github.com/Azure/ARO-HCP/backend/pkg/kubeapplierhelpers" + operationbase "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/ocm" diff --git a/backend/pkg/controllers/nodepool/operations/operation_node_pool_update_state_calculation_test.go b/backend/pkg/controllers/nodepool/operations/operation_node_pool_update_state_calculation_test.go index 7b48f91b57c..9342c72ad65 100644 --- a/backend/pkg/controllers/nodepool/operations/operation_node_pool_update_state_calculation_test.go +++ b/backend/pkg/controllers/nodepool/operations/operation_node_pool_update_state_calculation_test.go @@ -35,8 +35,8 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" "github.com/openshift/hypershift/api/hypershift/v1beta1" - operationtesting "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation/operationtesting" "github.com/Azure/ARO-HCP/backend/pkg/kubeapplierhelpers" + operationtesting "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils/operationtesting" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/api/kubeapplier" diff --git a/backend/pkg/controllers/nodepool/operations/operation_node_pool_update_test.go b/backend/pkg/controllers/nodepool/operations/operation_node_pool_update_test.go index df0367f2395..f16591af762 100644 --- a/backend/pkg/controllers/nodepool/operations/operation_node_pool_update_test.go +++ b/backend/pkg/controllers/nodepool/operations/operation_node_pool_update_test.go @@ -40,11 +40,11 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" "github.com/openshift/hypershift/api/hypershift/v1beta1" - operationbase "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation" - operationtesting "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation/operationtesting" "github.com/Azure/ARO-HCP/backend/pkg/kubeapplierhelpers" "github.com/Azure/ARO-HCP/backend/pkg/listers" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + operationbase "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils" + operationtesting "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils/operationtesting" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/api/kubeapplier" diff --git a/backend/pkg/controllers/nodepool/readdesires/create_nodepool_scoped_read_desires_controller.go b/backend/pkg/controllers/nodepool/readdesires/create_nodepool_scoped_read_desires_controller.go index 735a3f6e155..921add7c6ba 100644 --- a/backend/pkg/controllers/nodepool/readdesires/create_nodepool_scoped_read_desires_controller.go +++ b/backend/pkg/controllers/nodepool/readdesires/create_nodepool_scoped_read_desires_controller.go @@ -22,9 +22,9 @@ import ( hsv1beta1 "github.com/openshift/hypershift/api/hypershift/v1beta1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/kubeapplier" "github.com/Azure/ARO-HCP/internal/database" diff --git a/backend/pkg/controllers/nodepool/status/nodepool_degraded_aggregator.go b/backend/pkg/controllers/nodepool/status/nodepool_degraded_aggregator.go index 15d4f960dd1..d4956d7b999 100644 --- a/backend/pkg/controllers/nodepool/status/nodepool_degraded_aggregator.go +++ b/backend/pkg/controllers/nodepool/status/nodepool_degraded_aggregator.go @@ -24,10 +24,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilsclock "k8s.io/utils/clock" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/statusutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" + "github.com/Azure/ARO-HCP/backend/pkg/utils/statusutils" "github.com/Azure/ARO-HCP/internal/database" unionkubeapplierinformers "github.com/Azure/ARO-HCP/internal/database/unioninformers/kubeapplier" "github.com/Azure/ARO-HCP/internal/utils" diff --git a/backend/pkg/controllers/nodepool/status/nodepool_degraded_aggregator_test.go b/backend/pkg/controllers/nodepool/status/nodepool_degraded_aggregator_test.go index 4dddb119fa5..3911b19ee1c 100644 --- a/backend/pkg/controllers/nodepool/status/nodepool_degraded_aggregator_test.go +++ b/backend/pkg/controllers/nodepool/status/nodepool_degraded_aggregator_test.go @@ -30,9 +30,9 @@ import ( azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/statusutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" + "github.com/Azure/ARO-HCP/backend/pkg/utils/statusutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/databasetesting" diff --git a/backend/pkg/controllers/nodepool/status/nodepool_requirements_valid_aggregator.go b/backend/pkg/controllers/nodepool/status/nodepool_requirements_valid_aggregator.go index 51dc9f9f3e9..48e5322705a 100644 --- a/backend/pkg/controllers/nodepool/status/nodepool_requirements_valid_aggregator.go +++ b/backend/pkg/controllers/nodepool/status/nodepool_requirements_valid_aggregator.go @@ -22,10 +22,10 @@ import ( "k8s.io/apimachinery/pkg/api/equality" apimeta "k8s.io/apimachinery/pkg/api/meta" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/statusutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" + "github.com/Azure/ARO-HCP/backend/pkg/utils/statusutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" "github.com/Azure/ARO-HCP/internal/utils" diff --git a/backend/pkg/controllers/nodepool/status/nodepool_requirements_valid_aggregator_test.go b/backend/pkg/controllers/nodepool/status/nodepool_requirements_valid_aggregator_test.go index a2b271f4441..7cd61042c80 100644 --- a/backend/pkg/controllers/nodepool/status/nodepool_requirements_valid_aggregator_test.go +++ b/backend/pkg/controllers/nodepool/status/nodepool_requirements_valid_aggregator_test.go @@ -28,9 +28,9 @@ import ( azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/statusutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" + "github.com/Azure/ARO-HCP/backend/pkg/utils/statusutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/databasetesting" diff --git a/backend/pkg/controllers/nodepool/update/node_pool_cluster_service_update_dispatch_controller.go b/backend/pkg/controllers/nodepool/update/node_pool_cluster_service_update_dispatch_controller.go index be9c209b4d4..9f35a519b28 100644 --- a/backend/pkg/controllers/nodepool/update/node_pool_cluster_service_update_dispatch_controller.go +++ b/backend/pkg/controllers/nodepool/update/node_pool_cluster_service_update_dispatch_controller.go @@ -28,9 +28,9 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" ocmerrors "github.com/openshift-online/ocm-sdk-go/errors" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" controllerutil "github.com/Azure/ARO-HCP/internal/controllerutils" "github.com/Azure/ARO-HCP/internal/database" diff --git a/backend/pkg/controllers/nodepool/update/node_pool_cluster_service_update_dispatch_controller_test.go b/backend/pkg/controllers/nodepool/update/node_pool_cluster_service_update_dispatch_controller_test.go index 2e6d2886a08..d7bb557e573 100644 --- a/backend/pkg/controllers/nodepool/update/node_pool_cluster_service_update_dispatch_controller_test.go +++ b/backend/pkg/controllers/nodepool/update/node_pool_cluster_service_update_dispatch_controller_test.go @@ -33,9 +33,9 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" ocmerrors "github.com/openshift-online/ocm-sdk-go/errors" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listers" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" controllerutil "github.com/Azure/ARO-HCP/internal/controllerutils" diff --git a/backend/pkg/controllers/nodepool/validation/nodepool_validation_controller.go b/backend/pkg/controllers/nodepool/validation/nodepool_validation_controller.go index 813d22dc876..0e319b6ad7a 100644 --- a/backend/pkg/controllers/nodepool/validation/nodepool_validation_controller.go +++ b/backend/pkg/controllers/nodepool/validation/nodepool_validation_controller.go @@ -22,10 +22,10 @@ import ( "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/validationutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" + "github.com/Azure/ARO-HCP/backend/pkg/utils/validationutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" unionkubeapplierinformers "github.com/Azure/ARO-HCP/internal/database/unioninformers/kubeapplier" diff --git a/backend/pkg/controllers/nodepool/validation/nodepool_validation_controller_test.go b/backend/pkg/controllers/nodepool/validation/nodepool_validation_controller_test.go index 6f51e8b7126..7827c640c52 100644 --- a/backend/pkg/controllers/nodepool/validation/nodepool_validation_controller_test.go +++ b/backend/pkg/controllers/nodepool/validation/nodepool_validation_controller_test.go @@ -29,9 +29,9 @@ import ( azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/validationutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" + "github.com/Azure/ARO-HCP/backend/pkg/utils/validationutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/database" diff --git a/backend/pkg/controllers/nodepool/version/nodepool_active_version_controller.go b/backend/pkg/controllers/nodepool/version/nodepool_active_version_controller.go index fba6c1d2141..b94bf7fdf63 100644 --- a/backend/pkg/controllers/nodepool/version/nodepool_active_version_controller.go +++ b/backend/pkg/controllers/nodepool/version/nodepool_active_version_controller.go @@ -24,10 +24,10 @@ import ( hsv1beta1 "github.com/openshift/hypershift/api/hypershift/v1beta1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/kubeapplierhelpers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" internalcontrollerutils "github.com/Azure/ARO-HCP/internal/controllerutils" "github.com/Azure/ARO-HCP/internal/database" diff --git a/backend/pkg/controllers/nodepool/version/nodepool_active_version_controller_test.go b/backend/pkg/controllers/nodepool/version/nodepool_active_version_controller_test.go index 6f149bbc70b..f941f77246f 100644 --- a/backend/pkg/controllers/nodepool/version/nodepool_active_version_controller_test.go +++ b/backend/pkg/controllers/nodepool/version/nodepool_active_version_controller_test.go @@ -31,9 +31,9 @@ import ( "github.com/openshift/hypershift/api/hypershift/v1beta1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/kubeapplierhelpers" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/kubeapplier" internallistertesting "github.com/Azure/ARO-HCP/internal/database/listertesting" diff --git a/backend/pkg/controllers/nodepool/version/nodepool_active_version_real_cosmos_test.go b/backend/pkg/controllers/nodepool/version/nodepool_active_version_real_cosmos_test.go index 6e36180305a..d84bd67b6d8 100644 --- a/backend/pkg/controllers/nodepool/version/nodepool_active_version_real_cosmos_test.go +++ b/backend/pkg/controllers/nodepool/version/nodepool_active_version_real_cosmos_test.go @@ -30,8 +30,8 @@ import ( azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/api/kubeapplier" diff --git a/backend/pkg/controllers/nodepool/version/nodepool_version_controller.go b/backend/pkg/controllers/nodepool/version/nodepool_version_controller.go index b892eefd848..17ae00e8ad8 100644 --- a/backend/pkg/controllers/nodepool/version/nodepool_version_controller.go +++ b/backend/pkg/controllers/nodepool/version/nodepool_version_controller.go @@ -29,10 +29,10 @@ import ( cvocincinnati "github.com/openshift/cluster-version-operator/pkg/cincinnati" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/kubeapplierhelpers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/cincinnati" "github.com/Azure/ARO-HCP/internal/database" diff --git a/backend/pkg/controllers/nodepool/version/nodepool_version_controller_test.go b/backend/pkg/controllers/nodepool/version/nodepool_version_controller_test.go index b9a5f4e89be..42657c641ae 100644 --- a/backend/pkg/controllers/nodepool/version/nodepool_version_controller_test.go +++ b/backend/pkg/controllers/nodepool/version/nodepool_version_controller_test.go @@ -37,9 +37,9 @@ import ( cvocincinnati "github.com/openshift/cluster-version-operator/pkg/cincinnati" "github.com/openshift/hypershift/api/hypershift/v1beta1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/kubeapplierhelpers" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/api/kubeapplier" diff --git a/backend/pkg/controllers/nodepool/version/trigger_node_pool_upgrade_controller.go b/backend/pkg/controllers/nodepool/version/trigger_node_pool_upgrade_controller.go index ba3123e47d1..df3938d24d9 100644 --- a/backend/pkg/controllers/nodepool/version/trigger_node_pool_upgrade_controller.go +++ b/backend/pkg/controllers/nodepool/version/trigger_node_pool_upgrade_controller.go @@ -23,9 +23,9 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/database" unionkubeapplierinformers "github.com/Azure/ARO-HCP/internal/database/unioninformers/kubeapplier" diff --git a/backend/pkg/controllers/nodepool/version/trigger_node_pool_upgrade_controller_test.go b/backend/pkg/controllers/nodepool/version/trigger_node_pool_upgrade_controller_test.go index f5190706e94..6e69169c866 100644 --- a/backend/pkg/controllers/nodepool/version/trigger_node_pool_upgrade_controller_test.go +++ b/backend/pkg/controllers/nodepool/version/trigger_node_pool_upgrade_controller_test.go @@ -33,8 +33,8 @@ import ( arohcpv1alpha1 "github.com/openshift-online/ocm-sdk-go/arohcp/v1alpha1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/databasetesting" diff --git a/backend/pkg/controllers/controllerutils/cluster_watching_controller.go b/backend/pkg/utils/controllerutils/cluster_watching_controller.go similarity index 100% rename from backend/pkg/controllers/controllerutils/cluster_watching_controller.go rename to backend/pkg/utils/controllerutils/cluster_watching_controller.go diff --git a/backend/pkg/controllers/controllerutils/cluster_watching_controller_test.go b/backend/pkg/utils/controllerutils/cluster_watching_controller_test.go similarity index 100% rename from backend/pkg/controllers/controllerutils/cluster_watching_controller_test.go rename to backend/pkg/utils/controllerutils/cluster_watching_controller_test.go diff --git a/backend/pkg/controllers/controllerutils/controller_metrics.go b/backend/pkg/utils/controllerutils/controller_metrics.go similarity index 100% rename from backend/pkg/controllers/controllerutils/controller_metrics.go rename to backend/pkg/utils/controllerutils/controller_metrics.go diff --git a/backend/pkg/controllers/controllerutils/cooldown.go b/backend/pkg/utils/controllerutils/cooldown.go similarity index 100% rename from backend/pkg/controllers/controllerutils/cooldown.go rename to backend/pkg/utils/controllerutils/cooldown.go diff --git a/backend/pkg/controllers/controllerutils/cosmos.go b/backend/pkg/utils/controllerutils/cosmos.go similarity index 100% rename from backend/pkg/controllers/controllerutils/cosmos.go rename to backend/pkg/utils/controllerutils/cosmos.go diff --git a/backend/pkg/controllers/controllerutils/cs_maestro_utils.go b/backend/pkg/utils/controllerutils/cs_maestro_utils.go similarity index 100% rename from backend/pkg/controllers/controllerutils/cs_maestro_utils.go rename to backend/pkg/utils/controllerutils/cs_maestro_utils.go diff --git a/backend/pkg/controllers/controllerutils/external_auth_watching_controller.go b/backend/pkg/utils/controllerutils/external_auth_watching_controller.go similarity index 100% rename from backend/pkg/controllers/controllerutils/external_auth_watching_controller.go rename to backend/pkg/utils/controllerutils/external_auth_watching_controller.go diff --git a/backend/pkg/controllers/operation/generic_operation.go b/backend/pkg/utils/controllerutils/generic_operation.go similarity index 87% rename from backend/pkg/controllers/operation/generic_operation.go rename to backend/pkg/utils/controllerutils/generic_operation.go index 00e6b60d6ab..062c62923bd 100644 --- a/backend/pkg/controllers/operation/generic_operation.go +++ b/backend/pkg/utils/controllerutils/generic_operation.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package operation +package controllerutils import ( "context" @@ -28,7 +28,6 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/utils/ptr" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/internal/api" controllerutil "github.com/Azure/ARO-HCP/internal/controllerutils" "github.com/Azure/ARO-HCP/internal/database" @@ -37,7 +36,7 @@ import ( type OperationSynchronizer interface { ShouldProcess(ctx context.Context, operation *api.Operation) bool - SynchronizeOperation(ctx context.Context, key controllerutils.OperationKey) error + SynchronizeOperation(ctx context.Context, key OperationKey) error } type genericOperation struct { @@ -49,7 +48,7 @@ type genericOperation struct { // queue is where incoming work is placed to de-dup and to allow "easy" // rate limited requeues on errors - queue workqueue.TypedRateLimitingInterface[controllerutils.OperationKey] + queue workqueue.TypedRateLimitingInterface[OperationKey] } // NewGenericOperationController returns a Controller that updates Cosmos DB documents @@ -62,15 +61,15 @@ func NewGenericOperationController( activeOperationScanInterval time.Duration, activeOperationInformer cache.SharedIndexInformer, resourcesDBClient database.ResourcesDBClient, -) controllerutils.Controller { +) Controller { c := &genericOperation{ name: name, cooldownChecker: controllerutil.NewTimeBasedCooldownChecker(10 * time.Second), synchronizer: synchronizer, resourcesDBClient: resourcesDBClient, queue: workqueue.NewTypedRateLimitingQueueWithConfig( - workqueue.DefaultTypedControllerRateLimiter[controllerutils.OperationKey](), - workqueue.TypedRateLimitingQueueConfig[controllerutils.OperationKey]{ + workqueue.DefaultTypedControllerRateLimiter[OperationKey](), + workqueue.TypedRateLimitingQueueConfig[OperationKey]{ Name: name, }, ), @@ -100,7 +99,7 @@ func NewGenericOperationController( return c } -func (c *genericOperation) controllerCRUD(key controllerutils.OperationKey) database.ResourceCRUD[api.Controller, *api.Controller] { +func (c *genericOperation) controllerCRUD(key OperationKey) database.ResourceCRUD[api.Controller, *api.Controller] { parentResourceID := key.GetParentResourceID() sub := parentResourceID.SubscriptionID rg := parentResourceID.ResourceGroupName @@ -115,16 +114,16 @@ func (c *genericOperation) controllerCRUD(key controllerutils.OperationKey) data } } -func (c *genericOperation) QueueForInformers(resyncDuration time.Duration, notifiers ...controllerutils.Notifier) error { +func (c *genericOperation) QueueForInformers(resyncDuration time.Duration, notifiers ...Notifier) error { // panic so that the developer error is noticed immediately panic("not implemented") } func (c *genericOperation) SyncOnce(ctx context.Context, keyObj any) error { - key := keyObj.(controllerutils.OperationKey) + key := keyObj.(OperationKey) controllerCRUD := c.controllerCRUD(key) - defer utilruntime.HandleCrash(controllerutils.DegradedControllerPanicHandler( + defer utilruntime.HandleCrash(DegradedControllerPanicHandler( ctx, controllerCRUD, c.name, @@ -132,12 +131,12 @@ func (c *genericOperation) SyncOnce(ctx context.Context, keyObj any) error { syncErr := c.synchronizer.SynchronizeOperation(ctx, key) - controllerWriteErr := controllerutils.WriteController( + controllerWriteErr := WriteController( ctx, controllerCRUD, c.name, key.InitialController, - controllerutils.ReportSyncError(syncErr), + ReportSyncError(syncErr), ) return errors.Join(syncErr, controllerWriteErr) @@ -182,7 +181,7 @@ func (c *genericOperation) processNextWorkItem(ctx context.Context) bool { logger = ref.AddLoggerValues(logger) ctx = utils.ContextWithLogger(ctx, logger) - controllerutils.ReconcileTotal.WithLabelValues(c.name).Inc() + ReconcileTotal.WithLabelValues(c.name).Inc() err := c.SyncOnce(ctx, ref) if err == nil { c.queue.Forget(ref) @@ -205,7 +204,7 @@ func (c *genericOperation) enqueueAdd(newObj interface{}) { if castObj.ExternalID == nil { return } - key := controllerutils.OperationKey{ + key := OperationKey{ SubscriptionID: castObj.ExternalID.SubscriptionID, OperationName: castObj.ResourceID.Name, ParentResourceID: castObj.ExternalID.String(), diff --git a/backend/pkg/controllers/controllerutils/generic_watching_controller.go b/backend/pkg/utils/controllerutils/generic_watching_controller.go similarity index 100% rename from backend/pkg/controllers/controllerutils/generic_watching_controller.go rename to backend/pkg/utils/controllerutils/generic_watching_controller.go diff --git a/backend/pkg/controllers/controllerutils/generic_watching_controller_test.go b/backend/pkg/utils/controllerutils/generic_watching_controller_test.go similarity index 100% rename from backend/pkg/controllers/controllerutils/generic_watching_controller_test.go rename to backend/pkg/utils/controllerutils/generic_watching_controller_test.go diff --git a/backend/pkg/controllers/controllerutils/management_cluster_content_controller.go b/backend/pkg/utils/controllerutils/management_cluster_content_controller.go similarity index 100% rename from backend/pkg/controllers/controllerutils/management_cluster_content_controller.go rename to backend/pkg/utils/controllerutils/management_cluster_content_controller.go diff --git a/backend/pkg/controllers/controllerutils/management_cluster_content_controller_test.go b/backend/pkg/utils/controllerutils/management_cluster_content_controller_test.go similarity index 100% rename from backend/pkg/controllers/controllerutils/management_cluster_content_controller_test.go rename to backend/pkg/utils/controllerutils/management_cluster_content_controller_test.go diff --git a/backend/pkg/controllers/controllerutils/management_cluster_watching_controller.go b/backend/pkg/utils/controllerutils/management_cluster_watching_controller.go similarity index 100% rename from backend/pkg/controllers/controllerutils/management_cluster_watching_controller.go rename to backend/pkg/utils/controllerutils/management_cluster_watching_controller.go diff --git a/backend/pkg/controllers/controllerutils/nodepool_watching_controller.go b/backend/pkg/utils/controllerutils/nodepool_watching_controller.go similarity index 100% rename from backend/pkg/controllers/controllerutils/nodepool_watching_controller.go rename to backend/pkg/utils/controllerutils/nodepool_watching_controller.go diff --git a/backend/pkg/controllers/controllerutils/read_desire.go b/backend/pkg/utils/controllerutils/read_desire.go similarity index 100% rename from backend/pkg/controllers/controllerutils/read_desire.go rename to backend/pkg/utils/controllerutils/read_desire.go diff --git a/backend/pkg/controllers/controllerutils/subscription_watching_controller.go b/backend/pkg/utils/controllerutils/subscription_watching_controller.go similarity index 100% rename from backend/pkg/controllers/controllerutils/subscription_watching_controller.go rename to backend/pkg/utils/controllerutils/subscription_watching_controller.go diff --git a/backend/pkg/controllers/controllerutils/util.go b/backend/pkg/utils/controllerutils/util.go similarity index 100% rename from backend/pkg/controllers/controllerutils/util.go rename to backend/pkg/utils/controllerutils/util.go diff --git a/backend/pkg/controllers/controllerutils/util_test.go b/backend/pkg/utils/controllerutils/util_test.go similarity index 100% rename from backend/pkg/controllers/controllerutils/util_test.go rename to backend/pkg/utils/controllerutils/util_test.go diff --git a/backend/pkg/controllers/operation/doc.go b/backend/pkg/utils/operationutils/doc.go similarity index 96% rename from backend/pkg/controllers/operation/doc.go rename to backend/pkg/utils/operationutils/doc.go index 6b54aaa033b..7c79bbb346a 100644 --- a/backend/pkg/controllers/operation/doc.go +++ b/backend/pkg/utils/operationutils/doc.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// The controllers in the operationcontrollers package provide the glue between +// The operationutils package provides helpers that glue together // Clusters Service and asynchronous operations initiated by RP frontend pods in // response to client requests. // @@ -54,4 +54,4 @@ // will automatically delete the operation document. // // [Resource Provider Contract]: https://github.com/cloud-and-ai-microsoft/resource-provider-contract/blob/master/v1.0/async-api-reference.md -package operation +package operationutils diff --git a/backend/pkg/controllers/operation/operation_state.go b/backend/pkg/utils/operationutils/operation_state.go similarity index 99% rename from backend/pkg/controllers/operation/operation_state.go rename to backend/pkg/utils/operationutils/operation_state.go index d6818944867..f3cd954d045 100644 --- a/backend/pkg/controllers/operation/operation_state.go +++ b/backend/pkg/utils/operationutils/operation_state.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package operation +package operationutils import ( "errors" diff --git a/backend/pkg/controllers/operation/operation_state_test.go b/backend/pkg/utils/operationutils/operation_state_test.go similarity index 99% rename from backend/pkg/controllers/operation/operation_state_test.go rename to backend/pkg/utils/operationutils/operation_state_test.go index 9ce5320490f..5a629534179 100644 --- a/backend/pkg/controllers/operation/operation_state_test.go +++ b/backend/pkg/utils/operationutils/operation_state_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package operation +package operationutils import ( "testing" diff --git a/backend/pkg/controllers/operation/operationtesting/fixtures.go b/backend/pkg/utils/operationutils/operationtesting/fixtures.go similarity index 99% rename from backend/pkg/controllers/operation/operationtesting/fixtures.go rename to backend/pkg/utils/operationutils/operationtesting/fixtures.go index d703da03068..6a440069924 100644 --- a/backend/pkg/controllers/operation/operationtesting/fixtures.go +++ b/backend/pkg/utils/operationutils/operationtesting/fixtures.go @@ -27,7 +27,7 @@ import ( configv1 "github.com/openshift/api/config/v1" "github.com/openshift/hypershift/api/hypershift/v1beta1" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" "github.com/Azure/ARO-HCP/internal/database" diff --git a/backend/pkg/controllers/operation/operationtesting/readdesire.go b/backend/pkg/utils/operationutils/operationtesting/readdesire.go similarity index 100% rename from backend/pkg/controllers/operation/operationtesting/readdesire.go rename to backend/pkg/utils/operationutils/operationtesting/readdesire.go diff --git a/backend/pkg/controllers/operation/utils.go b/backend/pkg/utils/operationutils/utils.go similarity index 99% rename from backend/pkg/controllers/operation/utils.go rename to backend/pkg/utils/operationutils/utils.go index af20493c81e..c8a816843a7 100644 --- a/backend/pkg/controllers/operation/utils.go +++ b/backend/pkg/utils/operationutils/utils.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package operation +package operationutils import ( "bytes" diff --git a/backend/pkg/controllers/operation/utils_test.go b/backend/pkg/utils/operationutils/utils_test.go similarity index 99% rename from backend/pkg/controllers/operation/utils_test.go rename to backend/pkg/utils/operationutils/utils_test.go index 64f8c994675..4e424eaaa85 100644 --- a/backend/pkg/controllers/operation/utils_test.go +++ b/backend/pkg/utils/operationutils/utils_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package operation +package operationutils import ( "context" diff --git a/backend/pkg/controllers/statusutils/firstobservedbad.go b/backend/pkg/utils/statusutils/firstobservedbad.go similarity index 100% rename from backend/pkg/controllers/statusutils/firstobservedbad.go rename to backend/pkg/utils/statusutils/firstobservedbad.go diff --git a/backend/pkg/controllers/statusutils/helpers.go b/backend/pkg/utils/statusutils/helpers.go similarity index 100% rename from backend/pkg/controllers/statusutils/helpers.go rename to backend/pkg/utils/statusutils/helpers.go diff --git a/backend/pkg/controllers/statusutils/helpers_test.go b/backend/pkg/utils/statusutils/helpers_test.go similarity index 100% rename from backend/pkg/controllers/statusutils/helpers_test.go rename to backend/pkg/utils/statusutils/helpers_test.go diff --git a/backend/pkg/controllers/statusutils/inertia.go b/backend/pkg/utils/statusutils/inertia.go similarity index 100% rename from backend/pkg/controllers/statusutils/inertia.go rename to backend/pkg/utils/statusutils/inertia.go diff --git a/backend/pkg/controllers/statusutils/inertia_test.go b/backend/pkg/utils/statusutils/inertia_test.go similarity index 100% rename from backend/pkg/controllers/statusutils/inertia_test.go rename to backend/pkg/utils/statusutils/inertia_test.go diff --git a/backend/pkg/controllers/statusutils/requirements_valid.go b/backend/pkg/utils/statusutils/requirements_valid.go similarity index 100% rename from backend/pkg/controllers/statusutils/requirements_valid.go rename to backend/pkg/utils/statusutils/requirements_valid.go diff --git a/backend/pkg/controllers/statusutils/requirements_valid_test.go b/backend/pkg/utils/statusutils/requirements_valid_test.go similarity index 100% rename from backend/pkg/controllers/statusutils/requirements_valid_test.go rename to backend/pkg/utils/statusutils/requirements_valid_test.go diff --git a/backend/pkg/controllers/statusutils/testhelpers.go b/backend/pkg/utils/statusutils/testhelpers.go similarity index 100% rename from backend/pkg/controllers/statusutils/testhelpers.go rename to backend/pkg/utils/statusutils/testhelpers.go diff --git a/backend/pkg/controllers/statusutils/union_condition.go b/backend/pkg/utils/statusutils/union_condition.go similarity index 100% rename from backend/pkg/controllers/statusutils/union_condition.go rename to backend/pkg/utils/statusutils/union_condition.go diff --git a/backend/pkg/controllers/statusutils/union_condition_test.go b/backend/pkg/utils/statusutils/union_condition_test.go similarity index 100% rename from backend/pkg/controllers/statusutils/union_condition_test.go rename to backend/pkg/utils/statusutils/union_condition_test.go diff --git a/backend/pkg/controllers/validationutils/always_success_validation.go b/backend/pkg/utils/validationutils/always_success_validation.go similarity index 100% rename from backend/pkg/controllers/validationutils/always_success_validation.go rename to backend/pkg/utils/validationutils/always_success_validation.go diff --git a/backend/pkg/controllers/validationutils/azure_cluster_mis_existence_validation.go b/backend/pkg/utils/validationutils/azure_cluster_mis_existence_validation.go similarity index 100% rename from backend/pkg/controllers/validationutils/azure_cluster_mis_existence_validation.go rename to backend/pkg/utils/validationutils/azure_cluster_mis_existence_validation.go diff --git a/backend/pkg/controllers/validationutils/azure_cluster_resource_group_existence_validation.go b/backend/pkg/utils/validationutils/azure_cluster_resource_group_existence_validation.go similarity index 100% rename from backend/pkg/controllers/validationutils/azure_cluster_resource_group_existence_validation.go rename to backend/pkg/utils/validationutils/azure_cluster_resource_group_existence_validation.go diff --git a/backend/pkg/controllers/validationutils/azure_rp_registration_validation.go b/backend/pkg/utils/validationutils/azure_rp_registration_validation.go similarity index 100% rename from backend/pkg/controllers/validationutils/azure_rp_registration_validation.go rename to backend/pkg/utils/validationutils/azure_rp_registration_validation.go diff --git a/backend/pkg/controllers/validationutils/cluster_validation.go b/backend/pkg/utils/validationutils/cluster_validation.go similarity index 100% rename from backend/pkg/controllers/validationutils/cluster_validation.go rename to backend/pkg/utils/validationutils/cluster_validation.go diff --git a/backend/pkg/controllers/validationutils/nodepool_validation.go b/backend/pkg/utils/validationutils/nodepool_validation.go similarity index 100% rename from backend/pkg/controllers/validationutils/nodepool_validation.go rename to backend/pkg/utils/validationutils/nodepool_validation.go diff --git a/internal/controllerutils/cooldown.go b/internal/controllerutils/cooldown.go index 9749498d37d..364ef7747c4 100644 --- a/internal/controllerutils/cooldown.go +++ b/internal/controllerutils/cooldown.go @@ -17,7 +17,7 @@ // controllers and want consistent cadence/gating behavior. // // The cooldown gate exposed here was originally -// backend/pkg/controllers/controllerutils' TimeBasedCooldownChecker; it +// backend/pkg/utils/controllerutils' TimeBasedCooldownChecker; it // lives in internal/ so kube-applier can use the same implementation // without re-importing the backend module. package controllerutils diff --git a/internal/database/unioninformers/kubeapplier/controller.go b/internal/database/unioninformers/kubeapplier/controller.go index 0eeb417e841..289e086fb46 100644 --- a/internal/database/unioninformers/kubeapplier/controller.go +++ b/internal/database/unioninformers/kubeapplier/controller.go @@ -64,7 +64,7 @@ func (k ManagementClusterKey) GetResourceID() *azcorearm.ResourceID { // AddLoggerValues enriches logger with the standard resource-id key/value // pairs derived from this management cluster's resourceID. Matches the -// shape of the other controller keys in backend/pkg/controllers/controllerutils +// shape of the other controller keys in backend/pkg/utils/controllerutils // (HCPClusterKey, HCPNodePoolKey, etc.). func (k ManagementClusterKey) AddLoggerValues(logger logr.Logger) logr.Logger { return logger.WithValues( diff --git a/test-integration/backend/controllers/do_nothing/do_nothing_test.go b/test-integration/backend/controllers/do_nothing/do_nothing_test.go index 4ef32f915e6..173e5f46f52 100644 --- a/test-integration/backend/controllers/do_nothing/do_nothing_test.go +++ b/test-integration/backend/controllers/do_nothing/do_nothing_test.go @@ -21,8 +21,8 @@ import ( "path" "testing" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/controllers/example" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/test-integration/utils/controllertesthelpers" "github.com/Azure/ARO-HCP/test-integration/utils/integrationutils" diff --git a/test-integration/backend/controllers/mismatches/delete_orphaned_cosmos_test.go b/test-integration/backend/controllers/mismatches/delete_orphaned_cosmos_test.go index c45fb72460e..48feea33502 100644 --- a/test-integration/backend/controllers/mismatches/delete_orphaned_cosmos_test.go +++ b/test-integration/backend/controllers/mismatches/delete_orphaned_cosmos_test.go @@ -25,8 +25,8 @@ import ( azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/controllers/mismatch" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/test-integration/utils/controllertesthelpers" "github.com/Azure/ARO-HCP/test-integration/utils/integrationutils" diff --git a/test-integration/backend/launch/notification_test.go b/test-integration/backend/launch/notification_test.go index 306f1bfa862..6f2c8cb0e5c 100644 --- a/test-integration/backend/launch/notification_test.go +++ b/test-integration/backend/launch/notification_test.go @@ -29,9 +29,9 @@ import ( azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/informers" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm" controllerutil "github.com/Azure/ARO-HCP/internal/controllerutils" diff --git a/test-integration/utils/controllertesthelpers/basic_controller.go b/test-integration/utils/controllertesthelpers/basic_controller.go index fdcfed59678..bf7b8173d80 100644 --- a/test-integration/utils/controllertesthelpers/basic_controller.go +++ b/test-integration/utils/controllertesthelpers/basic_controller.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/database" dblisters "github.com/Azure/ARO-HCP/internal/database/listers" "github.com/Azure/ARO-HCP/internal/database/listertesting" diff --git a/test-integration/utils/databasemutationhelpers/step_sync_cluster_cluster_service_update_dispatch.go b/test-integration/utils/databasemutationhelpers/step_sync_cluster_cluster_service_update_dispatch.go index e664409af4c..f2a7f053862 100644 --- a/test-integration/utils/databasemutationhelpers/step_sync_cluster_cluster_service_update_dispatch.go +++ b/test-integration/utils/databasemutationhelpers/step_sync_cluster_cluster_service_update_dispatch.go @@ -26,8 +26,8 @@ import ( azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" clusterupdate "github.com/Azure/ARO-HCP/backend/pkg/controllers/cluster/update" - "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" "github.com/Azure/ARO-HCP/backend/pkg/listertesting" + "github.com/Azure/ARO-HCP/backend/pkg/utils/controllerutils" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/utils" "github.com/Azure/ARO-HCP/test-integration/utils/integrationutils" diff --git a/test-integration/utils/integrationutils/utils.go b/test-integration/utils/integrationutils/utils.go index aa8be74c82e..ae38d3c5ec9 100644 --- a/test-integration/utils/integrationutils/utils.go +++ b/test-integration/utils/integrationutils/utils.go @@ -35,7 +35,7 @@ import ( "k8s.io/utils/set" adminApiServer "github.com/Azure/ARO-HCP/admin/server/server" - operationcontrollers "github.com/Azure/ARO-HCP/backend/pkg/controllers/operation" + operationcontrollers "github.com/Azure/ARO-HCP/backend/pkg/utils/operationutils" "github.com/Azure/ARO-HCP/frontend/pkg/frontend" "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/arm"