rebase and fix lint errors

linode · Apr 29, 2024 · 3e06a0b · 3e06a0b
1 parent e619a9e
commit 3e06a0b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/cloud/scope/cluster.go b/cloud/scope/cluster.go
@@ -84,7 +84,7 @@ func NewClusterScope(ctx context.Context, apiKey string, params ClusterScopePara
 type ClusterScope struct {
 	Client        K8sClient
 	PatchHelper   *patch.Helper
-	LinodeClient  LinodeMachineClient
+	LinodeClient  LinodeNodeBalancerClient
 	Cluster       *clusterv1.Cluster
 	LinodeCluster *infrav1alpha1.LinodeCluster
 }

diff --git a/controller/linodevpc_controller_test.go b/controller/linodevpc_controller_test.go
@@ -22,18 +22,20 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	infrav1alpha1 "github.com/linode/cluster-api-provider-linode/api/v1alpha1"
-	"github.com/linode/cluster-api-provider-linode/cloud/scope"
-	"github.com/linode/cluster-api-provider-linode/mock"
-	rec "github.com/linode/cluster-api-provider-linode/util/reconciler"
 	"github.com/linode/linodego"
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
 	"go.uber.org/mock/gomock"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+
+	infrav1alpha1 "github.com/linode/cluster-api-provider-linode/api/v1alpha1"
+	"github.com/linode/cluster-api-provider-linode/cloud/scope"
+	"github.com/linode/cluster-api-provider-linode/mock"
+	rec "github.com/linode/cluster-api-provider-linode/util/reconciler"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 )
 
 var _ = Describe("lifecycle", Ordered, Label("vpc", "lifecycle"), func() {