Sync common Makefile

Signed-off-by: Dale Haiducek <[email protected]>

Author: dhaiducek

build/common/Makefile.common.mk

@@ -3,21 +3,26 @@
 
 ## CLI versions (with links to the latest releases)
 # https://github.com/kubernetes-sigs/controller-tools/releases/latest
-CONTROLLER_GEN_VERSION := v0.16.3
+CONTROLLER_GEN_VERSION := v0.19.0
 # https://github.com/kubernetes-sigs/kustomize/releases/latest
-KUSTOMIZE_VERSION := v5.6.0
+KUSTOMIZE_VERSION := v5.7.1
 # https://github.com/golangci/golangci-lint/releases/latest
 GOLANGCI_VERSION := v1.64.8
 # https://github.com/mvdan/gofumpt/releases/latest
-GOFUMPT_VERSION := v0.7.0
+GOFUMPT_VERSION := v0.9.1
 # https://github.com/daixiang0/gci/releases/latest
-GCI_VERSION := v0.13.5
+GCI_VERSION := v0.13.7
 # https://github.com/securego/gosec/releases/latest
-GOSEC_VERSION := v2.22.2
+GOSEC_VERSION := v2.22.9
 # https://github.com/kubernetes-sigs/kubebuilder/releases/latest
-KBVERSION := 3.15.1
-# https://github.com/kubernetes/kubernetes/releases/latest
-ENVTEST_K8S_VERSION := 1.30.x
+KBVERSION := 4.9.0
+# https://github.com/alexfalkowski/gocovmerge/releases/latest
+GOCOVMERGE_VERSION := v2.16.0
+# ref: https://book.kubebuilder.io/reference/envtest.html?highlight=setup-envtest#installation
+# Parse the controller-runtime version from go.mod and parse to its release-X.Y git branch
+ENVTEST_VERSION ?= $(shell go list -m -f "{{ .Version }}" sigs.k8s.io/controller-runtime | awk -F'[v.]' '{printf "release-%d.%d", $$2, $$3}')
+# Parse the Kubernetes API version from go.mod (which is v0.Y.Z) and convert to the corresponding v1.Y.Z format
+ENVTEST_K8S_VERSION := $(shell go list -m -f "{{ .Version }}" k8s.io/api | awk -F'[v.]' '{printf "1.%d", $$3}')
 
 LOCAL_BIN ?= $(error LOCAL_BIN is not set.)
 ifneq ($(findstring $(LOCAL_BIN), $(PATH)), $(LOCAL_BIN))
@@ -112,7 +117,8 @@ kubebuilder:
 
 .PHONY: envtest
 envtest:
-	$(call go-get-tool,sigs.k8s.io/controller-runtime/tools/setup-envtest@latest)
+	# Installing setup-envtest using the release-X.Y branch from the version specified in go.mod
+	$(call go-get-tool,sigs.k8s.io/controller-runtime/tools/setup-envtest@$(ENVTEST_VERSION))
 
 .PHONY: gosec
 gosec:
@@ -180,4 +186,4 @@ e2e-dependencies:
 GOCOVMERGE = $(LOCAL_BIN)/gocovmerge
 .PHONY: coverage-dependencies
 coverage-dependencies:
-	$(call go-get-tool,github.com/wadey/gocovmerge@v0.0.0-20160331181800-b5bfa59ec0ad)
+	$(call go-get-tool,github.com/alexfalkowski/gocovmerge/v2@$(GOCOVMERGE_VERSION))

controllers/configurationpolicy_controller.go

@@ -1700,7 +1700,7 @@ func (r *ConfigurationPolicyReconciler) determineDesiredObjects(
 								"expected one optional boolean argument but received %d arguments", len(skips))
 						}
 
-						return
+						return empty, err
 					},
 				}
 
@@ -2356,7 +2356,7 @@ func (r *ConfigurationPolicyReconciler) handleSingleObj(
 			}
 		}
 
-		return
+		return result, objectProperties
 	}
 
 	if exists && !obj.shouldExist {
@@ -2373,15 +2373,15 @@ func (r *ConfigurationPolicyReconciler) handleSingleObj(
 			result.events = append(result.events, objectTmplEvalEvent{false, reasonWantNotFoundExists, ""})
 		}
 
-		return
+		return result, objectProperties
 	}
 
 	if !exists && !obj.shouldExist {
 		log.V(1).Info("The object does not exist and is compliant with the mustnothave compliance type")
 		// it is a must not have and it does not exist, so it is compliant
 		result.events = append(result.events, objectTmplEvalEvent{true, reasonWantNotFoundDNE, ""})
 
-		return
+		return result, objectProperties
 	}
 
 	// object exists and the template requires it, so we need to check specific fields to see if we have a match
@@ -2458,7 +2458,7 @@ func (r *ConfigurationPolicyReconciler) handleSingleObj(
 		}
 	}
 
-	return
+	return result, objectProperties
 }
 
 // getMapping takes in a raw object, decodes it, and maps it to an existing group/kind
@@ -3565,7 +3565,7 @@ func handleKeys(
 		}
 	}
 
-	return
+	return throwSpecViolation, message, updateNeeded, statusMismatch, missingKey
 }
 
 func removeFieldsForComparison(obj *unstructured.Unstructured) {

controllers/configurationpolicy_utils.go

@@ -617,7 +617,7 @@ func createStatus(
 		compliancyDetailsMsg = getCombinedCompliancyDetailsMsg(msgMap, resourceName, compliancyDetailsMsg)
 	}
 
-	return
+	return compliant, compliancyDetailsReason, compliancyDetailsMsg
 }
 
 func setCompliancyDetailsMsgEnd(compliancyDetailsMsg string) string {