Skip to content

Commit df14886

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 a7f62ba commit df14886

File tree

4 files changed

+189
-155
lines changed

4 files changed

+189
-155
lines changed

api/go.mod

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,71 +5,68 @@ go 1.20
55
require (
66
github.com/go-logr/logr v1.4.1
77
github.com/google/uuid v1.6.0
8+
github.com/gophercloud/gophercloud v1.9.0
89
github.com/onsi/gomega v1.30.0
910
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240216173409-86913e6d5885
1011
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240216173409-86913e6d5885
1112
github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20240216173409-86913e6d5885
13+
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a
1214
k8s.io/api v0.28.3
1315
k8s.io/apimachinery v0.28.3
1416
sigs.k8s.io/controller-runtime v0.16.4
1517
)
1618

17-
require (
18-
github.com/go-logr/zapr v1.3.0 // indirect
19-
github.com/google/gnostic-models v0.6.8 // indirect
20-
)
21-
2219
require (
2320
github.com/beorn7/perks v1.0.1 // indirect
2421
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2522
github.com/davecgh/go-spew v1.1.1 // indirect
26-
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
27-
github.com/evanphx/json-patch/v5 v5.9.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
23+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
24+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
25+
github.com/fsnotify/fsnotify v1.6.0 // 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
3229
github.com/gogo/protobuf v1.3.2 // indirect
3330
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3431
github.com/golang/protobuf v1.5.3 // indirect
32+
github.com/google/gnostic-models v0.6.8 // indirect
3533
github.com/google/go-cmp v0.6.0 // indirect
3634
github.com/google/gofuzz v1.2.0 // indirect
37-
github.com/gophercloud/gophercloud v1.9.0
3835
github.com/imdario/mergo v0.3.16 // indirect
3936
github.com/josharian/intern v1.0.0 // indirect
4037
github.com/json-iterator/go v1.1.12 // indirect
4138
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.4.0 // indirect
4239
github.com/mailru/easyjson v0.7.7 // indirect
40+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
4341
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4442
github.com/modern-go/reflect2 v1.0.2 // indirect
4543
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4644
github.com/openshift/api v3.9.0+incompatible // indirect
4745
github.com/pkg/errors v0.9.1 // indirect
48-
github.com/prometheus/client_golang v1.18.0 // indirect
49-
github.com/prometheus/client_model v0.5.0 // indirect
50-
github.com/prometheus/common v0.46.0 // indirect
51-
github.com/prometheus/procfs v0.12.0 // indirect
46+
github.com/prometheus/client_golang v1.16.0 // indirect
47+
github.com/prometheus/client_model v0.4.0 // indirect
48+
github.com/prometheus/common v0.44.0 // indirect
49+
github.com/prometheus/procfs v0.10.1 // indirect
5250
github.com/spf13/pflag v1.0.5 // indirect
53-
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a
5451
golang.org/x/net v0.21.0 // indirect
55-
golang.org/x/oauth2 v0.17.0 // indirect
52+
golang.org/x/oauth2 v0.8.0 // indirect
5653
golang.org/x/sys v0.17.0 // indirect
5754
golang.org/x/term v0.17.0 // indirect
5855
golang.org/x/text v0.14.0 // indirect
59-
golang.org/x/time v0.5.0 // indirect
56+
golang.org/x/time v0.3.0 // indirect
6057
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
61-
google.golang.org/appengine v1.6.8 // indirect
62-
google.golang.org/protobuf v1.32.0 // indirect
58+
google.golang.org/appengine v1.6.7 // indirect
59+
google.golang.org/protobuf v1.31.0 // indirect
6360
gopkg.in/inf.v0 v0.9.1 // indirect
6461
gopkg.in/yaml.v2 v2.4.0 // indirect
6562
gopkg.in/yaml.v3 v3.0.1 // indirect
66-
k8s.io/apiextensions-apiserver v0.28.3 // indirect; indirect // indirect
63+
k8s.io/apiextensions-apiserver v0.28.3 // indirect
6764
k8s.io/client-go v0.28.3 // indirect
68-
k8s.io/component-base v0.28.3 // indirect; indirect // indirect
69-
k8s.io/klog/v2 v2.120.1 // indirect
70-
k8s.io/kube-openapi v0.0.0-20240209001042-7a0d5b415232 // indirect; indirect // indirect
71-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect; indirect // indirect
72-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect; indirect // indirect
65+
k8s.io/component-base v0.28.3 // indirect
66+
k8s.io/klog/v2 v2.110.1 // indirect
67+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
68+
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
69+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
7370
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
7471
sigs.k8s.io/yaml v1.4.0 // indirect
7572
)

0 commit comments

Comments
 (0)