Skip to content

Commit 85de0f3

Browse files
dependencies: Update go dependencies (#1552)
Signed-off-by: Marco Franssen <[email protected]>
1 parent 7621714 commit 85de0f3

File tree

7 files changed

+142
-196
lines changed

7 files changed

+142
-196
lines changed

.github/workflows/main.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797

9898
- name: Install dependences
9999
run: |
100-
command -v ginkgo || go install github.com/onsi/ginkgo/ginkgo@latest
100+
command -v ginkgo || go install github.com/onsi/ginkgo/v2/ginkgo@latest
101101
go install sigs.k8s.io/[email protected]
102102
curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.25.1/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl
103103
@@ -124,7 +124,7 @@ jobs:
124124

125125
- name: Install dependences
126126
run: |
127-
command -v ginkgo || go install github.com/onsi/ginkgo/ginkgo@latest
127+
command -v ginkgo || go install github.com/onsi/ginkgo/v2/ginkgo@latest
128128
go install sigs.k8s.io/[email protected]
129129
curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.25.1/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl
130130

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,20 +161,20 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
161161

162162
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
163163
controller-gen: go-deps ## Download controller-gen locally if necessary.
164-
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.15.0)
164+
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.17.3)
165165

166166
GINKGO = $(shell pwd)/bin/ginkgo
167167
ginkgo: go-deps ## Download controller-gen locally if necessary.
168-
$(call go-get-tool,$(GINKGO),github.com/onsi/ginkgo/ginkgo@v1.16.5)
168+
$(call go-get-tool,$(GINKGO),github.com/onsi/ginkgo/v2/ginkgo@v2.23.4)
169169

170170

171171
KUSTOMIZE = $(shell pwd)/bin/kustomize
172172
kustomize: go-deps ## Download kustomize locally if necessary.
173-
$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v5@v5.0.0)
173+
$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v5@v5.6.0)
174174

175-
CODE_GENERATOR = $(shell go env GOPATH)/pkg/mod/k8s.io/code-generator@v0.30.3
175+
CODE_GENERATOR = $(shell go env GOPATH)/pkg/mod/k8s.io/code-generator@v0.32.3
176176
code-generator: go-deps ## Download code-generator locally if necessary
177-
$(call go-get-tool,$(CODE_GENERATOR),k8s.io/code-generator@v0.30.3)
177+
$(call go-get-tool,$(CODE_GENERATOR),k8s.io/code-generator@v0.32.3)
178178

179179
# go-get-tool will 'go get' any package $2 and install it to $1.
180180
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))

controllers/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"path/filepath"
2121
"testing"
2222

23-
. "github.com/onsi/ginkgo"
23+
. "github.com/onsi/ginkgo/v2"
2424
. "github.com/onsi/gomega"
2525
"k8s.io/client-go/kubernetes/scheme"
2626
"sigs.k8s.io/controller-runtime/pkg/client"

go.mod

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3,77 +3,77 @@ module github.com/fluent/fluent-operator/v3
33
go 1.24.1
44

55
require (
6-
github.com/fsnotify/fsnotify v1.8.0
6+
github.com/fsnotify/fsnotify v1.9.0
77
github.com/go-kit/kit v0.13.0
88
github.com/go-kit/log v0.2.1
99
github.com/go-logr/logr v1.4.2
10-
github.com/go-openapi/errors v0.22.0
10+
github.com/go-openapi/errors v0.22.1
1111
github.com/joho/godotenv v1.5.1
1212
github.com/oklog/run v1.1.0
13-
github.com/onsi/ginkgo v1.16.5
14-
github.com/onsi/gomega v1.36.3
15-
golang.org/x/sync v0.12.0
13+
github.com/onsi/ginkgo/v2 v2.23.4
14+
github.com/onsi/gomega v1.37.0
15+
golang.org/x/sync v0.13.0
1616
k8s.io/api v0.30.3
1717
k8s.io/apimachinery v0.30.3
1818
k8s.io/client-go v0.30.3
1919
k8s.io/klog/v2 v2.130.1
20-
sigs.k8s.io/controller-runtime v0.18.5
20+
sigs.k8s.io/controller-runtime v0.18.7
2121
sigs.k8s.io/yaml v1.4.0
2222
)
2323

