Skip to content

Commit fc7cf78

Browse files
committed
chore[NO-TICKET]: fix linter, bump tooling versions
Signed-off-by: Georgy Khromov <[email protected]>
1 parent d31a808 commit fc7cf78

File tree

15 files changed

+202
-210
lines changed

15 files changed

+202
-210
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up Go 1.x
1616
uses: actions/setup-go@v4
1717
with:
18-
go-version: "1.23.5"
18+
go-version: '1.24'
1919
id: go
2020
- name: Check out code into the Go module directory
2121
uses: actions/checkout@v3
@@ -39,7 +39,7 @@ jobs:
3939
- name: Setup Golang
4040
uses: actions/setup-go@v4
4141
with:
42-
go-version: "1.23.5"
42+
go-version: '1.24'
4343
- name: Restore Go build cache
4444
uses: actions/cache@v3
4545
with:

.github/workflows/golangci-lint.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ jobs:
2020
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # pin@v3
2121
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # pin@v4
2222
with:
23-
go-version: '1.23.5'
23+
go-version: '1.24'
2424
cache: false
2525
- name: golangci-lint
2626
uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc # pin@v3
2727
with:
2828
# Require: The version of golangci-lint to use.
2929
# When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
3030
# When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
31-
version: v1.54
31+
version: v1.57.2
3232
# Optional: working directory, useful for monorepos
3333
# working-directory: somedir
3434

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Setup Go
2828
uses: actions/setup-go@v5
2929
with:
30-
go-version: 1.23.5
30+
go-version: '1.24'
3131

3232
- name: Set env
3333
run: echo "VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV

.golangci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ linters:
2121
enable:
2222
- dupl
2323
- errcheck
24-
- exportloopref
2524
- ginkgolinter
2625
- goconst
2726
- gocyclo

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,10 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest-$(ENVTEST_VERSION)
171171
GOLANGCI_LINT = $(LOCALBIN)/golangci-lint-$(GOLANGCI_LINT_VERSION)
172172

173173
## Tool Versions
174-
KUSTOMIZE_VERSION ?= v5.4.1
175-
CONTROLLER_TOOLS_VERSION ?= v0.15.0
174+
KUSTOMIZE_VERSION ?= v5.6.0
175+
CONTROLLER_TOOLS_VERSION ?= v0.18.0
176176
ENVTEST_VERSION ?= release-0.18
177-
GOLANGCI_LINT_VERSION ?= v1.57.2
177+
GOLANGCI_LINT_VERSION ?= v1.64.8
178178

179179
.PHONY: kustomize
180180
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.

config/crd/bases/rbac-operator.argoproj-labs.io_argocdrolebindings.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.15.0
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
name: argocdrolebindings.rbac-operator.argoproj-labs.io
88
spec:
99
group: rbac-operator.argoproj-labs.io

config/crd/bases/rbac-operator.argoproj-labs.io_argocdroles.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.15.0
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
name: argocdroles.rbac-operator.argoproj-labs.io
88
spec:
99
group: rbac-operator.argoproj-labs.io

config/rbac/role.yaml

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,33 +16,14 @@ rules:
1616
- rbac-operator.argoproj-labs.io
1717
resources:
1818
- argocdrolebindings
19+
- argocdroles
1920
verbs:
2021
- '*'
21-
- get
22-
- list
2322
- apiGroups:
2423
- rbac-operator.argoproj-labs.io
2524
resources:
2625
- argocdrolebindings/finalizers
27-
verbs:
28-
- '*'
29-
- apiGroups:
30-
- rbac-operator.argoproj-labs.io
31-
resources:
3226
- argocdrolebindings/status
33-
verbs:
34-
- '*'
35-
- apiGroups:
36-
- rbac-operator.argoproj-labs.io
37-
resources:
38-
- argocdroles
39-
verbs:
40-
- '*'
41-
- get
42-
- list
43-
- apiGroups:
44-
- rbac-operator.argoproj-labs.io
45-
resources:
4627
- argocdroles/finalizers
4728
verbs:
4829
- '*'
@@ -52,6 +33,3 @@ rules:
5233
- argocdroles/status
5334
verbs:
5435
- '*'
55-
- get
56-
- patch
57-
- update

go.mod

Lines changed: 46 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,79 @@
11
module github.com/argoproj-labs/argocd-rbac-operator
22

3-
go 1.23.5
3+
go 1.24.0
44

55
toolchain go1.24.3
66

77
require (
8-
github.com/onsi/ginkgo/v2 v2.19.0
9-
github.com/onsi/gomega v1.33.1
10-
github.com/stretchr/testify v1.9.0
11-
k8s.io/apimachinery v0.30.1
12-
k8s.io/client-go v0.30.1
13-
sigs.k8s.io/controller-runtime v0.18.4
8+
github.com/onsi/ginkgo/v2 v2.23.4
9+
github.com/onsi/gomega v1.37.0
10+
github.com/stretchr/testify v1.10.0
11+
k8s.io/apimachinery v0.33.1
12+
k8s.io/client-go v0.33.1
13+
sigs.k8s.io/controller-runtime v0.21.0
1414
)
1515

