fix lint issues

Author: arshadd-b

.github/workflows/pr-golangci-lint.yaml

@@ -30,7 +30,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@4696ba8babb6127d732c3c6dde519db15edab9ea # tag=v6.5.1
         with:
-          version: v1.64.2
+          version: v1.64.3
           args: --out-format=colored-line-number
           working-directory: ${{matrix.working-directory}}
       - name: Lint API

Tiltfile

@@ -174,7 +174,7 @@ tilt_helper_dockerfile_header = """
 # Tilt image
 FROM golang:1.24.9 as tilt-helper
 # Install delve. Note this should be kept in step with the Go release minor version.
-RUN go install github.com/go-delve/delve/cmd/dlv@v1.23
+RUN go install github.com/go-delve/delve/cmd/dlv@v1.24
 # Support live reloading with Tilt
 RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/tilt-dev/rerun-process-wrapper/master/restart.sh  && \
     wget --output-document /start.sh --quiet https://raw.githubusercontent.com/tilt-dev/rerun-process-wrapper/master/start.sh && \

hack/tools/.custom-gcl.yaml

@@ -1,5 +1,5 @@
-version:  v1.63.4
-name: golangci-lint-kal-v1.63.4
+version:  v1.63.3
+name: golangci-lint-kal-v1.63.3
 destination: ./bin
 plugins:
 - module: 'github.com/JoelSpeed/kal'

internal/controllers/clusterresourceset/clusterresourceset_helpers.go

@@ -146,11 +146,7 @@ func (r *Reconciler) getOrCreateClusterResourceSetBinding(ctx context.Context, c
 // 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
 	}
 
@@ -160,11 +156,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

@@ -687,7 +687,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