fix lint issues

Author: arshadd-b

.golangci.yml

@@ -373,3 +373,14 @@ issues:
   - linters:
       - govet
     text: "non-constant format string in call to sigs\\.k8s\\.io\\/cluster-api\\/util\\/conditions\\."
+    # Ignore ginkgolinter suggestions
+  - linters:
+    - ginkgolinter
+    text: "(wrong error assertion|wrong comparison assertion)"
+    path: "(^.*_test\\.go$|^test/e2e/.*\\.go$)"
+    # Ignore intrange suggestions in targeted files only
+  - linters:
+    - intrange
+    text: "for loop can be changed to `i := range machineList`"
+    path: "(^exp/internal/controllers/machinepool_controller_phases\\.go$|^internal/controllers/machineset/machineset_controller\\.go$)"
+     

exp/addons/internal/controllers/clusterresourceset_helpers.go

@@ -147,11 +147,7 @@ func (r *ClusterResourceSetReconciler) getOrCreateClusterResourceSetBinding(ctx
 // getConfigMap retrieves any ConfigMap from the given name and namespace.
 func getConfigMap(ctx context.Context, c client.Client, configmapName types.NamespacedName) (*corev1.ConfigMap, error) {
 	configMap := &corev1.ConfigMap{}
-	configMapKey := client.ObjectKey{
-		Namespace: configmapName.Namespace,
-		Name:      configmapName.Name,
-	}
-	if err := c.Get(ctx, configMapKey, configMap); err != nil {
+	if err := c.Get(ctx, configmapName, configMap); err != nil {
 		return nil, err
 	}
 
@@ -161,11 +157,7 @@ func getConfigMap(ctx context.Context, c client.Client, configmapName types.Name
 // getSecret retrieves any Secret from the given secret name and namespace.
 func getSecret(ctx context.Context, c client.Client, secretName types.NamespacedName) (*corev1.Secret, error) {
 	secret := &corev1.Secret{}
-	secretKey := client.ObjectKey{
-		Namespace: secretName.Namespace,
-		Name:      secretName.Name,
-	}
-	if err := c.Get(ctx, secretKey, secret); err != nil {
+	if err := c.Get(ctx, secretName, secret); err != nil {
 		return nil, err
 	}
 

test/e2e/cluster_upgrade_runtimesdk.go

@@ -607,7 +607,7 @@ func beforeClusterDeleteHandler(ctx context.Context, c client.Client, cluster ty
 		var blocked = true
 
 		// If the Cluster is not found it has been deleted and the hook is unblocked.
-		if apierrors.IsNotFound(c.Get(ctx, client.ObjectKey{Name: cluster.Name, Namespace: cluster.Namespace}, &clusterv1.Cluster{})) {
+		if apierrors.IsNotFound(c.Get(ctx, cluster, &clusterv1.Cluster{})) {
 			blocked = false
 		}
 		return blocked