Skip to content

Commit afe74a0

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #123 from p0lyn0mial/rebase-1.31
NO-JIRA: rebase 1.31
2 parents e83b5ad + 2efbce8 commit afe74a0

File tree

2,837 files changed

+175743
-98842
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,837 files changed

+175743
-98842
lines changed

‎go.mod

Lines changed: 101 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -11,156 +11,158 @@ require (
1111
github.com/google/gofuzz v1.2.0
1212
github.com/google/uuid v1.6.0
1313
github.com/jteeuwen/go-bindata v3.0.8-0.20151023091102-a0ff2567cfb7+incompatible
14-
github.com/openshift/api v0.0.0-20240809035623-d6942fb7294e
15-
github.com/openshift/apiserver-library-go v0.0.0-20240716092710-e88385a79b17
16-
github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52
17-
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87
18-
github.com/openshift/library-go v0.0.0-20240528102242-9c194599a149
19-
github.com/spf13/cobra v1.8.0
14+
github.com/openshift/api v0.0.0-20241104230711-4c27e61e5554
15+
github.com/openshift/apiserver-library-go v0.0.0-20241021160823-f6d544efa1ab
16+
github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660
17+
github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f
18+
github.com/openshift/library-go v0.0.0-20241104153602-864cc9d1d646
19+
github.com/spf13/cobra v1.8.1
2020
github.com/spf13/pflag v1.0.5
21-
github.com/stretchr/testify v1.8.4
22-
go.opentelemetry.io/otel/trace v1.19.0
23-
k8s.io/api v0.30.3
24-
k8s.io/apiextensions-apiserver v0.30.3
25-
k8s.io/apimachinery v0.30.3
26-
k8s.io/apiserver v0.30.3
27-
k8s.io/client-go v0.30.3
28-
k8s.io/code-generator v0.30.3
29-
k8s.io/component-base v0.30.3
30-
k8s.io/klog/v2 v2.120.1
31-
k8s.io/kube-aggregator v0.30.3
21+
github.com/stretchr/testify v1.9.0
22+
go.opentelemetry.io/otel/trace v1.28.0
23+
k8s.io/api v0.31.1
24+
k8s.io/apiextensions-apiserver v0.31.1
25+
k8s.io/apimachinery v0.31.1
26+
k8s.io/apiserver v0.31.1
27+
k8s.io/client-go v0.31.1
28+
k8s.io/code-generator v0.31.1
29+
k8s.io/component-base v0.31.1
30+
k8s.io/klog/v2 v2.130.1
31+
k8s.io/kube-aggregator v0.31.1
3232
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
33-
k8s.io/kubernetes v1.30.3
34-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
33+
k8s.io/kubernetes v1.31.1
34+
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6
3535
)
3636

