Skip to content

Commit ba8ee8e

Browse files
authored
Merge pull request #33 from datum-cloud/package-updates
Package updates
2 parents 77829ed + da716f5 commit ba8ee8e

File tree

15 files changed

+157
-396
lines changed

15 files changed

+157
-396
lines changed

.github/workflows/lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
- name: Setup Go
1616
uses: actions/setup-go@v5
1717
with:
18-
go-version: '~1.23'
18+
go-version: '~1.24.0'
1919

2020
- name: Run linter
21-
uses: golangci/golangci-lint-action@v6
21+
uses: golangci/golangci-lint-action@v7
2222
with:
23-
version: v1.61
23+
version: v2.1.5

.github/workflows/test-e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup Go
1616
uses: actions/setup-go@v5
1717
with:
18-
go-version: '~1.23'
18+
go-version: '~1.24.0'
1919

2020
- name: Install the latest version of kind
2121
run: |

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup Go
1616
uses: actions/setup-go@v5
1717
with:
18-
go-version: '~1.23'
18+
go-version: '~1.24.0'
1919

2020
- name: Running Tests
2121
run: |

.golangci.yml

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,15 @@
1+
version: "2"
12
run:
2-
timeout: 5m
33
allow-parallel-runners: true
4-
5-
issues:
6-
# don't skip warning about doc comments
7-
# don't exclude the default set of lint
8-
exclude-use-default: false
9-
# restore some of the defaults
10-
# (fill in the rest as needed)
11-
exclude-rules:
12-
- path: "api/*"
13-
linters:
14-
- lll
15-
- path: "internal/*"
16-
linters:
17-
- dupl
18-
- lll
194
linters:
20-
disable-all: true
5+
default: none
216
enable:
7+
- copyloopvar
228
- dupl
239
- errcheck
24-
- copyloopvar
2510
- ginkgolinter
2611
- goconst
2712
- gocyclo
28-
- gofmt
29-
- goimports
30-
- gosimple
3113
- govet
3214
- ineffassign
3315
- lll
@@ -36,12 +18,34 @@ linters:
3618
- prealloc
3719
- revive
3820
- staticcheck
39-
- typecheck
4021
- unconvert
4122
- unparam
4223
- unused
43-
44-
linters-settings:
45-
revive:
24+
settings:
25+
revive:
26+
rules:
27+
- name: comment-spacings
28+
exclusions:
29+
generated: lax
4630
rules:
47-
- name: comment-spacings
31+
- linters:
32+
- lll
33+
path: api/*
34+
- linters:
35+
- dupl
36+
- lll
37+
path: internal/*
38+
paths:
39+
- third_party$
40+
- builtin$
41+
- examples$
42+
formatters:
43+
enable:
44+
- gofmt
45+
- goimports
46+
exclusions:
47+
generated: lax
48+
paths:
49+
- third_party$
50+
- builtin$
51+
- examples$

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint
181181
KUSTOMIZE_VERSION ?= v5.5.0
182182
CONTROLLER_TOOLS_VERSION ?= v0.16.4
183183
ENVTEST_VERSION ?= release-0.19
184-
GOLANGCI_LINT_VERSION ?= v1.62.0
184+
GOLANGCI_LINT_VERSION ?= v2.1.5
185185

186186
.PHONY: kustomize
187187
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
@@ -201,7 +201,7 @@ $(ENVTEST): $(LOCALBIN)
201201
.PHONY: golangci-lint
202202
golangci-lint: $(GOLANGCI_LINT) ## Download golangci-lint locally if necessary.
203203
$(GOLANGCI_LINT): $(LOCALBIN)
204-
$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint,$(GOLANGCI_LINT_VERSION))
204+
$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/v2/cmd/golangci-lint,$(GOLANGCI_LINT_VERSION))
205205

206206
# go-install-tool will 'go install' any package with custom target and name of binary, if it doesn't exist
207207
# $1 - target path with name of binary

go.mod

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,22 @@ go 1.23.0
44

55
require (
66
github.com/go-logr/logr v1.4.2
7-
github.com/google/go-cmp v0.6.0
8-
github.com/onsi/ginkgo/v2 v2.19.0
9-
github.com/onsi/gomega v1.33.1
7+
github.com/google/go-cmp v0.7.0
8+
github.com/onsi/ginkgo/v2 v2.23.4
9+
github.com/onsi/gomega v1.37.0
1010
github.com/stretchr/testify v1.9.0
1111
go.datum.net/network-services-operator v0.0.0-20250102193121-b4bcc249023a
12-
golang.org/x/crypto v0.31.0
13-
google.golang.org/protobuf v1.35.1
14-
k8s.io/api v0.31.1
15-
k8s.io/apimachinery v0.31.1
16-
k8s.io/client-go v0.31.1
17-
sigs.k8s.io/controller-runtime v0.19.1
12+
golang.org/x/crypto v0.36.0
13+
google.golang.org/protobuf v1.36.6
14+
k8s.io/api v0.32.1
15+
k8s.io/apimachinery v0.32.1
16+
k8s.io/client-go v0.32.1
17+
sigs.k8s.io/controller-runtime v0.20.4
1818
sigs.k8s.io/gateway-api v1.2.1
1919
)
2020

2121
require (
22+
cel.dev/expr v0.18.0 // indirect
2223
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
2324
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
2425
github.com/beorn7/perks v1.0.1 // indirect
@@ -27,7 +28,7 @@ require (
2728
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2829
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2930
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
30-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
31+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
3132
github.com/felixge/httpsnoop v1.0.4 // indirect
3233
github.com/fsnotify/fsnotify v1.7.0 // indirect
3334
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
@@ -38,15 +39,14 @@ require (
3839
github.com/go-openapi/swag v0.23.0 // indirect
3940
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4041
github.com/gogo/protobuf v1.3.2 // indirect
41-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4242
github.com/golang/protobuf v1.5.4 // indirect
43-
github.com/google/cel-go v0.20.1 // indirect
43+
github.com/google/btree v1.1.3 // indirect
44+
github.com/google/cel-go v0.22.0 // indirect
4445
github.com/google/gnostic-models v0.6.8 // indirect
4546
github.com/google/gofuzz v1.2.0 // indirect
46-
github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af // indirect
47+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
4748
github.com/google/uuid v1.6.0 // indirect
4849
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
49-
github.com/imdario/mergo v0.3.16 // indirect
5050
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5151
github.com/josharian/intern v1.0.0 // indirect
5252
github.com/json-iterator/go v1.1.12 // indirect
@@ -62,7 +62,7 @@ require (
6262
github.com/prometheus/procfs v0.15.1 // indirect
6363
github.com/spf13/cobra v1.8.1 // indirect
6464
github.com/spf13/pflag v1.0.5 // indirect
65-
github.com/stoewer/go-strcase v1.2.0 // indirect
65+
github.com/stoewer/go-strcase v1.3.0 // indirect
6666
github.com/x448/float16 v0.8.4 // indirect
6767
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
6868
go.opentelemetry.io/otel v1.29.0 // indirect
@@ -72,33 +72,33 @@ require (
7272
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
7373
go.opentelemetry.io/otel/trace v1.29.0 // indirect
7474
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
75+
go.uber.org/automaxprocs v1.6.0 // indirect
7576
go.uber.org/multierr v1.11.0 // indirect
76-
go.uber.org/zap v1.26.0 // indirect
77-
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect
78-
golang.org/x/net v0.30.0 // indirect
77+
go.uber.org/zap v1.27.0 // indirect
78+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
79+
golang.org/x/net v0.37.0 // indirect
7980
golang.org/x/oauth2 v0.23.0 // indirect
80-
golang.org/x/sync v0.10.0 // indirect
81-
golang.org/x/sys v0.28.0 // indirect
82-
golang.org/x/term v0.27.0 // indirect
83-
golang.org/x/text v0.21.0 // indirect
81+
golang.org/x/sync v0.12.0 // indirect
82+
golang.org/x/sys v0.32.0 // indirect
83+
golang.org/x/term v0.30.0 // indirect
84+
golang.org/x/text v0.23.0 // indirect
8485
golang.org/x/time v0.7.0 // indirect
85-
golang.org/x/tools v0.24.0 // indirect
86+
golang.org/x/tools v0.31.0 // indirect
8687
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
87-
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
88+
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
8889
google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect
8990
google.golang.org/grpc v1.67.1 // indirect
9091
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
9192
gopkg.in/inf.v0 v0.9.1 // indirect
92-
gopkg.in/yaml.v2 v2.4.0 // indirect
9393
gopkg.in/yaml.v3 v3.0.1 // indirect
94-
k8s.io/apiextensions-apiserver v0.31.1 // indirect
95-
k8s.io/apiserver v0.31.1 // indirect
96-
k8s.io/component-base v0.31.1 // indirect
94+
k8s.io/apiextensions-apiserver v0.32.1 // indirect
95+
k8s.io/apiserver v0.32.1 // indirect
96+
k8s.io/component-base v0.32.1 // indirect
9797
k8s.io/klog/v2 v2.130.1 // indirect
98-
k8s.io/kube-openapi v0.0.0-20240423202451-8948a665c108 // indirect
99-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
100-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
101-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
102-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
98+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
99+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
100+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
101+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
102+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
103103
sigs.k8s.io/yaml v1.4.0 // indirect
104104
)

0 commit comments

Comments
 (0)