upgrade golangci-lint to v1.61.0

Signed-off-by: rambohe-ch <rambohe.ch@gmail.com>

.github/workflows/create-release.yml

@@ -9,7 +9,7 @@ permissions:
   packages: write
 
 env:
-  GO_VERSION: '1.22'
+  GO_VERSION: '1.23'
 
 jobs:
   create-release:

.github/workflows/e2e-preset-test.yml

@@ -21,7 +21,7 @@ on:
                 description: "Test on VLLM runtime"
 
 env:
-    GO_VERSION: "1.22"
+    GO_VERSION: "1.23"
     BRANCH_NAME: ${{ github.head_ref || github.ref_name}} 
     FORCE_RUN_ALL: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.force-run-all == 'true' }}
     FORCE_RUN_ALL_PHI:  ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.force-run-all-phi-models== 'true' }}

.github/workflows/e2e-preset-tuning-test.yml

@@ -8,7 +8,7 @@ on:
     workflow_dispatch: {}
 
 env:
-    GO_VERSION: "1.22"
+    GO_VERSION: "1.23"
 
 permissions:
     id-token: write

.github/workflows/e2e-workflow.yml

@@ -34,7 +34,7 @@ jobs:
       id-token: write # This is required for requesting the JWT
     environment: e2e-test
     env:
-      GO_VERSION: "1.22"
+      GO_VERSION: "1.23"
       KARPENTER_NAMESPACE: "karpenter"
       GPU_PROVISIONER_NAMESPACE: "gpu-provisioner"
 

.github/workflows/kaito-e2e.yml

@@ -9,7 +9,7 @@ on:
     paths-ignore: ['docs/**', '**.md', '**.mdx', '**.png', '**.jpg']
 
 env:
-  GO_VERSION: "1.22"
+  GO_VERSION: "1.23"
 
 permissions:
   id-token: write # This is required for requesting the JWT

.github/workflows/lint-go.yml

@@ -13,7 +13,7 @@ on:
       - main
 
 env:
-  GO_VERSION: '1.22'
+  GO_VERSION: '1.23'
 
 permissions:
   contents: read

.github/workflows/preset-image-build-1ES.yml

@@ -33,7 +33,7 @@ on:
         description: "Run all Phi models for build"
 
 env:
-    GO_VERSION: "1.22"
+    GO_VERSION: "1.23"
     BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
     WEIGHTS_DIR: "/mnt/storage"
 

.github/workflows/preset-image-build.yml

@@ -28,7 +28,7 @@ on:
         default: false
         description: "Run all public models for build"
 env:
-    GO_VERSION: "1.22"
+    GO_VERSION: "1.23"
     BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
     WEIGHTS_DIR: "/datadrive"
 

.github/workflows/publish-rag-controller-gh-image.yml

@@ -12,7 +12,7 @@ permissions:
   packages: write
 
 env:
-  GO_VERSION: '1.22'
+  GO_VERSION: '1.23'
   IMAGE_NAME: 'kaito-rag-engine'
   REGISTRY: ghcr.io
 

.github/workflows/publish-rag-service-gh-image.yml

@@ -12,7 +12,7 @@ permissions:
   packages: write
 
 env:
-  GO_VERSION: '1.22'
+  GO_VERSION: '1.23'
   IMAGE_NAME: 'kaito-rag-service'
   REGISTRY: ghcr.io
 

.github/workflows/publish-workspace-gh-image.yml

@@ -12,7 +12,7 @@ permissions:
   packages: write
 
 env:
-  GO_VERSION: '1.22'
+  GO_VERSION: '1.23'
   IMAGE_NAME: 'workspace'
   REGISTRY: ghcr.io
 

.github/workflows/publish-workspace-mcr-image.yml

@@ -8,7 +8,7 @@ permissions:
   packages: write
 
 env:
-  GO_VERSION: '1.22'
+  GO_VERSION: '1.23'
   IMAGE_NAME: 'workspace'
 
 jobs:

.github/workflows/unit-tests-ragengine.yml

@@ -17,7 +17,7 @@ permissions:
   packages: write
 
 env:
-  GO_VERSION: "1.22"
+  GO_VERSION: "1.23"
 
 jobs:
   unit-tests:

.github/workflows/unit-tests.yml

@@ -17,7 +17,7 @@ permissions:
   packages: write
 
 env:
-  GO_VERSION: "1.22"
+  GO_VERSION: "1.23"
 
 jobs:
   unit-tests:

