Skip to content

Commit 88adf90

Browse files
committed
bump to golang 1.24
* bump in go.mod * bump the golangci-lint version to v2.4.0 Jira: OSPRH-12935 Signed-off-by: Martin Schuppert <mschuppert@redhat.com>
1 parent 837b07f commit 88adf90

8 files changed

Lines changed: 20 additions & 14 deletions

File tree

.golangci.yaml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
1+
version: "2"
2+
13
linters:
24
# Enable specific linter
35
# https://golangci-lint.run/usage/linters/#enabled-by-default
46
enable:
57
- errorlint
68
- revive
79
- ginkgolinter
8-
- gofmt
910
- govet
1011
- errname
1112
- err113
12-
linters-settings:
13-
revive:
14-
rules:
15-
# https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#unused-parameter
13+
14+
settings:
15+
revive:
16+
rules:
1617
- name: unused-parameter
1718
severity: warning
1819
disabled: true
20+
21+
formatters:
22+
enable:
23+
- gofmt
24+
1925
run:
2026
timeout: 5m

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ GINKGO ?= $(LOCALBIN)/ginkgo
1919

2020
## Tool Versions
2121
CONTROLLER_TOOLS_VERSION ?= v0.14.0
22-
GOTOOLCHAIN_VERSION ?= go1.21.0
23-
GOLANGCI_VERSION ?= v1.64.8
22+
GOTOOLCHAIN_VERSION ?= go1.24.0
23+
GOLANGCI_LINT_VERSION ?= v2.4.0
2424

2525
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
2626
ENVTEST_K8S_VERSION = 1.29
@@ -124,7 +124,7 @@ gotest: get-ci-tools envtest ## Run go test via ci-tools script against code
124124
.PHONY: golangci
125125
golangci: get-ci-tools ## Run golangci-lint test via ci-tools script against code
126126
for mod in $(shell find modules/ -maxdepth 1 -mindepth 1 -type d); do \
127-
GOLANGCI_TAG=$(GOLANGCI_VERSION) GOWORK=off $(CI_TOOLS_REPO_DIR)/test-runner/golangci.sh ./$$mod || exit 1 ; \
127+
GOLANGCI_TAG=$(GOLANGCI_LINT_VERSION) GOWORK=off $(CI_TOOLS_REPO_DIR)/test-runner/golangci.sh ./$$mod || exit 1 ; \
128128
done
129129

130130
.PHONY: golint

modules/ansible/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/openstack-k8s-operators/lib-common/modules/ansible
22

3-
go 1.21
3+
go 1.24
44

55
require gopkg.in/yaml.v3 v3.0.1
66

modules/certmanager/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/openstack-k8s-operators/lib-common/modules/certmanager
22

3-
go 1.21
3+
go 1.24
44

55
require (
66
github.com/cert-manager/cert-manager v1.11.5

modules/common/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/openstack-k8s-operators/lib-common/modules/common
22

3-
go 1.21
3+
go 1.24
44

55
require (
66
github.com/go-logr/logr v1.4.3

modules/openstack/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/openstack-k8s-operators/lib-common/modules/openstack
22

3-
go 1.21
3+
go 1.24
44

55
require (
66
github.com/go-logr/logr v1.4.3

modules/storage/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/openstack-k8s-operators/lib-common/modules/storage
22

3-
go 1.21
3+
go 1.24
44

55
require github.com/onsi/gomega v1.34.1
66

modules/test/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/openstack-k8s-operators/lib-common/modules/test
22

3-
go 1.21
3+
go 1.24
44

55
require (
66
github.com/go-logr/logr v1.4.3

0 commit comments

Comments
 (0)