Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Bump go to 1.23.1 #2493

Merged
merged 1 commit into from
Sep 12, 2024
Merged

chore: Bump go to 1.23.1 #2493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ env:
E2E_SETUP_KIND: yes
E2E_SETUP_KUBECTL: yes
SUDO: sudo
GO_VERSION: "^1.22"
GOLANGCI_LINT_VERSION: "v1.56.2"
GO_VERSION: "^1.23"
GOLANGCI_LINT_VERSION: "v1.61.0"

jobs:
ci-go-lint:
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
run:
deadline: 10m
timeout: 10m

linters:
disable-all: true
Expand Down
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ GIT_COMMIT ?= $(shell git rev-parse --short HEAD)
OS ?= $(shell uname -s | tr A-Z a-z)
ALL_ARCH = amd64 arm arm64 ppc64le s390x
PKG = github.com/prometheus/common
PROMETHEUS_VERSION = 2.53.1
GO_VERSION = 1.22.5
PROMETHEUS_VERSION = 2.54.1
GO_VERSION = 1.23.1
IMAGE = $(REGISTRY)/kube-state-metrics
MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
USER ?= $(shell id -u -n)
HOST ?= $(shell hostname)
MARKDOWNLINT_CLI2_VERSION = 0.13.0
MARKDOWNLINT_CLI2_VERSION = 0.14.0


export DOCKER_CLI_EXPERIMENTAL=enabled
Expand Down
4 changes: 1 addition & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module k8s.io/kube-state-metrics/v2

go 1.22.0

toolchain go1.22.5
go 1.23.0

require (
github.com/KimMachineGun/automemlimit v0.6.1
Expand Down
2 changes: 1 addition & 1 deletion pkg/app/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,7 +861,7 @@ func pod(client *fake.Clientset, index int) error {

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

foo := samplev1alpha1.Foo{
ObjectMeta: metav1.ObjectMeta{
Expand Down
2 changes: 1 addition & 1 deletion pkg/customresourcestate/custom_resource_metrics_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ func TestNewCustomResourceMetrics(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
v, err := NewCustomResourceMetrics(tt.r)
if err != nil {
t.Errorf(err.Error())
t.Error(err.Error())
}

// convert to JSON for easier nil comparison
Expand Down
2 changes: 1 addition & 1 deletion pkg/metricshandler/metrics_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ func detectNominalFromPod(statefulSetName, podName string) (int32, error) {
return 0, fmt.Errorf("failed to detect shard index for Pod %s of StatefulSet %s, parsed %s: %w", podName, statefulSetName, nominalString, err)
}

return int32(nominal), nil
return int32(nominal), nil //nolint:gosec
}

func detectStatefulSet(kubeClient kubernetes.Interface, podName, namespaceName string) (*appsv1.StatefulSet, error) {
Expand Down
2 changes: 1 addition & 1 deletion tools/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module k8s.io/kube-state-metrics/v2/tools

go 1.21
go 1.23.0

require (
github.com/brancz/gojsontoyaml v0.1.0
Expand Down