Skip to content

Commit 20cdb0e

Browse files
3scale-robot3scale-robot
authored
Merge pull request #18 from 3scale-ops/upgrade-libs
Upgrade libs and go
2 parents a5195d1 + 955d3e2 commit 20cdb0e

File tree

8 files changed

+145
-153
lines changed

8 files changed

+145
-153
lines changed

‎.github/workflows/test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup Go
1717
uses: actions/setup-go@v5
1818
with:
19-
go-version: "1.20"
19+
go-version: "1.24"
2020

2121
- uses: actions/cache@v4
2222
with:

‎Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
2-
ENVTEST_K8S_VERSION = 1.27
2+
ENVTEST_K8S_VERSION = 1.31.0
33

44
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
55
ifeq (,$(shell go env GOBIN))
@@ -74,9 +74,9 @@ KIND ?= $(LOCALBIN)/kind
7474
GOBINDATA ?= $(LOCALBIN)/go-bindata
7575

7676
## Tool Versions
77-
CONTROLLER_TOOLS_VERSION ?= v0.14.0
78-
GINKGO_VERSION ?= v2.14.0
79-
ENVTEST_VERSION ?= release-0.17
77+
CONTROLLER_TOOLS_VERSION ?= v0.17.1
78+
GINKGO_VERSION ?= v2.22.2
79+
ENVTEST_VERSION ?= release-0.20
8080

8181
.PHONY: controller-gen
8282
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.

‎bin/controller-gen

3.38 MB
Binary file not shown.

‎go.mod

+42-44
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,75 @@
11
module github.com/3scale-ops/basereconciler
22

3-
go 1.20
3+
go 1.24
44

55
require (
6-
github.com/davecgh/go-spew v1.1.1
7-
github.com/go-logr/logr v1.4.1
6+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
7+
github.com/go-logr/logr v1.4.2
88
github.com/google/go-cmp v0.6.0
99
github.com/goombaio/namegenerator v0.0.0-20181006234301-989e774b106e
1010
github.com/nsf/jsondiff v0.0.0-20230430225905-43f6cf3098c1
11-
github.com/ohler55/ojg v1.20.3
12-
github.com/onsi/ginkgo/v2 v2.14.0
13-
github.com/onsi/gomega v1.30.0
14-
k8s.io/api v0.29.2
15-
k8s.io/apimachinery v0.29.2
16-
k8s.io/client-go v0.29.2
17-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
18-
sigs.k8s.io/controller-runtime v0.17.2
11+
github.com/ohler55/ojg v1.26.1
12+
github.com/onsi/ginkgo/v2 v2.22.2
13+
github.com/onsi/gomega v1.36.2
14+
k8s.io/api v0.32.2
15+
k8s.io/apimachinery v0.32.2
16+
k8s.io/client-go v0.32.2
17+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
18+
sigs.k8s.io/controller-runtime v0.20.2
1919
)
2020

2121
require (
2222
github.com/beorn7/perks v1.0.1 // indirect
23-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
23+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2424
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
2525
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
26-
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
26+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
2727
github.com/fsnotify/fsnotify v1.7.0 // indirect
28+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
2829
github.com/go-logr/zapr v1.3.0 // indirect
29-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
30+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
3031
github.com/go-openapi/jsonreference v0.20.2 // indirect
31-
github.com/go-openapi/swag v0.22.3 // indirect
32-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
32+
github.com/go-openapi/swag v0.23.0 // indirect
33+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
3334
github.com/gogo/protobuf v1.3.2 // indirect
34-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
35-
github.com/golang/protobuf v1.5.3 // indirect
35+
github.com/golang/protobuf v1.5.4 // indirect
36+
github.com/google/btree v1.1.3 // indirect
3637
github.com/google/gnostic-models v0.6.8 // indirect
3738
github.com/google/gofuzz v1.2.0 // indirect
38-
github.com/google/pprof v0.0.0-20230309165930-d61513b1440d // indirect
39-
github.com/google/uuid v1.3.0 // indirect
40-
github.com/imdario/mergo v0.3.13 // indirect
39+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
40+
github.com/google/uuid v1.6.0 // indirect
4141
github.com/josharian/intern v1.0.0 // indirect
4242
github.com/json-iterator/go v1.1.12 // indirect
4343
github.com/mailru/easyjson v0.7.7 // indirect
44-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
4544
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4645
github.com/modern-go/reflect2 v1.0.2 // indirect
4746
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4847
github.com/pkg/errors v0.9.1 // indirect
49-
github.com/prometheus/client_golang v1.18.0 // indirect
50-
github.com/prometheus/client_model v0.5.0 // indirect
51-
github.com/prometheus/common v0.45.0 // indirect
52-
github.com/prometheus/procfs v0.12.0 // indirect
48+
github.com/prometheus/client_golang v1.19.1 // indirect
49+
github.com/prometheus/client_model v0.6.1 // indirect
50+
github.com/prometheus/common v0.55.0 // indirect
51+
github.com/prometheus/procfs v0.15.1 // indirect
5352
github.com/spf13/pflag v1.0.5 // indirect
53+
github.com/x448/float16 v0.8.4 // indirect
5454
go.uber.org/multierr v1.11.0 // indirect
55-
go.uber.org/zap v1.26.0 // indirect
56-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
57-
golang.org/x/net v0.19.0 // indirect
58-
golang.org/x/oauth2 v0.12.0 // indirect
59-
golang.org/x/sys v0.16.0 // indirect
60-
golang.org/x/term v0.15.0 // indirect
61-
golang.org/x/text v0.14.0 // indirect
62-
golang.org/x/time v0.3.0 // indirect
63-
golang.org/x/tools v0.16.1 // indirect
55+
go.uber.org/zap v1.27.0 // indirect
56+
golang.org/x/net v0.33.0 // indirect
57+
golang.org/x/oauth2 v0.23.0 // indirect
58+
golang.org/x/sync v0.10.0 // indirect
59+
golang.org/x/sys v0.28.0 // indirect
60+
golang.org/x/term v0.27.0 // indirect
61+
golang.org/x/text v0.21.0 // indirect
62+
golang.org/x/time v0.7.0 // indirect
63+
golang.org/x/tools v0.28.0 // indirect
6464
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
65-
google.golang.org/appengine v1.6.7 // indirect
66-
google.golang.org/protobuf v1.33.0 // indirect
65+
google.golang.org/protobuf v1.36.1 // indirect
66+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
6767
gopkg.in/inf.v0 v0.9.1 // indirect
68-
gopkg.in/yaml.v2 v2.4.0 // indirect
6968
gopkg.in/yaml.v3 v3.0.1 // indirect
70-
k8s.io/apiextensions-apiserver v0.29.0 // indirect
71-
k8s.io/component-base v0.29.0 // indirect
72-
k8s.io/klog/v2 v2.110.1 // indirect
73-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
74-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
75-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
69+
k8s.io/apiextensions-apiserver v0.32.1 // indirect
70+
k8s.io/klog/v2 v2.130.1 // indirect
71+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
72+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
73+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
7674
sigs.k8s.io/yaml v1.4.0 // indirect
7775
)

0 commit comments

Comments
 (0)