From 8d6975c66918ba2fa6e285e297c10af99a9bc423 Mon Sep 17 00:00:00 2001 From: Benjamin Schimke Date: Wed, 26 Jun 2024 14:29:01 +0200 Subject: [PATCH] fixup imports for linter --- controlplane/controllers/machine_controller.go | 3 ++- pkg/ck8s/management_cluster.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/controlplane/controllers/machine_controller.go b/controlplane/controllers/machine_controller.go index 4c8e95d5..0327c835 100644 --- a/controlplane/controllers/machine_controller.go +++ b/controlplane/controllers/machine_controller.go @@ -4,7 +4,6 @@ import ( "context" "time" - "github.com/canonical/cluster-api-k8s/pkg/ck8s" "github.com/go-logr/logr" "github.com/pkg/errors" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -15,6 +14,8 @@ import ( "sigs.k8s.io/cluster-api/util/patch" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/canonical/cluster-api-k8s/pkg/ck8s" ) // CK8sControlPlaneReconciler reconciles a CK8sControlPlane object. diff --git a/pkg/ck8s/management_cluster.go b/pkg/ck8s/management_cluster.go index fe27608d..71a0a374 100644 --- a/pkg/ck8s/management_cluster.go +++ b/pkg/ck8s/management_cluster.go @@ -5,12 +5,13 @@ import ( "fmt" "time" - "github.com/canonical/cluster-api-k8s/pkg/token" "k8s.io/client-go/kubernetes/scheme" clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/cluster-api/controllers/remote" "sigs.k8s.io/cluster-api/util/collections" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/canonical/cluster-api-k8s/pkg/token" ) // ManagementCluster defines all behaviors necessary for something to function as a management cluster.