Skip to content

Commit e83b5ad

Browse files
Merge pull request #121 from dinhxuanvu/bump-1.30
NO-JIRA: Bump 1.30
2 parents e417498 + d70b207 commit e83b5ad

File tree

1,073 files changed

+103383
-24720
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,073 files changed

+103383
-24720
lines changed

go.mod

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

3-
go 1.22
3+
go 1.22.0
4+
5+
toolchain go1.22.1
46

57
require (
68
github.com/MakeNowJust/heredoc v1.0.0
@@ -9,26 +11,26 @@ require (
911
github.com/google/gofuzz v1.2.0
1012
github.com/google/uuid v1.6.0
1113
github.com/jteeuwen/go-bindata v3.0.8-0.20151023091102-a0ff2567cfb7+incompatible
12-
github.com/openshift/api v0.0.0-20240410131754-6e4793fb6a4b
13-
github.com/openshift/apiserver-library-go v0.0.0-20240313131158-facc40cc7688
14-
github.com/openshift/build-machinery-go v0.0.0-20231128094528-1e9b1b0595c8
15-
github.com/openshift/client-go v0.0.0-20240408153607-64bd6feb83ae
16-
github.com/openshift/library-go v0.0.0-20240408090355-0b298992f8cc
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
1719
github.com/spf13/cobra v1.8.0
1820
github.com/spf13/pflag v1.0.5
1921
github.com/stretchr/testify v1.8.4
2022
go.opentelemetry.io/otel/trace v1.19.0
21-
k8s.io/api v0.29.2
22-
k8s.io/apiextensions-apiserver v0.29.2
23-
k8s.io/apimachinery v0.29.2
24-
k8s.io/apiserver v0.29.2
25-
k8s.io/client-go v0.29.2
26-
k8s.io/code-generator v0.29.2
27-
k8s.io/component-base v0.29.2
28-
k8s.io/klog/v2 v2.110.1
29-
k8s.io/kube-aggregator v0.29.2
30-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
31-
k8s.io/kubernetes v1.29.2
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
32+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
33+
k8s.io/kubernetes v1.30.3
3234
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
3335
)
3436

@@ -56,8 +58,8 @@ require (
5658
github.com/gogo/protobuf v1.3.2 // indirect
5759
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
5860
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
59-
github.com/golang/protobuf v1.5.3 // indirect
60-
github.com/google/cel-go v0.17.7 // indirect
61+
github.com/golang/protobuf v1.5.4 // indirect
62+
github.com/google/cel-go v0.17.8 // indirect
6163
github.com/google/gnostic-models v0.6.8 // indirect
6264
github.com/gorilla/websocket v1.5.0 // indirect
6365
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
@@ -102,9 +104,8 @@ require (
102104
go.opentelemetry.io/otel/metric v1.19.0 // indirect
103105
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
104106
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
105-
go.uber.org/atomic v1.10.0 // indirect
106107
go.uber.org/multierr v1.11.0 // indirect
107-
go.uber.org/zap v1.19.0 // indirect
108+
go.uber.org/zap v1.26.0 // indirect
108109
golang.org/x/crypto v0.22.0 // indirect
109110
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
110111
golang.org/x/mod v0.15.0 // indirect
@@ -121,45 +122,45 @@ require (
121122
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
122123
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
123124
google.golang.org/grpc v1.58.3 // indirect
124-
google.golang.org/protobuf v1.31.0 // indirect
125+
google.golang.org/protobuf v1.33.0 // indirect
125126
gopkg.in/inf.v0 v0.9.1 // indirect
126127
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
127128
gopkg.in/yaml.v2 v2.4.0 // indirect
128129
gopkg.in/yaml.v3 v3.0.1 // indirect
129-
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
130-
k8s.io/kms v0.29.2 // indirect
131-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
130+
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
132133
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
133134
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
134135
sigs.k8s.io/yaml v1.3.0 // indirect
135136
)
136137

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

0 commit comments

Comments
 (0)