Skip to content

Commit 150f674

Browse files
committed
bump k8s to 1.29 and associated libraries
bump Go to 1.22 update tests to fix test failures Signed-off-by: everettraven <[email protected]>
1 parent 3bfabe0 commit 150f674

File tree

5 files changed

+224
-137
lines changed

5 files changed

+224
-137
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ fmtcheck: ## Check go formatting
2020
@gofmt -l $(SOURCES) | grep ".*\.go"; if [ "$$?" = "0" ]; then exit 1; fi
2121

2222
test: ## Run unit tests
23-
@go test -race -covermode atomic -coverprofile cover.out ./...
23+
@go test -timeout=60s -v -race -covermode atomic -coverprofile cover.out ./...
2424

2525
vet: ## Run go vet
2626
@go vet ./...

go.mod

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,44 @@
11
module github.com/operator-framework/operator-lib
22

3-
go 1.20
3+
go 1.22
4+
5+
toolchain go1.22.0
46

57
require (
68
github.com/go-logr/logr v1.4.1
79
github.com/onsi/ginkgo/v2 v2.17.1
810
github.com/onsi/gomega v1.32.0
9-
github.com/operator-framework/api v0.21.0
11+
github.com/operator-framework/api v0.23.0
1012
github.com/prometheus/client_golang v1.19.0
1113
github.com/prometheus/client_model v0.6.1
12-
k8s.io/api v0.28.5
13-
k8s.io/apimachinery v0.28.5
14-
k8s.io/client-go v0.28.5
15-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
16-
sigs.k8s.io/controller-runtime v0.16.3
14+
k8s.io/api v0.29.3
15+
k8s.io/apimachinery v0.29.3
16+
k8s.io/client-go v0.29.3
17+
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
18+
sigs.k8s.io/controller-runtime v0.17.3
1719
)
1820

1921
require (
2022
github.com/beorn7/perks v1.0.1 // indirect
2123
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2224
github.com/davecgh/go-spew v1.1.1 // indirect
23-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
25+
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
2426
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
25-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
26-
github.com/fsnotify/fsnotify v1.6.0 // indirect
27-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
28-
github.com/go-openapi/jsonreference v0.20.2 // indirect
29-
github.com/go-openapi/swag v0.22.3 // indirect
27+
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
28+
github.com/fsnotify/fsnotify v1.7.0 // indirect
29+
github.com/go-openapi/jsonpointer v0.20.2 // indirect
30+
github.com/go-openapi/jsonreference v0.20.4 // indirect
31+
github.com/go-openapi/swag v0.22.9 // indirect
3032
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
3133
github.com/gogo/protobuf v1.3.2 // indirect
3234
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
33-
github.com/golang/protobuf v1.5.3 // indirect
35+
github.com/golang/protobuf v1.5.4 // indirect
3436
github.com/google/gnostic-models v0.6.8 // indirect
3537
github.com/google/go-cmp v0.6.0 // indirect
3638
github.com/google/gofuzz v1.2.0 // indirect
3739
github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3 // indirect
38-
github.com/google/uuid v1.3.1 // indirect
39-
github.com/imdario/mergo v0.3.12 // indirect
40+
github.com/google/uuid v1.6.0 // indirect
41+
github.com/imdario/mergo v0.3.16 // indirect
4042
github.com/josharian/intern v1.0.0 // indirect
4143
github.com/json-iterator/go v1.1.12 // indirect
4244
github.com/mailru/easyjson v0.7.7 // indirect
@@ -47,25 +49,25 @@ require (
4749
github.com/prometheus/common v0.48.0 // indirect
4850
github.com/prometheus/procfs v0.12.0 // indirect
4951
github.com/spf13/pflag v1.0.5 // indirect
50-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
51-
golang.org/x/net v0.20.0 // indirect
52-
golang.org/x/oauth2 v0.16.0 // indirect
53-
golang.org/x/sys v0.16.0 // indirect
54-
golang.org/x/term v0.16.0 // indirect
52+
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
53+
golang.org/x/net v0.21.0 // indirect
54+
golang.org/x/oauth2 v0.17.0 // indirect
55+
golang.org/x/sys v0.17.0 // indirect
56+
golang.org/x/term v0.17.0 // indirect
5557
golang.org/x/text v0.14.0 // indirect
56-
golang.org/x/time v0.3.0 // indirect
57-
golang.org/x/tools v0.17.0 // indirect
58+
golang.org/x/time v0.5.0 // indirect
59+
golang.org/x/tools v0.18.0 // indirect
5860
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
59-
google.golang.org/appengine v1.6.7 // indirect
61+
google.golang.org/appengine v1.6.8 // indirect
6062
google.golang.org/protobuf v1.33.0 // indirect
6163
gopkg.in/inf.v0 v0.9.1 // indirect
6264
gopkg.in/yaml.v2 v2.4.0 // indirect
6365
gopkg.in/yaml.v3 v3.0.1 // indirect
64-
k8s.io/apiextensions-apiserver v0.28.5 // indirect
65-
k8s.io/component-base v0.28.5 // indirect
66-
k8s.io/klog/v2 v2.100.1 // indirect
67-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
66+
k8s.io/apiextensions-apiserver v0.29.2 // indirect
67+
k8s.io/component-base v0.29.2 // indirect
68+
k8s.io/klog/v2 v2.120.1 // indirect
69+
k8s.io/kube-openapi v0.0.0-20240221221325-2ac9dc51f3f1 // indirect
6870
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
69-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
70-
sigs.k8s.io/yaml v1.3.0 // indirect
71+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
72+
sigs.k8s.io/yaml v1.4.0 // indirect
7173
)

0 commit comments

Comments
 (0)