1616
require (
17-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
17+
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
18+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
1819
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
20+
github.com/google/btree v1.1.3 // indirect
1921
github.com/pmezard/go-difflib v1.0.0 // indirect
22+
github.com/x448/float16 v0.8.4 // indirect
23+
go.uber.org/automaxprocs v1.6.0 // indirect
24+
golang.org/x/sync v0.14.0 // indirect
25+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
26+
sigs.k8s.io/randfill v1.0.0 // indirect
2027
)
2128

2229
require (
2330
github.com/beorn7/perks v1.0.1 // indirect
2431
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2532
github.com/davecgh/go-spew v1.1.1 // indirect
26-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
27-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
28-
github.com/fsnotify/fsnotify v1.7.0 // indirect
29-
github.com/go-logr/logr v1.4.2
33+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
34+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
35+
github.com/fsnotify/fsnotify v1.9.0 // indirect
36+
github.com/go-logr/logr v1.4.3
3037
github.com/go-logr/zapr v1.3.0 // indirect
31-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
38+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
3239
github.com/go-openapi/jsonreference v0.21.0 // indirect
33-
github.com/go-openapi/swag v0.23.0 // indirect
40+
github.com/go-openapi/swag v0.23.1 // indirect
3441
github.com/gogo/protobuf v1.3.2 // indirect
35-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
36-
github.com/golang/protobuf v1.5.4 // indirect
37-
github.com/google/gnostic-models v0.6.8 // indirect
38-
github.com/google/go-cmp v0.6.0 // indirect
39-
github.com/google/gofuzz v1.2.0 // indirect
40-
github.com/google/pprof v0.0.0-20240528025155-186aa0362fba // indirect
42+
github.com/google/gnostic-models v0.6.9 // indirect
43+
github.com/google/go-cmp v0.7.0 // indirect
44+
github.com/google/pprof v0.0.0-20250501235452-c0086092b71a // indirect
4145
github.com/google/uuid v1.6.0 // indirect
42-
github.com/imdario/mergo v0.3.16 // indirect
4346
github.com/josharian/intern v1.0.0 // indirect
4447
github.com/json-iterator/go v1.1.12 // indirect
45-
github.com/mailru/easyjson v0.7.7 // indirect
48+
github.com/mailru/easyjson v0.9.0 // indirect
4649
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4750
github.com/modern-go/reflect2 v1.0.2 // indirect
4851
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4952
github.com/pkg/errors v0.9.1 // indirect
50-
github.com/prometheus/client_golang v1.19.1 // indirect
51-
github.com/prometheus/client_model v0.6.1 // indirect
52-
github.com/prometheus/common v0.54.0 // indirect
53-
github.com/prometheus/procfs v0.15.1 // indirect
54-
github.com/spf13/pflag v1.0.5 // indirect
53+
github.com/prometheus/client_golang v1.22.0 // indirect
54+
github.com/prometheus/client_model v0.6.2 // indirect
55+
github.com/prometheus/common v0.64.0 // indirect
56+
github.com/prometheus/procfs v0.16.1 // indirect
57+
github.com/spf13/pflag v1.0.6 // indirect
5558
go.uber.org/multierr v1.11.0 // indirect
5659
go.uber.org/zap v1.27.0 // indirect
57-
golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 // indirect
58-
golang.org/x/net v0.38.0 // indirect
59-
golang.org/x/oauth2 v0.21.0 // indirect
60-
golang.org/x/sys v0.31.0 // indirect
61-
golang.org/x/term v0.30.0 // indirect
62-
golang.org/x/text v0.23.0 // indirect
63-
golang.org/x/time v0.5.0 // indirect
64-
golang.org/x/tools v0.22.0 // indirect
65-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
66-
google.golang.org/protobuf v1.34.1 // indirect
60+
golang.org/x/net v0.40.0 // indirect
61+
golang.org/x/oauth2 v0.30.0 // indirect
62+
golang.org/x/sys v0.33.0 // indirect
63+
golang.org/x/term v0.32.0 // indirect
64+
golang.org/x/text v0.25.0 // indirect
65+
golang.org/x/time v0.11.0 // indirect
66+
golang.org/x/tools v0.33.0 // indirect
67+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
68+
google.golang.org/protobuf v1.36.6 // indirect
6769
gopkg.in/inf.v0 v0.9.1 // indirect
68-
gopkg.in/yaml.v2 v2.4.0 // indirect
6970
gopkg.in/yaml.v3 v3.0.1 // indirect
70-
k8s.io/api v0.30.1
71-
k8s.io/apiextensions-apiserver v0.30.1 // indirect
72-
k8s.io/klog/v2 v2.120.1 // indirect
73-
k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a // indirect
74-
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
75-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
76-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
71+
k8s.io/api v0.33.1
72+
k8s.io/apiextensions-apiserver v0.33.1 // indirect
73+
k8s.io/klog/v2 v2.130.1 // indirect
74+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
75+
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 // indirect
76+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
77+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
7778
sigs.k8s.io/yaml v1.4.0 // indirect
7879
)

0 commit comments

Comments
 (0)