3737
require (
3838
github.com/NYTimes/gziphandler v1.1.1 // indirect
39-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
39+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
4040
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
4141
github.com/beorn7/perks v1.0.1 // indirect
4242
github.com/blang/semver/v4 v4.0.0 // indirect
43-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
44-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
43+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
44+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4545
github.com/coreos/go-semver v0.3.1 // indirect
4646
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
47-
github.com/davecgh/go-spew v1.1.1 // indirect
47+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4848
github.com/dustin/go-humanize v1.0.1 // indirect
4949
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
50-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
51-
github.com/felixge/httpsnoop v1.0.3 // indirect
50+
github.com/felixge/fgprof v0.9.4 // indirect
51+
github.com/felixge/httpsnoop v1.0.4 // indirect
5252
github.com/fsnotify/fsnotify v1.7.0 // indirect
53-
github.com/go-logr/logr v1.4.1 // indirect
53+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
54+
github.com/go-logr/logr v1.4.2 // indirect
5455
github.com/go-logr/stdr v1.2.2 // indirect
5556
github.com/go-openapi/jsonpointer v0.19.6 // indirect
5657
github.com/go-openapi/jsonreference v0.20.2 // indirect
57-
github.com/go-openapi/swag v0.22.3 // indirect
58+
github.com/go-openapi/swag v0.22.4 // indirect
5859
github.com/gogo/protobuf v1.3.2 // indirect
5960
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
6061
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6162
github.com/golang/protobuf v1.5.4 // indirect
62-
github.com/google/cel-go v0.17.8 // indirect
63+
github.com/google/cel-go v0.20.1 // indirect
6364
github.com/google/gnostic-models v0.6.8 // indirect
65+
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
6466
github.com/gorilla/websocket v1.5.0 // indirect
6567
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
6668
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
6769
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
68-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
70+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
6971
github.com/imdario/mergo v0.3.7 // indirect
7072
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7173
github.com/jonboulle/clockwork v0.2.2 // indirect
7274
github.com/josharian/intern v1.0.0 // indirect
7375
github.com/json-iterator/go v1.1.12 // indirect
7476
github.com/mailru/easyjson v0.7.7 // indirect
75-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
7677
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7778
github.com/modern-go/reflect2 v1.0.2 // indirect
7879
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7980
github.com/pkg/errors v0.9.1 // indirect
80-
github.com/pkg/profile v1.3.0 // indirect
81-
github.com/pmezard/go-difflib v1.0.0 // indirect
82-
github.com/prometheus/client_golang v1.16.0 // indirect
83-
github.com/prometheus/client_model v0.4.0 // indirect
84-
github.com/prometheus/common v0.44.0 // indirect
85-
github.com/prometheus/procfs v0.10.1 // indirect
86-
github.com/sirupsen/logrus v1.9.0 // indirect
81+
github.com/pkg/profile v1.7.0 // indirect
82+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
83+
github.com/prometheus/client_golang v1.19.1 // indirect
84+
github.com/prometheus/client_model v0.6.1 // indirect
85+
github.com/prometheus/common v0.55.0 // indirect
86+
github.com/prometheus/procfs v0.15.1 // indirect
87+
github.com/sirupsen/logrus v1.9.3 // indirect
8788
github.com/soheilhy/cmux v0.1.5 // indirect
8889
github.com/stoewer/go-strcase v1.2.0 // indirect
8990
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 // indirect
91+
github.com/x448/float16 v0.8.4 // indirect
9092
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
91-
go.etcd.io/bbolt v1.3.8 // indirect
92-
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
93-
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
94-
go.etcd.io/etcd/client/v2 v2.305.10 // indirect
95-
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
96-
go.etcd.io/etcd/pkg/v3 v3.5.10 // indirect
97-
go.etcd.io/etcd/raft/v3 v3.5.10 // indirect
98-
go.etcd.io/etcd/server/v3 v3.5.10 // indirect
99-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
100-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
101-
go.opentelemetry.io/otel v1.19.0 // indirect
102-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
103-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
104-
go.opentelemetry.io/otel/metric v1.19.0 // indirect
105-
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
106-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
93+
go.etcd.io/bbolt v1.3.9 // indirect
94+
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
95+
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
96+
go.etcd.io/etcd/client/v2 v2.305.13 // indirect
97+
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
98+
go.etcd.io/etcd/pkg/v3 v3.5.13 // indirect
99+
go.etcd.io/etcd/raft/v3 v3.5.13 // indirect
100+
go.etcd.io/etcd/server/v3 v3.5.13 // indirect
101+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
102+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
103+
go.opentelemetry.io/otel v1.28.0 // indirect
104+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
105+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
106+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
107+
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
108+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
107109
go.uber.org/multierr v1.11.0 // indirect
108110
go.uber.org/zap v1.26.0 // indirect
109-
golang.org/x/crypto v0.22.0 // indirect
110-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
111-
golang.org/x/mod v0.15.0 // indirect
112-
golang.org/x/net v0.24.0 // indirect
113-
golang.org/x/oauth2 v0.10.0 // indirect
114-
golang.org/x/sync v0.6.0 // indirect
115-
golang.org/x/sys v0.19.0 // indirect
116-
golang.org/x/term v0.19.0 // indirect
117-
golang.org/x/text v0.14.0 // indirect
111+
golang.org/x/crypto v0.27.0 // indirect
112+
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
113+
golang.org/x/mod v0.17.0 // indirect
114+
golang.org/x/net v0.29.0 // indirect
115+
golang.org/x/oauth2 v0.21.0 // indirect
116+
golang.org/x/sync v0.8.0 // indirect
117+
golang.org/x/sys v0.25.0 // indirect
118+
golang.org/x/term v0.24.0 // indirect
119+
golang.org/x/text v0.18.0 // indirect
118120
golang.org/x/time v0.3.0 // indirect
119-
golang.org/x/tools v0.18.0 // indirect
120-
google.golang.org/appengine v1.6.7 // indirect
121-
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
122-
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
123-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
124-
google.golang.org/grpc v1.58.3 // indirect
125-
google.golang.org/protobuf v1.33.0 // indirect
121+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
122+
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
123+
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
124+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
125+
google.golang.org/grpc v1.65.0 // indirect
126+
google.golang.org/protobuf v1.34.2 // indirect
127+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
126128
gopkg.in/inf.v0 v0.9.1 // indirect
127129
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
128130
gopkg.in/yaml.v2 v2.4.0 // indirect
129131
gopkg.in/yaml.v3 v3.0.1 // indirect
130132
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
131-
k8s.io/kms v0.30.3 // indirect
132-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
133+
k8s.io/kms v0.31.1 // indirect
134+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
133135
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
134136
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
135-
sigs.k8s.io/yaml v1.3.0 // indirect
137+
sigs.k8s.io/yaml v1.4.0 // indirect
136138
)
137139

