Skip to content

Commit e9d3b87

Browse files
Merge pull request #135 from benluddy/bump-v1.32
NO-JIRA: Bump to Kubernetes v1.32
2 parents 7591406 + 533390b commit e9d3b87

File tree

1,828 files changed

+70502
-61379
lines changed

Some content is hidden

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

1,828 files changed

+70502
-61379
lines changed

.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: release
33
namespace: openshift
4-
tag: rhel-9-release-golang-1.22-openshift-4.18
4+
tag: rhel-9-release-golang-1.24-nofips-openshift-4.19

go.mod

Lines changed: 75 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/openshift/oauth-apiserver
22

3-
go 1.22.0
4-
5-
toolchain go1.22.1
3+
go 1.24.0
64

75
require (
86
github.com/MakeNowJust/heredoc v1.0.0
@@ -19,21 +17,22 @@ require (
1917
github.com/spf13/cobra v1.8.1
2018
github.com/spf13/pflag v1.0.5
2119
github.com/stretchr/testify v1.9.0
22-
k8s.io/api v0.31.1
23-
k8s.io/apiextensions-apiserver v0.31.1
24-
k8s.io/apimachinery v0.31.1
25-
k8s.io/apiserver v0.31.1
26-
k8s.io/client-go v0.31.1
27-
k8s.io/code-generator v0.31.1
28-
k8s.io/component-base v0.31.1
20+
k8s.io/api v0.32.3
21+
k8s.io/apiextensions-apiserver v0.32.3
22+
k8s.io/apimachinery v0.32.3
23+
k8s.io/apiserver v0.32.3
24+
k8s.io/client-go v0.32.3
25+
k8s.io/code-generator v0.32.3
26+
k8s.io/component-base v0.32.3
2927
k8s.io/klog/v2 v2.130.1
30-
k8s.io/kube-aggregator v0.31.1
31-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
32-
k8s.io/kubernetes v1.31.1
33-
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6
28+
k8s.io/kube-aggregator v0.32.3
29+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f
30+
k8s.io/kubernetes v1.32.3
31+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
3432
)
3533

3634
require (
35+
cel.dev/expr v0.18.0 // indirect
3736
github.com/NYTimes/gziphandler v1.1.1 // indirect
3837
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
3938
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
@@ -52,24 +51,22 @@ require (
5251
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
5352
github.com/go-logr/logr v1.4.2 // indirect
5453
github.com/go-logr/stdr v1.2.2 // indirect
55-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
54+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
5655
github.com/go-openapi/jsonreference v0.20.2 // indirect
57-
github.com/go-openapi/swag v0.22.4 // indirect
56+
github.com/go-openapi/swag v0.23.0 // indirect
5857
github.com/gogo/protobuf v1.3.2 // indirect
5958
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
60-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6159
github.com/golang/protobuf v1.5.4 // indirect
62-
github.com/google/cel-go v0.20.1 // indirect
60+
github.com/google/cel-go v0.22.0 // indirect
6361
github.com/google/gnostic-models v0.6.8 // indirect
64-
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
62+
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
6563
github.com/gorilla/websocket v1.5.0 // indirect
6664
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
6765
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
6866
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
6967
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
70-
github.com/imdario/mergo v0.3.7 // indirect
7168
github.com/inconshreveable/mousetrap v1.1.0 // indirect
72-
github.com/jonboulle/clockwork v0.2.2 // indirect
69+
github.com/jonboulle/clockwork v0.4.0 // indirect
7370
github.com/josharian/intern v1.0.0 // indirect
7471
github.com/json-iterator/go v1.1.12 // indirect
7572
github.com/mailru/easyjson v0.7.7 // indirect
@@ -85,18 +82,18 @@ require (
8582
github.com/prometheus/procfs v0.15.1 // indirect
8683
github.com/sirupsen/logrus v1.9.3 // indirect
8784
github.com/soheilhy/cmux v0.1.5 // indirect
88-
github.com/stoewer/go-strcase v1.2.0 // indirect
85+
github.com/stoewer/go-strcase v1.3.0 // indirect
8986
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 // indirect
9087
github.com/x448/float16 v0.8.4 // indirect
91-
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
92-
go.etcd.io/bbolt v1.3.9 // indirect
93-
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
94-
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
95-
go.etcd.io/etcd/client/v2 v2.305.13 // indirect
96-
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
97-
go.etcd.io/etcd/pkg/v3 v3.5.13 // indirect
98-
go.etcd.io/etcd/raft/v3 v3.5.13 // indirect
99-
go.etcd.io/etcd/server/v3 v3.5.13 // indirect
88+
github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 // indirect
89+
go.etcd.io/bbolt v1.3.11 // indirect
90+
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
91+
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
92+
go.etcd.io/etcd/client/v2 v2.305.16 // indirect
93+
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
94+
go.etcd.io/etcd/pkg/v3 v3.5.16 // indirect
95+
go.etcd.io/etcd/raft/v3 v3.5.16 // indirect
96+
go.etcd.io/etcd/server/v3 v3.5.16 // indirect
10097
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
10198
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
10299
go.opentelemetry.io/otel v1.28.0 // indirect
@@ -107,62 +104,61 @@ require (
107104
go.opentelemetry.io/otel/trace v1.28.0 // indirect
108105
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
109106
go.uber.org/multierr v1.11.0 // indirect
110-
go.uber.org/zap v1.26.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
107+
go.uber.org/zap v1.27.0 // indirect
108+
golang.org/x/crypto v0.28.0 // indirect
109+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
110+
golang.org/x/mod v0.21.0 // indirect
111+
golang.org/x/net v0.30.0 // indirect
112+
golang.org/x/oauth2 v0.23.0 // indirect
116113
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
120-
golang.org/x/time v0.3.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
114+
golang.org/x/sys v0.26.0 // indirect
115+
golang.org/x/term v0.25.0 // indirect
116+
golang.org/x/text v0.19.0 // indirect
117+
golang.org/x/time v0.7.0 // indirect
118+
golang.org/x/tools v0.26.0 // indirect
119+
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
120+
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
121+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
125122
google.golang.org/grpc v1.65.0 // indirect
126-
google.golang.org/protobuf v1.34.2 // indirect
123+
google.golang.org/protobuf v1.35.1 // indirect
127124
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
128125
gopkg.in/inf.v0 v0.9.1 // indirect
129126
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
130-
gopkg.in/yaml.v2 v2.4.0 // indirect
131127
gopkg.in/yaml.v3 v3.0.1 // indirect
132-
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
133-
k8s.io/kms v0.31.1 // indirect
134-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
135-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
136-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
128+
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
129+
k8s.io/kms v0.32.3 // indirect
130+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
131+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
132+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
137133
sigs.k8s.io/yaml v1.4.0 // indirect
138134
)
139135

140136
replace (
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-20250205074533-d8ec43992017 // 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
137+
k8s.io/api => k8s.io/api v0.32.3
138+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.3
139+
k8s.io/apimachinery => k8s.io/apimachinery v0.32.3
140+
k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20250526074939-69bc847b1ee3 // points to openshift-apiserver-4.19-kubernetes-1.32.1
141+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.3
142+
k8s.io/client-go => k8s.io/client-go v0.32.3
143+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.32.3
144+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.32.3
145+
k8s.io/code-generator => k8s.io/code-generator v0.32.3
146+
k8s.io/component-base => k8s.io/component-base v0.32.3
147+
k8s.io/component-helpers => k8s.io/component-helpers v0.32.3
148+
k8s.io/controller-manager => k8s.io/controller-manager v0.32.3
149+
k8s.io/cri-api => k8s.io/cri-api v0.32.3
150+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.3
151+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.32.3
152+
k8s.io/kms => k8s.io/kms v0.32.3
153+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.32.3
154+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.32.3
155+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.32.3
156+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.3
157+
k8s.io/kubectl => k8s.io/kubectl v0.32.3
158+
k8s.io/kubelet => k8s.io/kubelet v0.32.3
159+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.32.3
160+
k8s.io/metrics => k8s.io/metrics v0.32.3
161+
k8s.io/mount-utils => k8s.io/mount-utils v0.32.3
162+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.32.3
163+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.3
168164
)

0 commit comments

Comments
 (0)