Skip to content

Commit fa106e6

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #396 from nrb/OCPCLOUD-2940
OCPCLOUD-2940: Update dependencies for Kubernetes 1.33
2 parents 403967c + f11f170 commit fa106e6

3,250 files changed

Lines changed: 780512 additions & 147441 deletions

File tree

Some content is hidden

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

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
IMG ?= controller:latest
44

55
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
6-
ENVTEST_K8S_VERSION = 1.32.1
6+
ENVTEST_K8S_VERSION = 1.33.2
77

88
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
99
CONTROLLER_GEN = go run ${PROJECT_DIR}/vendor/sigs.k8s.io/controller-tools/cmd/controller-gen

‎go.mod‎

Lines changed: 79 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
module github.com/openshift/cluster-cloud-controller-manager-operator
22

3-
go 1.23.2
3+
go 1.24.0
44

55
require (
66
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
7-
github.com/go-logr/logr v1.4.2
7+
github.com/go-logr/logr v1.4.3
88
github.com/golangci/golangci-lint v1.62.2
9-
github.com/onsi/ginkgo/v2 v2.22.2
10-
github.com/onsi/gomega v1.36.2
11-
github.com/openshift/api v0.0.0-20250128061932-d2791f98ff08
12-
github.com/openshift/client-go v0.0.0-20250125113824-8e1f0b8fa9a7
9+
github.com/onsi/ginkgo/v2 v2.23.4
10+
github.com/onsi/gomega v1.37.0
11+
github.com/openshift/api v0.0.0-20250724151358-f313adb86331
12+
github.com/openshift/client-go v0.0.0-20250710075018-396b36f983ee
1313
github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20250122171707-86066d47a264
14-
github.com/openshift/library-go v0.0.0-20250127111945-0f76e23726cd
15-
github.com/spf13/cobra v1.8.1
16-
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace
14+
github.com/openshift/library-go v0.0.0-20250724123005-03d85c4e997c
15+
github.com/spf13/cobra v1.9.1
16+
github.com/spf13/pflag v1.0.6
1717
github.com/stretchr/testify v1.10.0
1818
gopkg.in/gcfg.v1 v1.2.3
1919
gopkg.in/ini.v1 v1.67.0
2020
gopkg.in/yaml.v2 v2.4.0
21-
k8s.io/api v0.32.1
22-
k8s.io/apiextensions-apiserver v0.32.1
23-
k8s.io/apimachinery v0.32.1
24-
k8s.io/client-go v0.32.1
25-
k8s.io/cloud-provider-aws v1.32.0-rc.3.0.20250127183323-b1f753a6615a
26-
k8s.io/cloud-provider-vsphere v1.32.2
27-
k8s.io/component-base v0.32.1
28-
k8s.io/controller-manager v0.32.1
21+
k8s.io/api v0.33.2
22+
k8s.io/apiextensions-apiserver v0.33.2
23+
k8s.io/apimachinery v0.33.2
24+
k8s.io/client-go v0.33.2
25+
k8s.io/cloud-provider-aws v1.33.1
26+
k8s.io/cloud-provider-vsphere v1.33.0
27+
k8s.io/component-base v0.33.2
28+
k8s.io/controller-manager v0.33.2
2929
k8s.io/klog/v2 v2.130.1
30-
k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078
31-
sigs.k8s.io/cloud-provider-azure v1.32.0
32-
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.4.7
33-
sigs.k8s.io/controller-runtime v0.20.1
30+
k8s.io/utils v0.0.0-20241210054802-24370beab758
31+
sigs.k8s.io/cloud-provider-azure v1.33.2
32+
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.8.5
33+
sigs.k8s.io/controller-runtime v0.21.0
3434
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240923090159-236e448db12c
3535
sigs.k8s.io/controller-tools v0.17.1
36-
sigs.k8s.io/yaml v1.4.0
36+
sigs.k8s.io/yaml v1.5.0
3737
)
3838

