Skip to content

Commit 2d7f2f2

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. Also some service operators pulled in k8s.io version 0.29 which also golang 1.21. Since then this was fixed the service operators and now downgraded here as well.
1 parent c525518 commit 2d7f2f2

File tree

6 files changed

+466
-956
lines changed

6 files changed

+466
-956
lines changed

apis/bases/core.openstack.org_openstackcontrolplanes.yaml

Lines changed: 96 additions & 366 deletions
Large diffs are not rendered by default.

apis/go.mod

Lines changed: 40 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@ require (
88
github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240226165142-cb4e05f187dc
99
github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240301180431-f14a9a6de626
1010
github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240227172900-6b5267549089
11-
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240228075535-ca3432cb65c2
11+
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240305193305-4e4efb5c197a
1212
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240229065949-dc7919e45441
1313
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240227193241-8c506107e152
1414
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240221083751-49edc0df8a12
1515
github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240229174131-28e3aee56d91
1616
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240226160457-b1b853eb4600
1717
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240229121803-169ced56d56e
18-
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240228192101-00bb019bd68b
18+
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240229121803-169ced56d56e
19+
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240305194401-0fda28a84acb
1920
github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240222094307-76fef735f093
2021
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240301125628-fe5c58abe3d0
2122
github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240229155106-17a899255ec6
@@ -25,81 +26,77 @@ require (
2526
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240301170116-13941759ec79
2627
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240301135657-444ba309cbb5
2728
github.com/rabbitmq/cluster-operator/v2 v2.6.0
28-
k8s.io/apimachinery v0.29.0
29+
k8s.io/api v0.28.7
30+
k8s.io/apimachinery v0.28.7
31+
k8s.io/client-go v0.28.7
2932
sigs.k8s.io/controller-runtime v0.16.5
30-
)
3133

32-
require (
33-
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
34-
github.com/go-logr/zapr v1.3.0 // indirect
35-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
36-
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
37-
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 // indirect
38-
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
39-
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.64.1-rhobs3 // indirect
40-
github.com/rhobs/observability-operator v0.0.20 // indirect
41-
github.com/robfig/cron/v3 v3.0.1 // indirect
42-
github.com/rogpeppe/go-internal v1.12.0 // indirect
43-
go.uber.org/multierr v1.11.0 // indirect
44-
go.uber.org/zap v1.27.0 // indirect
45-
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
46-
golang.org/x/tools v0.18.0 // indirect
4734
)
4835

4936
require (
5037
github.com/beorn7/perks v1.0.1 // indirect
5138
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5239
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
53-
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
54-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
40+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
41+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
5542
github.com/fsnotify/fsnotify v1.7.0 // indirect
5643
github.com/go-logr/logr v1.4.1 // indirect
57-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
58-
github.com/go-openapi/jsonreference v0.20.4 // indirect
59-
github.com/go-openapi/swag v0.22.9 // indirect
44+
github.com/go-logr/zapr v1.2.4 // indirect
45+
github.com/go-openapi/jsonpointer v0.20.0 // indirect
46+
github.com/go-openapi/jsonreference v0.20.2 // indirect
47+
github.com/go-openapi/swag v0.22.4 // indirect
48+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
6049
github.com/gogo/protobuf v1.3.2 // indirect
6150
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6251
github.com/golang/protobuf v1.5.3 // indirect
52+
github.com/google/gnostic-models v0.6.8 // indirect
6353
github.com/google/go-cmp v0.6.0 // indirect
6454
github.com/google/gofuzz v1.2.0 // indirect
55+
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 // indirect
6556
github.com/google/uuid v1.6.0 // indirect
66-
github.com/gophercloud/gophercloud v1.9.0 // indirect
57+
github.com/gophercloud/gophercloud v1.10.0 // indirect
6758
github.com/imdario/mergo v0.3.16 // indirect
6859
github.com/josharian/intern v1.0.0 // indirect
6960
github.com/json-iterator/go v1.1.12 // indirect
7061
github.com/mailru/easyjson v0.7.7 // indirect
62+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
7163
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7264
github.com/modern-go/reflect2 v1.0.2 // indirect
7365
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7466
github.com/openshift/api v3.9.0+incompatible // indirect
75-
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240229121803-169ced56d56e //indirect
76-
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240229121803-169ced56d56e
67+
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240229121803-169ced56d56e // indirect
7768
github.com/pkg/errors v0.9.1 // indirect
78-
github.com/prometheus/client_golang v1.18.0 // indirect
79-
github.com/prometheus/client_model v0.5.0 // indirect
80-
github.com/prometheus/common v0.46.0 // indirect
81-
github.com/prometheus/procfs v0.12.0 // indirect
69+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
70+
github.com/prometheus/client_golang v1.16.0 // indirect
71+
github.com/prometheus/client_model v0.4.0 // indirect
72+
github.com/prometheus/common v0.44.0 // indirect
73+
github.com/prometheus/procfs v0.10.1 // indirect
74+
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.64.1-rhobs3 // indirect
75+
github.com/rhobs/observability-operator v0.0.20 // indirect
76+
github.com/robfig/cron/v3 v3.0.1 // indirect
8277
github.com/spf13/pflag v1.0.5 // indirect
78+
go.uber.org/multierr v1.11.0 // indirect
79+
go.uber.org/zap v1.27.0 // indirect
80+
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
8381
golang.org/x/net v0.21.0 // indirect
84-
golang.org/x/oauth2 v0.17.0 // indirect
82+
golang.org/x/oauth2 v0.12.0 // indirect
8583
golang.org/x/sys v0.17.0 // indirect
8684
golang.org/x/term v0.17.0 // indirect
8785
golang.org/x/text v0.14.0 // indirect
88-
golang.org/x/time v0.5.0 // indirect
86+
golang.org/x/time v0.3.0 // indirect
87+
golang.org/x/tools v0.18.0 // indirect
8988
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
90-
google.golang.org/appengine v1.6.8 // indirect
91-
google.golang.org/protobuf v1.32.0 // indirect
89+
google.golang.org/appengine v1.6.7 // indirect
90+
google.golang.org/protobuf v1.31.0 // indirect
9291
gopkg.in/inf.v0 v0.9.1 // indirect
9392
gopkg.in/yaml.v2 v2.4.0 // indirect
9493
gopkg.in/yaml.v3 v3.0.1 // indirect
95-
k8s.io/api v0.29.0
96-
k8s.io/apiextensions-apiserver v0.29.0 //indirect
97-
k8s.io/client-go v0.29.0
98-
k8s.io/component-base v0.29.0 //indirect
99-
k8s.io/klog/v2 v2.120.1 // indirect
100-
k8s.io/kube-openapi v0.0.0-20240209001042-7a0d5b415232 //indirect
101-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e //indirect
102-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd //indirect
94+
k8s.io/apiextensions-apiserver v0.28.7 // indirect
95+
k8s.io/component-base v0.28.7 // indirect
96+
k8s.io/klog/v2 v2.110.1 // indirect
97+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
98+
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
99+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
103100
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
104101
sigs.k8s.io/yaml v1.4.0 // indirect
105102
)

0 commit comments

Comments
 (0)