138140
replace (
139-
k8s.io/api => k8s.io/api v0.30.3
140-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.3
141-
k8s.io/apimachinery => k8s.io/apimachinery v0.30.3
142-
k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20241004073616-76bd25424ac8 // points to openshift-apiserver-4.1-kubernetes-1.30.3
143-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.3
144-
k8s.io/client-go => k8s.io/client-go v0.30.3
145-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.3
146-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.3
147-
k8s.io/code-generator => k8s.io/code-generator v0.30.3
148-
k8s.io/component-base => k8s.io/component-base v0.30.3
149-
k8s.io/component-helpers => k8s.io/component-helpers v0.30.3
150-
k8s.io/controller-manager => k8s.io/controller-manager v0.30.3
151-
k8s.io/cri-api => k8s.io/cri-api v0.30.3
152-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.3
153-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.3
154-
k8s.io/kms => k8s.io/kms v0.30.3
155-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.3
156-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.3
157-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.3
158-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.3
159-
k8s.io/kubectl => k8s.io/kubectl v0.30.3
160-
k8s.io/kubelet => k8s.io/kubelet v0.30.3
161-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.3
162-
k8s.io/metrics => k8s.io/metrics v0.30.3
163-
k8s.io/mount-utils => k8s.io/mount-utils v0.30.3
164-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.3
165-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.3
141+
k8s.io/api => k8s.io/api v0.31.1
142+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.1
143+
k8s.io/apimachinery => k8s.io/apimachinery v0.31.1
144+
k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20241112103933-0f10e4260855 // points to openshift-apiserver-4.18-kubernetes-1.31.1
145+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.1
146+
k8s.io/client-go => k8s.io/client-go v0.31.1
147+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.1
148+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.1
149+
k8s.io/code-generator => k8s.io/code-generator v0.31.1
150+
k8s.io/component-base => k8s.io/component-base v0.31.1
151+
k8s.io/component-helpers => k8s.io/component-helpers v0.31.1
152+
k8s.io/controller-manager => k8s.io/controller-manager v0.31.1
153+
k8s.io/cri-api => k8s.io/cri-api v0.31.1
154+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.1
155+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.1
156+
k8s.io/kms => k8s.io/kms v0.31.1
157+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.1
158+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.1
159+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.1
160+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.1
161+
k8s.io/kubectl => k8s.io/kubectl v0.31.1
162+
k8s.io/kubelet => k8s.io/kubelet v0.31.1
163+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.1
164+
k8s.io/metrics => k8s.io/metrics v0.31.1
165+
k8s.io/mount-utils => k8s.io/mount-utils v0.31.1
166+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.1
167+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.1
166168
)

0 commit comments

Comments
 (0)