chore: Build with go 1.22

kubernetes · Apr 4, 2024 · 7ba8ef5 · 7ba8ef5
1 parent d4ae486
commit 7ba8ef5
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,8 +20,8 @@ env:
   E2E_SETUP_KIND: yes
   E2E_SETUP_KUBECTL: yes
   SUDO: sudo
-  GO_VERSION: "^1.21"
-  GOLANGCI_LINT_VERSION: "v1.54.2"
+  GO_VERSION: "^1.22"
+  GOLANGCI_LINT_VERSION: "v1.57.2"
 
 jobs:
   ci-go-lint:

diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml
@@ -6,7 +6,7 @@ on:
     - cron: '0 0 * * 1'
 
 env:
-  GO_VERSION: "^1.21"
+  GO_VERSION: "^1.22"
 
 permissions:
   contents: read

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-ARG GOVERSION=1.21
+ARG GOVERSION=1.22
 ARG GOARCH
 FROM golang:${GOVERSION} as builder
 ARG GOARCH

diff --git a/Makefile b/Makefile
@@ -16,7 +16,7 @@ OS ?= $(shell uname -s | tr A-Z a-z)
 ALL_ARCH = amd64 arm arm64 ppc64le s390x
 PKG = github.com/prometheus/common
 PROMETHEUS_VERSION = 2.46.0
-GO_VERSION = 1.21.8
+GO_VERSION = 1.22.2
 IMAGE = $(REGISTRY)/kube-state-metrics
 MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
 USER ?= $(shell id -u -n)

diff --git a/pkg/metrics_store/metrics_writer_test.go b/pkg/metrics_store/metrics_writer_test.go
@@ -238,7 +238,7 @@ func TestWriteAllWithMultipleStores(t *testing.T) {
 
 // TestWriteAllWithEmptyStores checks that nothing is printed if no metrics exist for metric families.
 func TestWriteAllWithEmptyStores(t *testing.T) {
-	genFunc := func(obj interface{}) []metric.FamilyInterface {
+	genFunc := func(_ interface{}) []metric.FamilyInterface {
 		mf1 := metric.Family{
 			Name:    "kube_service_info_1",
 			Metrics: []*metric.Metric{},

diff --git a/pkg/options/options.go b/pkg/options/options.go
@@ -83,7 +83,7 @@ func NewOptions() *Options {
 func (o *Options) AddFlags(cmd *cobra.Command) {
 	o.cmd = cmd
 
-	completionCommand.SetHelpFunc(func(cmd *cobra.Command, args []string) {
+	completionCommand.SetHelpFunc(func(_ *cobra.Command, args []string) {
 		if shellPath, ok := os.LookupEnv("SHELL"); ok {
 			shell := shellPath[strings.LastIndex(shellPath, "/")+1:]
 			fmt.Println(FetchLoadInstructions(shell))
@@ -97,7 +97,7 @@ func (o *Options) AddFlags(cmd *cobra.Command) {
 	versionCommand := &cobra.Command{
 		Use:   "version",
 		Short: "Print version information.",
-		Run: func(cmd *cobra.Command, args []string) {
+		Run: func(_ *cobra.Command, args []string) {
 			fmt.Printf("%s\n", version.Print("kube-state-metrics"))
 			klog.FlushAndExit(klog.ExitFlushTimeout, 0)
 		},