Bump to Go v1.23

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

Author: dhaiducek

build/Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM registry.ci.openshift.org/stolostron/builder:go1.22-linux AS builder
+FROM registry.ci.openshift.org/stolostron/builder:go1.23-linux AS builder
 
 ARG GOOS
 ARG GOARCH

build/Dockerfile.rhtap

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.22 AS builder
+FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.23 AS builder
 
 ARG GOOS
 ARG GOARCH

build/common/Makefile.common.mk

@@ -7,7 +7,7 @@ CONTROLLER_GEN_VERSION := v0.16.3
 # https://github.com/kubernetes-sigs/kustomize/releases/latest
 KUSTOMIZE_VERSION := v5.4.3
 # https://github.com/golangci/golangci-lint/releases/latest
-GOLANGCI_VERSION := v1.52.2
+GOLANGCI_VERSION := v1.60.3
 # https://github.com/mvdan/gofumpt/releases/latest
 GOFUMPT_VERSION := v0.7.0
 # https://github.com/daixiang0/gci/releases/latest

build/common/config/.golangci.yml

@@ -43,6 +43,7 @@ linters:
     - goerr113
     - golint # replaced by revive
     - gomnd
+    - mnd
     - gomoddirectives
     - gosec
     - ifshort
@@ -55,6 +56,7 @@ linters:
     - nilnil # New linter to consider
     - nonamedreturns # New linter to consider
     - paralleltest
+    - perfsprint
     - prealloc
     - revive
     - scopelint

controllers/gatekeeper_controller.go

@@ -1512,6 +1512,7 @@ func updateContainerArg(
 		isMultiArg := slices.Contains(multiArgFlags, argName)
 
 		index := -1
+
 		for i, arg := range args {
 			n, v := util.FromArg(arg)
 			if n == argName && (!isMultiArg || isMultiArg && v == argValue) {

controllers/gatekeeper_controller_test.go

@@ -291,7 +291,6 @@ func TestSetCommonConfig(t *testing.T) {
 	} {
 		for testName, test := range testcases {
 			testName := fmt.Sprintf("%s:%s", component, testName)
-			test := test
 
 			// Fetch relevant component object (audit or webhook)
 			obj, err := util.GetManifestObject(file)
@@ -906,6 +905,7 @@ func assertFailurePolicy(
 			current, found, err := unstructured.NestedString(webhook, "failurePolicy")
 			g.Expect(err).ToNot(HaveOccurred())
 			g.Expect(found).To(BeTrue())
+
 			if expected == nil {
 				g.Expect(test.DefaultDeployment.FailurePolicy).To(BeEquivalentTo(current))
 			} else {
@@ -988,6 +988,7 @@ func assertNamespaceSelector(
 		if webhook["name"] == webhookName {
 			current, found, err := unstructured.NestedFieldCopy(webhook, "namespaceSelector")
 			g.Expect(err).ToNot(HaveOccurred())
+
 			if expected == nil {
 				// ValidatingWebhookConfiguration and
 				// MutatingWebhookConfiguration have the same defaults.

controllers/merge/merge.go

@@ -93,16 +93,20 @@ func retainSecretFields(desiredObj, clusterObj *unstructured.Unstructured) error
 func retainWebhookConfigurationFields(desiredObj, clusterObj *unstructured.Unstructured) error {
 	// Retain each webhook's CABundle
 	clusterWebhooks, ok, err := unstructured.NestedSlice(clusterObj.Object, "webhooks")
-	if err != nil {
+
+	switch {
+	case err != nil:
 		return errors.Wrapf(err, "Error retrieving webhooks from cluster object %s", clusterObj.GetKind())
-	} else if ok && len(clusterWebhooks) == 0 {
+
+	case ok && len(clusterWebhooks) == 0:
 		err = unstructured.SetNestedSlice(desiredObj.Object, nil, "webhooks")
 		if err != nil {
 			return errors.Wrapf(err, "Error setting webhooks for desired object %s", desiredObj.GetKind())
 		}
 
 		return nil
-	} else if !ok {
+
+	case !ok:
 		return nil
 	}
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/stolostron/gatekeeper-operator
 
-go 1.22.0
+go 1.23.6
 
 require (
 	github.com/go-bindata/go-bindata v3.1.2+incompatible

test/e2e/gatekeeper_controller_test.go

@@ -985,6 +985,7 @@ func assertResources(expected, current corev1.ResourceRequirements) {
 func byCheckingValidation(ctx SpecContext, mode v1alpha1.Mode) {
 	By("Checking validation is "+string(mode), func() {
 		validatingWebhookConfiguration := &admregv1.ValidatingWebhookConfiguration{}
+
 		Eventually(func() error {
 			err := K8sClient.Get(ctx, validatingWebhookName, validatingWebhookConfiguration)
 			if !mode.ToBool() && apierrors.IsNotFound(err) {
@@ -1041,6 +1042,7 @@ func byCheckingMutation(ctx SpecContext, mode v1alpha1.Mode) {
 
 	By("Checking MutatingWebhookConfiguration is "+msgNegation+"deployed", func() {
 		mutatingWebhookConfiguration := &admregv1.MutatingWebhookConfiguration{}
+
 		Eventually(func() error {
 			err := K8sClient.Get(ctx, mutatingWebhookName, mutatingWebhookConfiguration)
 			if !mode.ToBool() && apierrors.IsNotFound(err) {