Skip to content

Commit f50e197

Browse files
committed
Regenerate go.mod indirect dependencies
During the golang version bump we unintentionally introduced a too new indirect dependency on kube-openapi: k8s.io/[email protected] This is not required by any of our direct deps and this is also a version that required golang 1.21. If your system has golang 1.21 installed the this dependency might force go mod tidy to change the golang version in the go.mod file to 1.21. This patch removed all the indirect dependencies and let go mod tidy to regenerate them to get rid of the too new kube-openapi version.
1 parent 0d4f1ec commit f50e197

File tree

5 files changed

+295
-226
lines changed

5 files changed

+295
-226
lines changed

api/go.mod

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,72 +3,75 @@ module github.com/openstack-k8s-operators/telemetry-operator/api
33
go 1.20
44

55
require (
6-
github.com/onsi/ginkgo/v2 v2.14.0
7-
github.com/onsi/gomega v1.30.0
8-
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240218132212-ad757a2f5bab
9-
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240216173409-86913e6d5885
6+
github.com/onsi/ginkgo/v2 v2.15.0
7+
github.com/onsi/gomega v1.31.1
8+
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240221083751-49edc0df8a12
9+
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240224182407-3b6c02b195f6
1010
github.com/rhobs/observability-operator v0.0.20
11-
k8s.io/api v0.28.3
12-
k8s.io/apimachinery v0.28.3
13-
k8s.io/client-go v0.28.3
11+
k8s.io/api v0.28.7
12+
k8s.io/apimachinery v0.28.7
13+
k8s.io/client-go v0.28.7
1414
sigs.k8s.io/controller-runtime v0.16.5
1515
)
1616

1717
require (
1818
github.com/beorn7/perks v1.0.1 // indirect
1919
github.com/cespare/xxhash/v2 v2.2.0 // indirect
20-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
21-
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
22-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
23-
github.com/fsnotify/fsnotify v1.7.0 // indirect
20+
github.com/davecgh/go-spew v1.1.1 // indirect
21+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
22+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
23+
github.com/fsnotify/fsnotify v1.6.0 // indirect
2424
github.com/go-logr/logr v1.4.1 // indirect
25-
github.com/go-logr/zapr v1.3.0 // indirect
26-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
27-
github.com/go-openapi/jsonreference v0.20.4 // indirect
28-
github.com/go-openapi/swag v0.22.9 // indirect
25+
github.com/go-logr/zapr v1.2.4 // indirect
26+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
27+
github.com/go-openapi/jsonreference v0.20.2 // indirect
28+
github.com/go-openapi/swag v0.22.3 // indirect
2929
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
3030
github.com/gogo/protobuf v1.3.2 // indirect
3131
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3232
github.com/golang/protobuf v1.5.3 // indirect
3333
github.com/google/gnostic-models v0.6.8 // indirect
3434
github.com/google/go-cmp v0.6.0 // indirect
3535
github.com/google/gofuzz v1.2.0 // indirect
36-
github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3 // indirect
36+
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
3737
github.com/google/uuid v1.6.0 // indirect
3838
github.com/imdario/mergo v0.3.16 // indirect
3939
github.com/josharian/intern v1.0.0 // indirect
4040
github.com/json-iterator/go v1.1.12 // indirect
4141
github.com/mailru/easyjson v0.7.7 // indirect
42+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
4243
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4344
github.com/modern-go/reflect2 v1.0.2 // indirect
4445
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4546
github.com/pkg/errors v0.9.1 // indirect
46-
github.com/prometheus/client_golang v1.18.0 // indirect
47-
github.com/prometheus/client_model v0.5.0 // indirect
48-
github.com/prometheus/common v0.46.0 // indirect
49-
github.com/prometheus/procfs v0.12.0 // indirect
47+
github.com/prometheus/client_golang v1.16.0 // indirect
48+
github.com/prometheus/client_model v0.4.0 // indirect
49+
github.com/prometheus/common v0.44.0 // indirect
50+
github.com/prometheus/procfs v0.10.1 // indirect
5051
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.64.1-rhobs3 // indirect
52+
github.com/rogpeppe/go-internal v1.11.0 // indirect
5153
github.com/spf13/pflag v1.0.5 // indirect
54+
github.com/stretchr/testify v1.8.4 // indirect
5255
go.uber.org/multierr v1.11.0 // indirect
53-
go.uber.org/zap v1.26.0 // indirect
56+
go.uber.org/zap v1.27.0 // indirect
5457
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
5558
golang.org/x/net v0.21.0 // indirect
56-
golang.org/x/oauth2 v0.17.0 // indirect
59+
golang.org/x/oauth2 v0.8.0 // indirect
5760
golang.org/x/sys v0.17.0 // indirect
5861
golang.org/x/term v0.17.0 // indirect
5962
golang.org/x/text v0.14.0 // indirect
60-
golang.org/x/time v0.5.0 // indirect
63+
golang.org/x/time v0.3.0 // indirect
6164
golang.org/x/tools v0.18.0 // indirect
6265
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
63-
google.golang.org/appengine v1.6.8 // indirect
64-
google.golang.org/protobuf v1.32.0 // indirect
66+
google.golang.org/appengine v1.6.7 // indirect
67+
google.golang.org/protobuf v1.31.0 // indirect
6568
gopkg.in/inf.v0 v0.9.1 // indirect
6669
gopkg.in/yaml.v2 v2.4.0 // indirect
6770
gopkg.in/yaml.v3 v3.0.1 // indirect
68-
k8s.io/apiextensions-apiserver v0.28.3 // indirect
69-
k8s.io/component-base v0.28.3 // indirect
70-
k8s.io/klog/v2 v2.120.1 // indirect
71-
k8s.io/kube-openapi v0.0.0-20240209001042-7a0d5b415232 // indirect
71+
k8s.io/apiextensions-apiserver v0.28.7 // indirect
72+
k8s.io/component-base v0.28.7 // indirect
73+
k8s.io/klog/v2 v2.110.1 // indirect
74+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
7275
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
7376
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
7477
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

0 commit comments

Comments
 (0)