Merge pull request #218 from saschagrunert/go-lint

Bump CI go version and linter

Author: openshift-merge-bot[bot]

.github/workflows/test.yaml

@@ -4,19 +4,18 @@ name: test
 on: ["push", "pull_request"]
 
 env:
-  GO_VERSION: "1.22"
+  GO_VERSION: "1.23"
   LINUX_ARCHES: "amd64 386 arm arm64 s390x mips64le ppc64le"
 
 jobs:
   build:
     name: Build all linux architectures
     runs-on: ubuntu-latest
     steps:
-      - name: setup go
-        uses: actions/setup-go@v5
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
-      - uses: actions/checkout@v4
 
       - name: Build on all supported architectures
         run: |
@@ -30,11 +29,10 @@ jobs:
     name: Run tests on Linux amd64
     runs-on: ubuntu-latest
     steps:
-      - name: setup go
-        uses: actions/setup-go@v5
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
-      - uses: actions/checkout@v4
 
       - name: Install test binaries
         run: |
@@ -58,4 +56,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
+        with:
+          go-version: ${{ env.GO_VERSION }}
       - run: make lint

.golangci.yml

@@ -23,7 +23,6 @@ linters:
     - errname
     - errorlint
     - exhaustive
-    - exportloopref
     - fatcontext
     - forbidigo
     - forcetypeassert

Makefile

@@ -16,7 +16,7 @@ BUILD_INFO := $(shell date +%s)
 
 BUILD_PATH := $(shell pwd)/build
 GOLANGCI_LINT := ${BUILD_PATH}/golangci-lint
-GOLANGCI_LINT_VERSION := v1.59.1
+GOLANGCI_LINT_VERSION := v1.60.3
 
 # If GOPATH not specified, use one in the local directory
 ifeq ($(GOPATH),)

pkg/ocicni/ocicni.go

@@ -584,7 +584,7 @@ func (plugin *cniNetworkPlugin) SetUpPodWithContext(ctx context.Context, podNetw
 
 	// Set up loopback interface
 	if err := bringUpLoopback(podNetwork.NetNS); err != nil {
-		logrus.Errorf(err.Error())
+		logrus.Error(err)
 		return nil, err
 	}
 
@@ -732,7 +732,7 @@ func (plugin *cniNetworkPlugin) GetPodNetworkStatusWithContext(ctx context.Conte
 	defer plugin.podUnlock(&podNetwork)
 
 	if err := checkLoopback(podNetwork.NetNS); err != nil {
-		logrus.Errorf(err.Error())
+		logrus.Error(err)
 		return nil, err
 	}