Merge pull request #397 from jacobweinstock/update-go

Update to Go 1.23:

## Description

<!--- Please describe what this PR is going to change -->
Update to Go 1.23

## Why is this needed

<!--- Link to issue you have raised -->

Fixes: #

## How Has This Been Tested?
<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran to -->
<!--- see how your change affects other areas of the code, etc. -->


## How are existing users impacted? What migration steps/scripts do we need?

<!--- Fixes a bug, unblocks installation, removes a component of the stack etc -->
<!--- Requires a DB migration script, etc. -->


## Checklist:

I have:

- [ ] updated the documentation and/or roadmap (if required)
- [ ] added unit or e2e tests
- [ ] provided instructions on how to upgrade

Author: jacobweinstock

.github/workflows/ci.yaml

@@ -7,7 +7,7 @@ on:
 
 env:
   CGO_ENABLED: 0
-  GO_VERSION: '1.21'
+  GO_VERSION: '1.23'
   REGISTRY: ghcr.io
   # github.repository as <account>/<repo>
   IMAGE_NAME: ${{ github.repository }}

.github/workflows/release.yaml

@@ -7,7 +7,7 @@ on:
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
-  GO_VERSION: '1.21'
+  GO_VERSION: '1.23'
 
 jobs:
   manager-image:

.golangci.yml

@@ -13,7 +13,7 @@ linters:
     - errorlint
     - exhaustive
     #   - exhaustivestruct
-    - exportloopref
+    - copyloopvar
     - forbidigo
     - forcetypeassert
     - funlen

Dockerfile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Build the manager binary
-ARG GOVER=1.21
+ARG GOVER=1.23
 FROM golang:${GOVER} as builder
 
 WORKDIR /workspace

Makefile

@@ -51,7 +51,7 @@ GO_INSTALL = ./scripts/go_install.sh
 # Binaries.
 CONTROLLER_GEN := go run sigs.k8s.io/controller-tools/cmd/[email protected]
 
-GOLANGCI_LINT_VER := v1.59.1
+GOLANGCI_LINT_VER := v1.61.0
 GOLANGCI_LINT_BIN := golangci-lint
 GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
 
@@ -107,7 +107,7 @@ endif
 # Build time versioning details.
 LDFLAGS := $(shell hack/version.sh)
 
-GOLANG_VERSION := 1.21
+GOLANG_VERSION := 1.23
 
 ## --------------------------------------
 ## Help

controller/machine/hardware.go

@@ -251,8 +251,6 @@ func byHardwareAffinity(hardware []tinkv1.Hardware, preferred []infrastructurev1
 	scores := map[client.ObjectKey]int32{}
 	// compute scores for each item based on the preferred term weights
 	for _, term := range preferred {
-		term := term
-
 		selector, err := metav1.LabelSelectorAsSelector(&term.HardwareAffinityTerm.LabelSelector)
 		if err != nil {
 			return nil, fmt.Errorf("constructing label selector: %w", err)

controller/machine/scope_test.go

@@ -84,8 +84,6 @@ func Test_Machine(t *testing.T) {
 	}
 
 	for name, c := range cases {
-		name, c := name, c
-
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			g := NewWithT(t)

controller/machine/template_test.go

@@ -76,8 +76,6 @@ func Test_Cloud_config_template(t *testing.T) {
 	}
 
 	for name, c := range cases {
-		c := c
-
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			g := NewWithT(t)

controller/machine/tinkerbellmachine_test.go

@@ -458,7 +458,7 @@ func Test_Machine_reconciliation_with_available_hardware(t *testing.T) {
 		g.Expect(client.Get(ctx, hardwareNamespacedName, updatedHardware)).To(Succeed())
 
 		if diff := cmp.Diff(updatedHardware.Spec.Interfaces[0].Netboot.AllowPXE, ptr.To(true)); diff != "" {
-			t.Errorf(diff)
+			t.Error(diff)
 		}
 	})
 }
@@ -593,7 +593,7 @@ func Test_Machine_reconciliation_workflow_complete(t *testing.T) {
 		g.Expect(client.Get(ctx, hardwareNamespacedName, updatedHardware)).To(Succeed())
 
 		if diff := cmp.Diff(updatedHardware.Spec.Interfaces[0].Netboot.AllowPXE, ptr.To(false)); diff != "" {
-			t.Errorf(diff)
+			t.Error(diff)
 		}
 	})
 }

go.mod

@@ -1,8 +1,8 @@
 module github.com/tinkerbell/cluster-api-provider-tinkerbell
 
-go 1.21.0
+go 1.23.0
 
-toolchain go1.21.2
+toolchain go1.23.1
 
 require (
 	github.com/go-logr/logr v1.4.1