Skip to content

Commit 3443eca

Browse files
Merge pull request #458 from ingvagabund/release-4.20
WRKLDS-1657: bump(k8s): update k8s.io/* dependencies to v1.32.2
2 parents de0e4a3 + 5855bae commit 3443eca

File tree

2,302 files changed

+78385
-57132
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,302 files changed

+78385
-57132
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.17
4+
tag: rhel-9-release-golang-1.23-openshift-4.19

Dockerfile.rhel7

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
22
WORKDIR /go/src/github.com/openshift/cluster-kube-descheduler-operator
33
COPY . .
44
RUN make build --warn-undefined-variables
55

6-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-base-openshift-4.17
6+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-base-openshift-4.19
77
COPY --from=builder /go/src/github.com/openshift/cluster-kube-descheduler-operator/cluster-kube-descheduler-operator /usr/bin/
88
COPY --from=builder /go/src/github.com/openshift/cluster-kube-descheduler-operator/manifests /manifests
99
COPY --from=builder /go/src/github.com/openshift/cluster-kube-descheduler-operator/metadata /metadata

go.mod

Lines changed: 49 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,37 @@
11
module github.com/openshift/cluster-kube-descheduler-operator
22

3-
go 1.22.5
4-
5-
toolchain go1.22.6
3+
go 1.23.3
64

75
require (
86
github.com/ghodss/yaml v1.0.0
97
github.com/go-bindata/go-bindata v3.1.2+incompatible
108
github.com/google/go-cmp v0.6.0
11-
github.com/openshift/api v0.0.0-20241015143726-5afd6c371db4
12-
github.com/openshift/build-machinery-go v0.0.0-20240910153727-5725581bdf8f
13-
github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f
14-
github.com/openshift/library-go v0.0.0-20241015180910-c0f6295482a7
9+
github.com/openshift/api v0.0.0-20250228110707-635291d6fdf1
10+
github.com/openshift/build-machinery-go v0.0.0-20250211133638-a00a772ae1a2
11+
github.com/openshift/client-go v0.0.0-20250131180035-f7ec47e2d87a
12+
github.com/openshift/library-go v0.0.0-20250228164547-bad2d1bf3a37
1513
github.com/prometheus/client_golang v1.19.1
1614
github.com/spf13/cobra v1.8.1
17-
k8s.io/api v0.31.2
18-
k8s.io/apiextensions-apiserver v0.31.2
19-
k8s.io/apimachinery v0.31.2
20-
k8s.io/client-go v0.31.2
21-
k8s.io/code-generator v0.31.2
22-
k8s.io/component-base v0.31.2
15+
k8s.io/api v0.32.2
16+
k8s.io/apiextensions-apiserver v0.32.2
17+
k8s.io/apimachinery v0.32.2
18+
k8s.io/client-go v0.32.2
19+
k8s.io/code-generator v0.32.2
20+
k8s.io/component-base v0.32.2
2321
k8s.io/klog/v2 v2.130.1
24-
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6
25-
sigs.k8s.io/controller-tools v0.16.5
26-
sigs.k8s.io/descheduler v0.31.1-0.20241015202104-ef0c2c1c47c6
27-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
22+
k8s.io/utils v0.0.0-20241210054802-24370beab758
23+
sigs.k8s.io/controller-tools v0.17.0
24+
sigs.k8s.io/descheduler v0.32.2
25+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2
2826
)
2927

3028
replace (
3129
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f
32-
sigs.k8s.io/descheduler => github.com/openshift/descheduler v0.5.1-0.20241119121611-9244957ecbe2
30+
sigs.k8s.io/descheduler => github.com/openshift/descheduler v0.5.1-0.20250303164104-5223499539f1
3331
)
3432

3533
require (
34+
cel.dev/expr v0.18.0 // indirect
3635
github.com/NYTimes/gziphandler v1.1.1 // indirect
3736
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
3837
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
@@ -44,25 +43,24 @@ require (
4443
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
4544
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4645
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
47-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
4846
github.com/fatih/color v1.18.0 // indirect
4947
github.com/felixge/fgprof v0.9.4 // indirect
5048
github.com/felixge/httpsnoop v1.0.4 // indirect
5149
github.com/fsnotify/fsnotify v1.7.0 // indirect
5250
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
5351
github.com/go-logr/logr v1.4.2 // indirect
5452
github.com/go-logr/stdr v1.2.2 // indirect
55-
github.com/go-openapi/jsonpointer v0.20.0 // indirect
53+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
5654
github.com/go-openapi/jsonreference v0.20.2 // indirect
57-
github.com/go-openapi/swag v0.22.4 // indirect
55+
github.com/go-openapi/swag v0.23.0 // indirect
5856
github.com/gobuffalo/flect v1.0.3 // indirect
5957
github.com/gogo/protobuf v1.3.2 // indirect
60-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6158
github.com/golang/protobuf v1.5.4 // indirect
62-
github.com/google/cel-go v0.20.1 // indirect
59+
github.com/google/btree v1.0.1 // indirect
60+
github.com/google/cel-go v0.22.0 // indirect
6361
github.com/google/gnostic-models v0.6.8 // indirect
6462
github.com/google/gofuzz v1.2.0 // indirect
65-
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
63+
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
6664
github.com/google/uuid v1.6.0 // indirect
6765
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
6866
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
@@ -84,11 +82,11 @@ require (
8482
github.com/robfig/cron v1.2.0 // indirect
8583
github.com/sirupsen/logrus v1.9.3 // indirect
8684
github.com/spf13/pflag v1.0.5 // indirect
87-
github.com/stoewer/go-strcase v1.2.0 // indirect
85+
github.com/stoewer/go-strcase v1.3.0 // indirect
8886
github.com/x448/float16 v0.8.4 // indirect
89-
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
90-
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
91-
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
87+
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
88+
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
89+
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
9290
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
9391
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
9492
go.opentelemetry.io/otel v1.28.0 // indirect
@@ -99,36 +97,36 @@ require (
9997
go.opentelemetry.io/otel/trace v1.28.0 // indirect
10098
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
10199
go.uber.org/multierr v1.11.0 // indirect
102-
go.uber.org/zap v1.26.0 // indirect
103-
golang.org/x/crypto v0.28.0 // indirect
104-
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
105-
golang.org/x/mod v0.21.0 // indirect
106-
golang.org/x/net v0.30.0 // indirect
107-
golang.org/x/oauth2 v0.21.0 // indirect
108-
golang.org/x/sync v0.8.0 // indirect
109-
golang.org/x/sys v0.26.0 // indirect
110-
golang.org/x/term v0.25.0 // indirect
111-
golang.org/x/text v0.19.0 // indirect
112-
golang.org/x/time v0.3.0 // indirect
113-
golang.org/x/tools v0.26.0 // indirect
114-
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
115-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
100+
go.uber.org/zap v1.27.0 // indirect
101+
golang.org/x/crypto v0.31.0 // indirect
102+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
103+
golang.org/x/mod v0.22.0 // indirect
104+
golang.org/x/net v0.33.0 // indirect
105+
golang.org/x/oauth2 v0.23.0 // indirect
106+
golang.org/x/sync v0.10.0 // indirect
107+
golang.org/x/sys v0.28.0 // indirect
108+
golang.org/x/term v0.27.0 // indirect
109+
golang.org/x/text v0.21.0 // indirect
110+
golang.org/x/time v0.7.0 // indirect
111+
golang.org/x/tools v0.28.0 // indirect
112+
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
113+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
116114
google.golang.org/grpc v1.65.0 // indirect
117-
google.golang.org/protobuf v1.34.2 // indirect
115+
google.golang.org/protobuf v1.35.1 // indirect
118116
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
119117
gopkg.in/inf.v0 v0.9.1 // indirect
120118
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
121119
gopkg.in/yaml.v2 v2.4.0 // indirect
122120
gopkg.in/yaml.v3 v3.0.1 // indirect
123-
k8s.io/apiserver v0.31.2 // indirect
124-
k8s.io/component-helpers v0.31.0 // indirect
125-
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
126-
k8s.io/kms v0.31.2 // indirect
127-
k8s.io/kube-aggregator v0.31.1 // indirect
121+
k8s.io/apiserver v0.32.2 // indirect
122+
k8s.io/component-helpers v0.32.0 // indirect
123+
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
124+
k8s.io/kms v0.32.2 // indirect
125+
k8s.io/kube-aggregator v0.32.1 // indirect
128126
k8s.io/kube-openapi v0.30.0 // indirect
129-
k8s.io/metrics v0.31.2 // indirect
130-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
131-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
127+
k8s.io/metrics v0.32.2 // indirect
128+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
129+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
132130
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
133131
sigs.k8s.io/yaml v1.4.0 // indirect
134132
)

0 commit comments

Comments
 (0)