fix linting

Author: damdo

cmd/clusterawsadm/gc/gc.go

@@ -187,7 +187,7 @@ func (c *CmdProcessor) getInfraCluster(ctx context.Context) (*unstructured.Unstr
 	}
 
 	ref := cluster.Spec.InfrastructureRef
-	obj, err := external.Get(ctx, c.client, ref, cluster.Namespace)
+	obj, err := external.Get(ctx, c.client, ref)
 	if err != nil {
 		return nil, fmt.Errorf("getting infra cluster %s/%s: %w", ref.Namespace, ref.Name, err)
 	}

cmd/clusterawsadm/gc/gc_test.go

@@ -105,7 +105,7 @@ func TestEnableGC(t *testing.T) {
 			cluster := tc.existingObjs[0].(*clusterv1.Cluster)
 			ref := cluster.Spec.InfrastructureRef
 
-			obj, err := external.Get(ctx, fake, ref, "default")
+			obj, err := external.Get(ctx, fake, ref)
 			g.Expect(err).NotTo(HaveOccurred())
 			g.Expect(obj).NotTo(BeNil())
 
@@ -176,7 +176,7 @@ func TestDisableGC(t *testing.T) {
 			cluster := tc.existingObjs[0].(*clusterv1.Cluster)
 			ref := cluster.Spec.InfrastructureRef
 
-			obj, err := external.Get(ctx, fake, ref, "default")
+			obj, err := external.Get(ctx, fake, ref)
 			g.Expect(err).NotTo(HaveOccurred())
 			g.Expect(obj).NotTo(BeNil())
 
@@ -271,7 +271,7 @@ func TestConfigureGC(t *testing.T) {
 			cluster := tc.existingObjs[0].(*clusterv1.Cluster)
 			ref := cluster.Spec.InfrastructureRef
 
-			obj, err := external.Get(ctx, fake, ref, "default")
+			obj, err := external.Get(ctx, fake, ref)
 			g.Expect(err).NotTo(HaveOccurred())
 			g.Expect(obj).NotTo(BeNil())
 

pkg/cloud/scope/shared.go

@@ -142,12 +142,7 @@ func getUnstructuredControlPlane(ctx context.Context, client client.Client, clus
 		return &unstructured.Unstructured{}, nil
 	}
 
-	namespace := cluster.Spec.ControlPlaneRef.Namespace
-	if namespace == "" {
-		namespace = cluster.Namespace
-	}
-
-	u, err := external.Get(ctx, client, cluster.Spec.ControlPlaneRef, namespace)
+	u, err := external.Get(ctx, client, cluster.Spec.ControlPlaneRef)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to retrieve control plane object %s/%s", cluster.Spec.ControlPlaneRef.Namespace, cluster.Spec.ControlPlaneRef.Name)
 	}