2424
require (
2525
github.com/beorn7/perks v1.0.1 // indirect
26-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
27-
github.com/davecgh/go-spew v1.1.1 // indirect
28-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
26+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
27+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
28+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
2929
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
30-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
30+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
3131
github.com/go-logfmt/logfmt v0.5.1 // indirect
3232
github.com/go-logr/zapr v1.3.0 // indirect
33-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
34-
github.com/go-openapi/jsonreference v0.20.2 // indirect
35-
github.com/go-openapi/swag v0.22.3 // indirect
33+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
34+
github.com/go-openapi/jsonreference v0.21.0 // indirect
35+
github.com/go-openapi/swag v0.23.1 // indirect
36+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
3637
github.com/gogo/protobuf v1.3.2 // indirect
3738
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3839
github.com/golang/protobuf v1.5.4 // indirect
39-
github.com/google/gnostic-models v0.6.8 // indirect
40+
github.com/google/gnostic-models v0.6.9 // indirect
4041
github.com/google/go-cmp v0.7.0 // indirect
4142
github.com/google/gofuzz v1.2.0 // indirect
42-
github.com/google/uuid v1.3.0 // indirect
43-
github.com/imdario/mergo v0.3.12 // indirect
43+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
44+
github.com/google/uuid v1.6.0 // indirect
45+
github.com/imdario/mergo v0.3.6 // indirect
4446
github.com/josharian/intern v1.0.0 // indirect
4547
github.com/json-iterator/go v1.1.12 // indirect
46-
github.com/mailru/easyjson v0.7.7 // indirect
47-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
48+
github.com/mailru/easyjson v0.9.0 // indirect
4849
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4950
github.com/modern-go/reflect2 v1.0.2 // indirect
5051
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
51-
github.com/nxadm/tail v1.4.8 // indirect
5252
github.com/pkg/errors v0.9.1 // indirect
53-
github.com/prometheus/client_golang v1.16.0 // indirect
54-
github.com/prometheus/client_model v0.4.0 // indirect
55-
github.com/prometheus/common v0.44.0 // indirect
56-
github.com/prometheus/procfs v0.12.0 // indirect
57-
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.1 // indirect
55+
github.com/prometheus/common v0.63.0 // indirect
56+
github.com/prometheus/procfs v0.16.0 // indirect
57+
github.com/spf13/pflag v1.0.6 // indirect
58+
go.uber.org/automaxprocs v1.6.0 // indirect
5859
go.uber.org/multierr v1.11.0 // indirect
59-
go.uber.org/zap v1.26.0 // indirect
60+
go.uber.org/zap v1.27.0 // indirect
6061
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
61-
golang.org/x/net v0.37.0 // indirect
62-
golang.org/x/oauth2 v0.12.0 // indirect
63-
golang.org/x/sys v0.31.0 // indirect
64-
golang.org/x/term v0.30.0 // indirect
65-
golang.org/x/text v0.23.0 // indirect
66-
golang.org/x/time v0.3.0 // indirect
67-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
68-
google.golang.org/appengine v1.6.7 // indirect
69-
google.golang.org/protobuf v1.36.5 // indirect
62+
golang.org/x/net v0.39.0 // indirect
63+
golang.org/x/oauth2 v0.29.0 // indirect
64+
golang.org/x/sys v0.32.0 // indirect
65+
golang.org/x/term v0.31.0 // indirect
66+
golang.org/x/text v0.24.0 // indirect
67+
golang.org/x/time v0.11.0 // indirect
68+
golang.org/x/tools v0.32.0 // indirect
69+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
70+
google.golang.org/protobuf v1.36.6 // indirect
7071
gopkg.in/inf.v0 v0.9.1 // indirect
71-
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
72-
gopkg.in/yaml.v2 v2.4.0 // indirect
7372
gopkg.in/yaml.v3 v3.0.1 // indirect
74-
k8s.io/apiextensions-apiserver v0.30.1 // indirect
75-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
76-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
77-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
78-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
73+
k8s.io/apiextensions-apiserver v0.30.3 // indirect
74+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
75+
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect
76+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
77+
sigs.k8s.io/randfill v1.0.0 // indirect
78+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
7979
)

0 commit comments

Comments
 (0)