.golangci.yaml

@@ -1,20 +1,29 @@
 run:
-  deadline: 10m
+  timeout: 15m
+
+linters-settings:
+  gci:
+    skip-generated: true
+    sections:
+      - standard
+      - prefix(github.com/kaito-project)
+      - default
 
 linters:
   disable-all: true
   enable:
-    - deadcode
     - gosimple
     - govet
     - ineffassign
     - misspell
     - nakedret
     - nilerr
     - prealloc
-    - structcheck
     - typecheck
     - unused
-    - varcheck
+    - gci
+    - gofmt
+    - goimports
+    - staticcheck
   # Run with --fast=false for more extensive checks
   fast: true

Makefile

@@ -12,7 +12,7 @@ BIN_DIR := $(abspath $(ROOT_DIR)/bin)
 TOOLS_DIR := hack/tools
 TOOLS_BIN_DIR := $(abspath $(TOOLS_DIR)/bin)
 
-GOLANGCI_LINT_VER := v1.57.2
+GOLANGCI_LINT_VER := v1.61.0
 GOLANGCI_LINT_BIN := golangci-lint
 GOLANGCI_LINT := $(abspath $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER))
 

api/v1alpha1/params_validation.go

@@ -10,14 +10,15 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/kaito-project/kaito/pkg/k8sclient"
-	"github.com/kaito-project/kaito/pkg/utils"
 	"gopkg.in/yaml.v2"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"knative.dev/pkg/apis"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/kaito-project/kaito/pkg/k8sclient"
+	"github.com/kaito-project/kaito/pkg/utils"
 )
 
 type Config struct {

api/v1alpha1/ragengine_validation.go

@@ -11,12 +11,13 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/kaito-project/kaito/pkg/utils"
-	"github.com/kaito-project/kaito/pkg/utils/consts"
 	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/klog/v2"
 	"knative.dev/pkg/apis"
+
+	"github.com/kaito-project/kaito/pkg/utils"
+	"github.com/kaito-project/kaito/pkg/utils/consts"
 )
 
 func (w *RAGEngine) SupportedVerbs() []admissionregistrationv1.OperationType {

api/v1alpha1/workspace_validation.go

@@ -12,13 +12,6 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/kaito-project/kaito/pkg/k8sclient"
-	"github.com/kaito-project/kaito/pkg/utils/consts"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-
-	"github.com/kaito-project/kaito/pkg/utils"
-	"github.com/kaito-project/kaito/pkg/utils/plugin"
-
 	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -27,6 +20,12 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation"
 	"k8s.io/klog/v2"
 	"knative.dev/pkg/apis"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/kaito-project/kaito/pkg/k8sclient"
+	"github.com/kaito-project/kaito/pkg/utils"
+	"github.com/kaito-project/kaito/pkg/utils/consts"
+	"github.com/kaito-project/kaito/pkg/utils/plugin"
 )
 
 const (

api/v1alpha1/workspace_validation_test.go

@@ -9,15 +9,15 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/kaito-project/kaito/pkg/k8sclient"
-	"github.com/kaito-project/kaito/pkg/utils/consts"
-	"github.com/kaito-project/kaito/pkg/utils/plugin"
-	"k8s.io/apimachinery/pkg/runtime"
-
-	"github.com/kaito-project/kaito/pkg/model"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	"github.com/kaito-project/kaito/pkg/k8sclient"
+	"github.com/kaito-project/kaito/pkg/model"
+	"github.com/kaito-project/kaito/pkg/utils/consts"
+	"github.com/kaito-project/kaito/pkg/utils/plugin"
 )
 
 const DefaultReleaseNamespace = "kaito-workspace"

cmd/ragengine/main.go

