Merge pull request #204 from slashpai/update-deps

chore: upgrade go version to 1.24.4 and golangci-lint to 2.1.6

Author: k8s-ci-robot

.golangci.yml

@@ -1,8 +1,8 @@
+version: "2"
 run:
  timeout: 7m
-
 linters:
- disable-all: true
+ default: standard
  enable:
  - bodyclose
  - copyloopvar
@@ -11,27 +11,49 @@ linters:
  - errcheck
  - gocritic
  - gocyclo
- - gofmt
- - goimports
- - gosec
  - goprintffuncname
- - gosimple
+ - gosec
  - govet
  - ineffassign
  - misspell
  - nakedret
  - nolintlint
  - revive
  - staticcheck
- - stylecheck
- - typecheck
  - unconvert
  - unused
  - whitespace
-
-linters-settings:
- goimports:
- local-prefixes: sigs.k8s.io/custom-metrics-apiserver
- misspell:
- ignore-words:
- - "creater" # Cf. e.g. https://pkg.go.dev/k8s.io/apimachinery@v0.24.3/pkg/runtime#ObjectCreater
+ settings:
+ misspell:
+ ignore-rules:
+ - creater
+ staticcheck:
+ checks:
+ - all
+ # Disable QF1008 to retain embedded fields for better readability.
+ - "-QF1008"
+ exclusions:
+ generated: lax
+ presets:
+ - comments
+ - common-false-positives
+ - legacy
+ - std-error-handling
+ paths:
+ - third_party$
+ - builtin$
+ - examples$
+formatters:
+ enable:
+ - gofmt
+ - goimports
+ settings:
+ goimports:
+ local-prefixes:
+ - sigs.k8s.io/custom-metrics-apiserver
+ exclusions:
+ generated: lax
+ paths:
+ - third_party$
+ - builtin$
+ - examples$

Makefile

@@ -7,7 +7,7 @@ GOPATH:=$(shell go env GOPATH)
 
 VERSION?=latest
 
-GOLANGCI_VERSION:=1.64.8
+GOLANGCI_VERSION:=2.1.6
 
 .PHONY: all
 all: build-test-adapter
@@ -48,7 +48,7 @@ build-test-adapter: update-generated
 # Format and lint
 # ---------------
 
-HAS_GOLANGCI_VERSION:=$(shell $(GOPATH)/bin/golangci-lint version --format=short)
+HAS_GOLANGCI_VERSION:=$(shell $(GOPATH)/bin/golangci-lint version --short)
 .PHONY: golangci
 golangci:
 ifneq ($(HAS_GOLANGCI_VERSION), $(GOLANGCI_VERSION))

go.mod

@@ -2,7 +2,7 @@ module sigs.k8s.io/custom-metrics-apiserver
 
 go 1.24.0
 
-toolchain go1.24.2
+toolchain go1.24.4
 
 require (
 github.com/emicklei/go-restful/v3 v3.12.2

test-adapter/provider/provider.go

@@ -157,10 +157,8 @@ func (p *testingProvider) updateMetric(request *restful.Request, response *restf
 
 namespace := request.PathParameter("namespace")
 resourceType := request.PathParameter("resourceType")
-namespaced := false
-if len(namespace) > 0 || resourceType == "namespaces" {
-namespaced = true
-}
+namespaced := len(namespace) > 0 || resourceType == "namespaces"
+
 name := request.PathParameter("name")
 metricName := request.PathParameter("metric")