3939
require (
@@ -44,22 +44,23 @@ require (
4444
github.com/Antonboom/errname v1.0.0 // indirect
4545
github.com/Antonboom/nilnil v1.0.0 // indirect
4646
github.com/Antonboom/testifylint v1.5.2 // indirect
47-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 // indirect
48-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0 // indirect
49-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
47+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.1 // indirect
48+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1 // indirect
49+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 // indirect
5050
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/authorization/armauthorization/v2 v2.2.0 // indirect
51-
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v6 v6.2.0 // indirect
51+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v6 v6.4.0 // indirect
5252
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerregistry/armcontainerregistry v1.2.0 // indirect
53-
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v6 v6.3.0 // indirect
54-
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/keyvault/armkeyvault v1.4.0 // indirect
53+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v6 v6.6.0 // indirect
54+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/keyvault/armkeyvault v1.5.0 // indirect
5555
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/msi/armmsi v1.2.0 // indirect
5656
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v6 v6.2.0 // indirect
5757
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/privatedns/armprivatedns v1.3.0 // indirect
5858
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0 // indirect
59-
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.6.0 // indirect
60-
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets v1.3.0 // indirect
61-
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.0 // indirect
62-
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.1 // indirect
59+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.8.1 // indirect
60+
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets v1.4.0 // indirect
61+
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.2.0 // indirect
62+
github.com/Azure/msi-dataplane v0.4.3 // indirect
63+
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect
6364
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
6465
github.com/Crocmagnon/fatcontext v0.5.3 // indirect
6566
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
@@ -70,9 +71,20 @@ require (
7071
github.com/alexkohler/nakedret/v2 v2.0.5 // indirect
7172
github.com/alexkohler/prealloc v1.0.0 // indirect
7273
github.com/alingse/asasalint v0.0.11 // indirect
74+
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
7375
github.com/ashanbrown/forbidigo v1.6.0 // indirect
7476
github.com/ashanbrown/makezero v1.1.1 // indirect
75-
github.com/aws/aws-sdk-go v1.55.5 // indirect
77+
github.com/aws/aws-sdk-go-v2 v1.36.5 // indirect
78+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.31 // indirect
79+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.36 // indirect
80+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.36 // indirect
81+
github.com/aws/aws-sdk-go-v2/service/ec2 v1.218.0 // indirect
82+
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.3 // indirect
83+
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.2 // indirect
84+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect
85+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect
86+
github.com/aws/aws-sdk-go-v2/service/kms v1.41.0 // indirect
87+
github.com/aws/smithy-go v1.22.4 // indirect
7688
github.com/beorn7/perks v1.0.1 // indirect
7789
github.com/bkielbasa/cyclop v1.2.3 // indirect
7890
github.com/blang/semver/v4 v4.0.0 // indirect
@@ -94,12 +106,11 @@ require (
94106
github.com/denis-tingaikin/go-header v0.5.0 // indirect
95107
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
96108
github.com/ettle/strcase v0.2.0 // indirect
97-
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
98-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
109+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
99110
github.com/fatih/color v1.18.0 // indirect
100111
github.com/fatih/structtag v1.2.0 // indirect
101112
github.com/firefart/nonamedreturns v1.0.5 // indirect
102-
github.com/fsnotify/fsnotify v1.8.0 // indirect
113+
github.com/fsnotify/fsnotify v1.9.0 // indirect
103114
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
104115
github.com/fzipp/gocyclo v0.6.0 // indirect
105116
github.com/ghostiam/protogetter v0.3.8 // indirect
@@ -122,8 +133,7 @@ require (
122133
github.com/gobwas/glob v0.2.3 // indirect
123134
github.com/gofrs/flock v0.12.1 // indirect
124135
github.com/gogo/protobuf v1.3.2 // indirect
125-
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
126-
github.com/golang/protobuf v1.5.4 // indirect
136+
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
127137
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
128138
github.com/golangci/go-printf-func-name v0.1.0 // indirect
129139
github.com/golangci/gofmt v0.0.0-20240816233607-d8596aa466a9 // indirect
@@ -133,10 +143,9 @@ require (
133143
github.com/golangci/revgrep v0.5.3 // indirect
134144
github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed // indirect
135145
github.com/google/btree v1.1.3 // indirect
136-
github.com/google/gnostic-models v0.6.8 // indirect
137-
github.com/google/go-cmp v0.6.0 // indirect
138-
github.com/google/gofuzz v1.2.0 // indirect
139-
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
146+
github.com/google/gnostic-models v0.6.9 // indirect
147+
github.com/google/go-cmp v0.7.0 // indirect
148+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
140149
github.com/google/uuid v1.6.0 // indirect
141150
github.com/gordonklaus/ineffassign v0.1.0 // indirect
142151
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
@@ -151,14 +160,12 @@ require (
151160
github.com/jgautheron/goconst v1.7.1 // indirect
152161
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
153162
github.com/jjti/go-spancheck v0.6.2 // indirect
154-
github.com/jmespath/go-jmespath v0.4.0 // indirect
155163
github.com/josharian/intern v1.0.0 // indirect
156164
github.com/json-iterator/go v1.1.12 // indirect
157165
github.com/julz/importas v0.1.0 // indirect
158166
github.com/karamaru-alpha/copyloopvar v1.1.0 // indirect
159167
github.com/kisielk/errcheck v1.8.0 // indirect
160168
github.com/kkHAIKE/contextcheck v1.1.5 // indirect
161-
github.com/klauspost/compress v1.17.9 // indirect
162169
github.com/kulti/thelper v0.6.3 // indirect
163170
github.com/kunwardeep/paralleltest v1.0.10 // indirect
164171
github.com/kylelemons/godebug v1.1.0 // indirect
@@ -193,10 +200,10 @@ require (
193200
github.com/pkg/errors v0.9.1 // indirect
194201
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
195202
github.com/polyfloyd/go-errorlint v1.7.0 // indirect
196-
github.com/prometheus/client_golang v1.20.5 // indirect
197-
github.com/prometheus/client_model v0.6.1 // indirect
198-
github.com/prometheus/common v0.61.0 // indirect
199-
github.com/prometheus/procfs v0.15.1 // indirect
203+
github.com/prometheus/client_golang v1.22.0 // indirect
204+
github.com/prometheus/client_model v0.6.2 // indirect
205+
github.com/prometheus/common v0.65.0 // indirect
206+
github.com/prometheus/procfs v0.16.1 // indirect
200207
github.com/quasilyte/go-ruleguard v0.4.3-0.20240823090925-0fe6f58b47b1 // indirect
201208
github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect
202209
github.com/quasilyte/gogrep v0.5.0 // indirect
@@ -247,39 +254,41 @@ require (
247254
gitlab.com/bosi/decorder v0.4.2 // indirect
248255
go-simpler.org/musttag v0.13.0 // indirect
249256
go-simpler.org/sloglint v0.7.2 // indirect
250-
go.opentelemetry.io/otel v1.33.0 // indirect
251-
go.opentelemetry.io/otel/metric v1.33.0 // indirect
252-
go.opentelemetry.io/otel/trace v1.33.0 // indirect
257+
go.opentelemetry.io/otel v1.37.0 // indirect
258+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
259+
go.opentelemetry.io/otel/trace v1.37.0 // indirect
253260
go.uber.org/automaxprocs v1.6.0 // indirect
254-
go.uber.org/mock v0.5.0 // indirect
261+
go.uber.org/mock v0.5.2 // indirect
255262
go.uber.org/multierr v1.11.0 // indirect
256263
go.uber.org/zap v1.27.0 // indirect
257-
golang.org/x/crypto v0.32.0 // indirect
258-
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
264+
go.yaml.in/yaml/v2 v2.4.2 // indirect
265+
golang.org/x/crypto v0.39.0 // indirect
266+
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
259267
golang.org/x/exp/typeparams v0.0.0-20241108190413-2d47ceb2692f // indirect
260-
golang.org/x/mod v0.22.0 // indirect
261-
golang.org/x/net v0.34.0 // indirect
262-
golang.org/x/oauth2 v0.24.0 // indirect
263-
golang.org/x/sync v0.10.0 // indirect
264-
golang.org/x/sys v0.29.0 // indirect
265-
golang.org/x/term v0.28.0 // indirect
266-
golang.org/x/text v0.21.0 // indirect
267-
golang.org/x/time v0.9.0 // indirect
268-
golang.org/x/tools v0.29.0 // indirect
268+
golang.org/x/mod v0.25.0 // indirect
269+
golang.org/x/net v0.41.0 // indirect
270+
golang.org/x/oauth2 v0.30.0 // indirect
271+
golang.org/x/sync v0.16.0 // indirect
272+
golang.org/x/sys v0.34.0 // indirect
273+
golang.org/x/term v0.32.0 // indirect
274+
golang.org/x/text v0.27.0 // indirect
275+
golang.org/x/time v0.12.0 // indirect
276+
golang.org/x/tools v0.34.0 // indirect
269277
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
270-
google.golang.org/protobuf v1.36.1 // indirect
278+
google.golang.org/protobuf v1.36.6 // indirect
271279
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
272280
gopkg.in/inf.v0 v0.9.1 // indirect
273281
gopkg.in/warnings.v0 v0.1.2 // indirect
274282
gopkg.in/yaml.v3 v3.0.1 // indirect
275283
honnef.co/go/tools v0.5.1 // indirect
276-
k8s.io/apiserver v0.32.1 // indirect
277-
k8s.io/kube-aggregator v0.32.1 // indirect
278-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
284+
k8s.io/apiserver v0.33.2 // indirect
285+
k8s.io/kube-aggregator v0.33.2 // indirect
286+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
279287
mvdan.cc/gofumpt v0.7.0 // indirect
280288
mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f // indirect
281-
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.3.3 // indirect
282-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
289+
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.7.2 // indirect
290+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
283291
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
284-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
292+
sigs.k8s.io/randfill v1.0.0 // indirect
293+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
285294
)

0 commit comments

Comments
 (0)