@@ -11,28 +11,28 @@ import (
 	"syscall"
 	"time"
 
+	//+kubebuilder:scaffold:imports
 	azurev1alpha2 "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2"
-	"github.com/kaito-project/kaito/pkg/k8sclient"
-	"github.com/kaito-project/kaito/pkg/ragengine/controllers"
-	"github.com/kaito-project/kaito/pkg/ragengine/webhooks"
-	kaitoutils "github.com/kaito-project/kaito/pkg/utils"
-	"k8s.io/klog/v2"
-	"knative.dev/pkg/injection/sharedmain"
-	"knative.dev/pkg/webhook"
-	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
-
-	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
-	// to ensure that exec-entrypoint and run can make use of them.
-	kaitov1alpha1 "github.com/kaito-project/kaito/api/v1alpha1"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
+	"k8s.io/klog/v2"
+	"knative.dev/pkg/injection/sharedmain"
+	"knative.dev/pkg/webhook"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
-	//+kubebuilder:scaffold:imports
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
+
+	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
+	// to ensure that exec-entrypoint and run can make use of them.
+	kaitov1alpha1 "github.com/kaito-project/kaito/api/v1alpha1"
+	"github.com/kaito-project/kaito/pkg/k8sclient"
+	"github.com/kaito-project/kaito/pkg/ragengine/controllers"
+	"github.com/kaito-project/kaito/pkg/ragengine/webhooks"
+	kaitoutils "github.com/kaito-project/kaito/pkg/utils"
 )
 
 const (

cmd/workspace/main.go

@@ -11,30 +11,28 @@ import (
 	"syscall"
 	"time"
 
+	//+kubebuilder:scaffold:imports
 	azurev1alpha2 "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2"
-	"github.com/kaito-project/kaito/pkg/featuregates"
-	"github.com/kaito-project/kaito/pkg/k8sclient"
-	kaitoutils "github.com/kaito-project/kaito/pkg/utils"
-	"github.com/kaito-project/kaito/pkg/utils/nodeclaim"
-	"github.com/kaito-project/kaito/pkg/workspace/controllers"
-	"github.com/kaito-project/kaito/pkg/workspace/webhooks"
-	"k8s.io/klog/v2"
-	"knative.dev/pkg/injection/sharedmain"
-	"knative.dev/pkg/webhook"
-	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
-
-	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
-	// to ensure that exec-entrypoint and run can make use of them.
-	kaitov1alpha1 "github.com/kaito-project/kaito/api/v1alpha1"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
+	"k8s.io/klog/v2"
+	"knative.dev/pkg/injection/sharedmain"
+	"knative.dev/pkg/webhook"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
-	//+kubebuilder:scaffold:imports
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
+
+	kaitov1alpha1 "github.com/kaito-project/kaito/api/v1alpha1"
+	"github.com/kaito-project/kaito/pkg/featuregates"
+	"github.com/kaito-project/kaito/pkg/k8sclient"
+	kaitoutils "github.com/kaito-project/kaito/pkg/utils"
+	"github.com/kaito-project/kaito/pkg/utils/nodeclaim"
+	"github.com/kaito-project/kaito/pkg/workspace/controllers"
+	"github.com/kaito-project/kaito/pkg/workspace/webhooks"
 )
 
 const (

pkg/featuregates/featuregates.go

@@ -7,8 +7,9 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/kaito-project/kaito/pkg/utils/consts"
 	cliflag "k8s.io/component-base/cli/flag"
+
+	"github.com/kaito-project/kaito/pkg/utils/consts"
 )
 
 var (

pkg/model/interface.go

@@ -6,8 +6,9 @@ import (
 	"path"
 	"time"
 
-	"github.com/kaito-project/kaito/pkg/utils"
 	corev1 "k8s.io/api/core/v1"
+
+	"github.com/kaito-project/kaito/pkg/utils"
 )
 
 type Model interface {

pkg/ragengine/controllers/preset-rag.go

@@ -6,16 +6,16 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/kaito-project/kaito/pkg/utils"
-	"github.com/kaito-project/kaito/pkg/utils/consts"
-
-	kaitov1alpha1 "github.com/kaito-project/kaito/api/v1alpha1"
-	"github.com/kaito-project/kaito/pkg/ragengine/manifests"
-	"github.com/kaito-project/kaito/pkg/utils/resources"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/kaito-project/kaito/api/v1alpha1"
+	"github.com/kaito-project/kaito/pkg/ragengine/manifests"
+	"github.com/kaito-project/kaito/pkg/utils"
+	"github.com/kaito-project/kaito/pkg/utils/consts"
+	"github.com/kaito-project/kaito/pkg/utils/resources"
 )
 
 const (
@@ -66,7 +66,7 @@ var (
 	}
 )
 
-func CreatePresetRAG(ctx context.Context, ragEngineObj *kaitov1alpha1.RAGEngine, revisionNum string, kubeClient client.Client) (client.Object, error) {
+func CreatePresetRAG(ctx context.Context, ragEngineObj *v1alpha1.RAGEngine, revisionNum string, kubeClient client.Client) (client.Object, error) {
 	var volumes []corev1.Volume
 	var volumeMounts []corev1.VolumeMount