Merge pull request #2451 from shiftstack/cilint-bump-0.11

k8s-ci-robot · web-flow · commit adeb821d71d8 · 2025-03-05T07:59:46.000-08:00
[release-0.11] 🌱 Bump golangci-lint to support go1.24
diff --git a/hack/tools/Makefile b/hack/tools/Makefile
@@ -15,7 +15,7 @@
 ROOT_DIR_RELATIVE := ../..
 include $(ROOT_DIR_RELATIVE)/common.mk
 
-GOLANGCI_LINT_VERSION ?= v1.61.0
+GOLANGCI_LINT_VERSION ?= v1.64.6
 
 # GOTESTSUM version without the leading 'v'
 GOTESTSUM_VERSION ?= 1.11.0
diff --git a/internal/controllers/image/reconcile.go b/internal/controllers/image/reconcile.go
@@ -219,9 +219,8 @@ func (r *orcImageReconciler) reconcileNormal(ctx context.Context, orcImage *orcv
 			addStatus(withIncrementDownloadAttempts())
 
 			return ctrl.Result{}, nil
-		} else {
-			return ctrl.Result{}, r.uploadImageContent(ctx, orcImage, imageClient, glanceImage)
 		}
+		return ctrl.Result{}, r.uploadImageContent(ctx, orcImage, imageClient, glanceImage)
 
 	// Error cases
 	case images.ImageStatusKilled:
diff --git a/orc/Makefile b/orc/Makefile
@@ -184,7 +184,7 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint
 KUSTOMIZE_VERSION ?= v5.4.2
 CONTROLLER_TOOLS_VERSION ?= v0.16.4
 ENVTEST_VERSION ?= release-0.18
-GOLANGCI_LINT_VERSION ?= v1.61.0
+GOLANGCI_LINT_VERSION ?= v1.64.6
 
 .PHONY: kustomize
 kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.

Original file line number	Diff line number	Diff line change
`@@ -219,9 +219,8 @@ func (r orcImageReconciler) reconcileNormal(ctx context.Context, orcImage orcv`
`219`	`219`	`addStatus(withIncrementDownloadAttempts())`
`220`	`220`
`221`	`221`	`return ctrl.Result{}, nil`
`222`		`- } else {`
`223`		`- return ctrl.Result{}, r.uploadImageContent(ctx, orcImage, imageClient, glanceImage)`
`224`	`222`	`}`
	`223`	`+ return ctrl.Result{}, r.uploadImageContent(ctx, orcImage, imageClient, glanceImage)`
`225`	`224`
`226`	`225`	`// Error cases`
`227`	`226`	`case images.ImageStatusKilled:`