Skip to content

Commit 467e50f

Browse files
Merge pull request #176 from Meina-rh/rebase-1.33
CORENET-5958:Rebase k8s to 1.33
2 parents fc68157 + 2cf71cb commit 467e50f

File tree

1,425 files changed

+99975
-52051
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,425 files changed

+99975
-52051
lines changed

go.mod

Lines changed: 52 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/openshift/cloud-network-config-controller
22

3-
go 1.23.0
3+
go 1.24.0
44

5-
toolchain go1.23.6
5+
toolchain go1.24.5
66

77
require (
88
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0
@@ -17,25 +17,27 @@ require (
1717
github.com/gophercloud/utils/v2 v2.0.0-20241008104625-7cbb8fd76bb7
1818
github.com/onsi/ginkgo v1.14.1
1919
github.com/onsi/gomega v1.36.1
20-
github.com/openshift/api v0.0.0-20250226153854-e8e096a21cb3
21-
github.com/openshift/client-go v0.0.0-20250131180035-f7ec47e2d87a
22-
github.com/openshift/library-go v0.0.0-20250218150059-017e5b6cf27c
20+
github.com/openshift/api v0.0.0-20250722222824-0528f2f3e210
21+
github.com/openshift/client-go v0.0.0-20250710075018-396b36f983ee
22+
github.com/openshift/library-go v0.0.0-20250711143941-47604345e7ea
2323
github.com/pkg/errors v0.9.1
2424
google.golang.org/api v0.179.0
2525
gopkg.in/yaml.v2 v2.4.0
26-
k8s.io/api v0.32.2
27-
k8s.io/apimachinery v0.32.2
28-
k8s.io/client-go v0.32.2
29-
k8s.io/cloud-provider v0.32.2
26+
k8s.io/api v0.33.3
27+
k8s.io/apimachinery v0.33.3
28+
k8s.io/client-go v0.33.3
29+
k8s.io/cloud-provider v0.33.3
3030
k8s.io/klog/v2 v2.130.1
31-
k8s.io/utils v0.0.0-20241210054802-24370beab758
32-
sigs.k8s.io/controller-runtime v0.20.2
31+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
32+
sigs.k8s.io/controller-runtime v0.21.0
3333
)
3434

35+
require go.opentelemetry.io/auto/sdk v1.1.0 // indirect
36+
3537
require (
3638
cloud.google.com/go/auth v0.4.1 // indirect
3739
cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
38-
cloud.google.com/go/compute/metadata v0.3.0 // indirect
40+
cloud.google.com/go/compute/metadata v0.5.0 // indirect
3941
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
4042
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets v1.3.1 // indirect
4143
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.1 // indirect
@@ -53,30 +55,28 @@ require (
5355
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
5456
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
5557
github.com/felixge/httpsnoop v1.0.4 // indirect
56-
github.com/fsnotify/fsnotify v1.8.0 // indirect
57-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
58-
github.com/go-logr/logr v1.4.2 // indirect
58+
github.com/fsnotify/fsnotify v1.9.0 // indirect
59+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
60+
github.com/go-logr/logr v1.4.3 // indirect
5961
github.com/go-logr/stdr v1.2.2 // indirect
60-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
62+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
6163
github.com/go-openapi/jsonreference v0.21.0 // indirect
62-
github.com/go-openapi/swag v0.23.0 // indirect
64+
github.com/go-openapi/swag v0.23.1 // indirect
6365
github.com/gofrs/uuid/v5 v5.3.0 // indirect
6466
github.com/gogo/protobuf v1.3.2 // indirect
65-
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
67+
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
6668
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
6769
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6870
github.com/golang/protobuf v1.5.4 // indirect
69-
github.com/google/gnostic-models v0.6.9 // indirect
71+
github.com/google/gnostic-models v0.7.0 // indirect
7072
github.com/google/go-cmp v0.7.0 // indirect
71-
github.com/google/gofuzz v1.2.0 // indirect
7273
github.com/google/s2a-go v0.1.7 // indirect
7374
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
7475
github.com/googleapis/gax-go/v2 v2.12.4 // indirect
7576
github.com/imdario/mergo v0.3.16 // indirect
7677
github.com/jmespath/go-jmespath v0.4.0 // indirect
7778
github.com/josharian/intern v1.0.0 // indirect
7879
github.com/json-iterator/go v1.1.12 // indirect
79-
github.com/klauspost/compress v1.18.0 // indirect
8080
github.com/kylelemons/godebug v1.1.0 // indirect
8181
github.com/mailru/easyjson v0.9.0 // indirect
8282
github.com/mitchellh/go-homedir v1.1.0 // indirect
@@ -85,40 +85,45 @@ require (
8585
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8686
github.com/nxadm/tail v1.4.4 // indirect
8787
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
88-
github.com/prometheus/client_golang v1.21.0 // indirect
89-
github.com/prometheus/client_model v0.6.1 // indirect
90-
github.com/prometheus/common v0.62.0 // indirect
91-
github.com/prometheus/procfs v0.15.1 // indirect
88+
github.com/prometheus/client_golang v1.22.0 // indirect
89+
github.com/prometheus/client_model v0.6.2 // indirect
90+
github.com/prometheus/common v0.65.0 // indirect
91+
github.com/prometheus/procfs v0.17.0 // indirect
9292
github.com/robfig/cron v1.2.0 // indirect
93-
github.com/spf13/pflag v1.0.6 // indirect
93+
github.com/spf13/pflag v1.0.7 // indirect
9494
github.com/x448/float16 v0.8.4 // indirect
9595
go.opencensus.io v0.24.0 // indirect
96-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
97-
go.opentelemetry.io/otel v1.28.0 // indirect
98-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
99-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
100-
golang.org/x/crypto v0.33.0 // indirect
96+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
97+
go.opentelemetry.io/otel v1.33.0 // indirect
98+
go.opentelemetry.io/otel/metric v1.33.0 // indirect
99+
go.opentelemetry.io/otel/trace v1.33.0 // indirect
100+
go.yaml.in/yaml/v2 v2.4.2 // indirect
101+
go.yaml.in/yaml/v3 v3.0.4 // indirect
102+
golang.org/x/crypto v0.40.0 // indirect
101103
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
102-
golang.org/x/net v0.35.0 // indirect
103-
golang.org/x/oauth2 v0.27.0 // indirect
104-
golang.org/x/sys v0.30.0 // indirect
105-
golang.org/x/term v0.29.0 // indirect
106-
golang.org/x/text v0.22.0 // indirect
107-
golang.org/x/time v0.10.0 // indirect
108-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
109-
google.golang.org/grpc v1.65.0 // indirect
110-
google.golang.org/protobuf v1.36.5 // indirect
104+
golang.org/x/net v0.42.0 // indirect
105+
golang.org/x/oauth2 v0.30.0 // indirect
106+
golang.org/x/sys v0.34.0 // indirect
107+
golang.org/x/term v0.33.0 // indirect
108+
golang.org/x/text v0.27.0 // indirect
109+
golang.org/x/time v0.12.0 // indirect
110+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
111+
google.golang.org/grpc v1.68.1 // indirect
112+
google.golang.org/protobuf v1.36.6 // indirect
111113
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
112114
gopkg.in/inf.v0 v0.9.1 // indirect
113115
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
114116
gopkg.in/yaml.v3 v3.0.1 // indirect
115-
k8s.io/apiextensions-apiserver v0.32.2 // indirect
116-
k8s.io/apiserver v0.32.2 // indirect
117-
k8s.io/component-base v0.32.2 // indirect
118-
k8s.io/kube-aggregator v0.32.1 // indirect
119-
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
117+
k8s.io/apiextensions-apiserver v0.33.3 // indirect
118+
k8s.io/apiserver v0.33.3 // indirect
119+
k8s.io/component-base v0.33.3 // indirect
120+
k8s.io/kube-aggregator v0.33.2 // indirect
121+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
120122
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
121123
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
122-
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
123-
sigs.k8s.io/yaml v1.4.0 // indirect
124+
sigs.k8s.io/randfill v1.0.0 // indirect
125+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
126+
sigs.k8s.io/yaml v1.5.0 // indirect
124127
)
128+
129+
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250628140032-d90c4fd18f59

0 commit comments

Comments
 (0)