Skip to content

Commit 3d969c5

Browse files
authored
Merge pull request #2493 from mrueg/bump-go
chore: Bump go to 1.23.1
2 parents 76ef241 + f34cd69 commit 3d969c5

File tree

8 files changed

+11
-13
lines changed

8 files changed

+11
-13
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ env:
2020
E2E_SETUP_KIND: yes
2121
E2E_SETUP_KUBECTL: yes
2222
SUDO: sudo
23-
GO_VERSION: "^1.22"
24-
GOLANGCI_LINT_VERSION: "v1.56.2"
23+
GO_VERSION: "^1.23"
24+
GOLANGCI_LINT_VERSION: "v1.61.0"
2525

2626
jobs:
2727
ci-go-lint:

.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
run:
2-
deadline: 10m
2+
timeout: 10m
33

44
linters:
55
disable-all: true

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ GIT_COMMIT ?= $(shell git rev-parse --short HEAD)
1515
OS ?= $(shell uname -s | tr A-Z a-z)
1616
ALL_ARCH = amd64 arm arm64 ppc64le s390x
1717
PKG = github.com/prometheus/common
18-
PROMETHEUS_VERSION = 2.53.1
19-
GO_VERSION = 1.22.5
18+
PROMETHEUS_VERSION = 2.54.1
19+
GO_VERSION = 1.23.1
2020
IMAGE = $(REGISTRY)/kube-state-metrics
2121
MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
2222
USER ?= $(shell id -u -n)
2323
HOST ?= $(shell hostname)
24-
MARKDOWNLINT_CLI2_VERSION = 0.13.0
24+
MARKDOWNLINT_CLI2_VERSION = 0.14.0
2525

2626

2727
export DOCKER_CLI_EXPERIMENTAL=enabled

go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module k8s.io/kube-state-metrics/v2
22

3-
go 1.22.0
4-
5-
toolchain go1.22.5
3+
go 1.23.0
64

75
require (
86
github.com/KimMachineGun/automemlimit v0.6.1

pkg/app/server_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,7 @@ func pod(client *fake.Clientset, index int) error {
861861

862862
func foo(client *samplefake.Clientset, index int) error {
863863
i := strconv.Itoa(index)
864-
desiredReplicas := int32(index)
864+
desiredReplicas := int32(index) //nolint:gosec
865865

866866
foo := samplev1alpha1.Foo{
867867
ObjectMeta: metav1.ObjectMeta{

pkg/customresourcestate/custom_resource_metrics_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ func TestNewCustomResourceMetrics(t *testing.T) {
229229
t.Run(tt.name, func(t *testing.T) {
230230
v, err := NewCustomResourceMetrics(tt.r)
231231
if err != nil {
232-
t.Errorf(err.Error())
232+
t.Error(err.Error())
233233
}
234234

235235
// convert to JSON for easier nil comparison

pkg/metricshandler/metrics_handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ func detectNominalFromPod(statefulSetName, podName string) (int32, error) {
256256
return 0, fmt.Errorf("failed to detect shard index for Pod %s of StatefulSet %s, parsed %s: %w", podName, statefulSetName, nominalString, err)
257257
}
258258

259-
return int32(nominal), nil
259+
return int32(nominal), nil //nolint:gosec
260260
}
261261

262262
func detectStatefulSet(kubeClient kubernetes.Interface, podName, namespaceName string) (*appsv1.StatefulSet, error) {

tools/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module k8s.io/kube-state-metrics/v2/tools
22

3-
go 1.21
3+
go 1.23.0
44

55
require (
66
github.com/brancz/gojsontoyaml v0.1.0

0 commit comments

Comments
 (0)