Skip to content

Commit 58e1ceb

Browse files
Merge pull request #1036 from deepsm007/bump_api
OCPBUGS-33868: Bump openshift api, client-go & library-go
2 parents 3f65eeb + 7bd73cf commit 58e1ceb

File tree

1,027 files changed

+50373
-53623
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,027 files changed

+50373
-53623
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN go build -o ../../tmp/_output/bin/move-blobs
88
FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
99
COPY images/bin/entrypoint.sh /usr/bin/
1010
COPY manifests/image-references manifests/0* /manifests/
11-
COPY vendor/github.com/openshift/api/imageregistry/v1/*.crd.yaml /manifests/
11+
COPY vendor/github.com/openshift/api/imageregistry/v1/**/*.crd.yaml /manifests/
1212
COPY --from=builder /go/src/github.com/openshift/cluster-image-registry-operator/tmp/_output/bin/cluster-image-registry-operator /usr/bin/
1313
COPY --from=builder /go/src/github.com/openshift/cluster-image-registry-operator/tmp/_output/bin/move-blobs /usr/bin/
1414
RUN chmod -R g+w /etc/pki/ca-trust/extracted/pem/

go.mod

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/openshift/cluster-image-registry-operator
22

3-
go 1.19
3+
go 1.21
44

55
require (
66
cloud.google.com/go/resourcemanager v1.9.6
@@ -32,10 +32,10 @@ require (
3232
github.com/gophercloud/utils v0.0.0-20221124081324-7bac6f5cdf99
3333
github.com/goware/urlx v0.3.2
3434
github.com/jongio/azidext/go/azidext v0.5.0
35-
github.com/openshift/api v0.0.0-20231122155802-dbd690d09b94
36-
github.com/openshift/build-machinery-go v0.0.0-20230816154005-5a38e1bfd880
37-
github.com/openshift/client-go v0.0.0-20231018150822-6e226e2825a6
38-
github.com/openshift/library-go v0.0.0-20231020125034-5a2d9fe760b3
35+
github.com/openshift/api v0.0.0-20240508125607-95e22923d553
36+
github.com/openshift/build-machinery-go v0.0.0-20231128094528-1e9b1b0595c8
37+
github.com/openshift/client-go v0.0.0-20240422164335-6c851f4919dd
38+
github.com/openshift/library-go v0.0.0-20240508091607-5fface69be35
3939
github.com/ppc64le-cloud/powervs-utils v0.0.0-20240105123432-7588e9595c17
4040
github.com/prometheus/client_golang v1.16.0
4141
github.com/prometheus/client_model v0.4.0
@@ -47,10 +47,10 @@ require (
4747
golang.org/x/time v0.5.0
4848
google.golang.org/api v0.172.0
4949
gopkg.in/yaml.v2 v2.4.0
50-
k8s.io/api v0.28.3
51-
k8s.io/apimachinery v0.28.3
52-
k8s.io/client-go v0.28.3
53-
k8s.io/klog/v2 v2.100.1
50+
k8s.io/api v0.29.0
51+
k8s.io/apimachinery v0.29.0
52+
k8s.io/client-go v0.29.0
53+
k8s.io/klog/v2 v2.110.1
5454
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
5555
)
5656

@@ -79,10 +79,10 @@ require (
7979
github.com/cespare/xxhash/v2 v2.2.0 // indirect
8080
github.com/coreos/go-semver v0.3.1 // indirect
8181
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
82-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
82+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
8383
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
8484
github.com/felixge/httpsnoop v1.0.4 // indirect
85-
github.com/fsnotify/fsnotify v1.6.0 // indirect
85+
github.com/fsnotify/fsnotify v1.7.0 // indirect
8686
github.com/go-logr/logr v1.4.1 // indirect
8787
github.com/go-logr/stdr v1.2.2 // indirect
8888
github.com/go-openapi/errors v0.20.3 // indirect
@@ -98,7 +98,7 @@ require (
9898
github.com/golang-jwt/jwt/v5 v5.0.0 // indirect
9999
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
100100
github.com/golang/protobuf v1.5.4 // indirect
101-
github.com/google/cel-go v0.16.1 // indirect
101+
github.com/google/cel-go v0.17.7 // indirect
102102
github.com/google/gnostic-models v0.6.8 // indirect
103103
github.com/google/gofuzz v1.2.0 // indirect
104104
github.com/google/s2a-go v0.1.7 // indirect
@@ -133,9 +133,9 @@ require (
133133
github.com/sirupsen/logrus v1.9.0 // indirect
134134
github.com/spf13/pflag v1.0.5 // indirect
135135
github.com/stoewer/go-strcase v1.2.0 // indirect
136-
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
137-
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
138-
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
136+
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
137+
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
138+
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
139139
go.mongodb.org/mongo-driver v1.11.3 // indirect
140140
go.opencensus.io v0.24.0 // indirect
141141
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
@@ -166,16 +166,16 @@ require (
166166
gopkg.in/ini.v1 v1.66.2 // indirect
167167
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
168168
gopkg.in/yaml.v3 v3.0.1 // indirect
169-
k8s.io/apiextensions-apiserver v0.28.2 // indirect
170-
k8s.io/apiserver v0.28.2 // indirect
171-
k8s.io/component-base v0.28.2 // indirect
172-
k8s.io/kms v0.28.2 // indirect
173-
k8s.io/kube-aggregator v0.28.2 // indirect
174-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
175-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
169+
k8s.io/apiextensions-apiserver v0.29.0 // indirect
170+
k8s.io/apiserver v0.29.0 // indirect
171+
k8s.io/component-base v0.29.0 // indirect
172+
k8s.io/kms v0.29.0 // indirect
173+
k8s.io/kube-aggregator v0.29.0 // indirect
174+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
175+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
176176
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
177177
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
178-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
178+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
179179
sigs.k8s.io/yaml v1.3.0 // indirect
180180
)
181181

0 commit comments

Comments
 (0)