Skip to content

Commit a7366a2

Browse files
authored
Merge pull request #6953 from azylinski/rm-legacy-cloud-providers
Remove deprecated k8s.io/legacy-cloud-providers
2 parents de0c1cb + dcc3b63 commit a7366a2

File tree

121 files changed

+150324
-45531
lines changed

Some content is hidden

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

121 files changed

+150324
-45531
lines changed

cluster-autoscaler/cloudprovider/gce/gce_manager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import (
3737
"k8s.io/client-go/util/workqueue"
3838

3939
apiv1 "k8s.io/api/core/v1"
40-
provider_gce "k8s.io/legacy-cloud-providers/gce"
40+
provider_gce "k8s.io/cloud-provider-gcp/providers/gce"
4141

4242
"cloud.google.com/go/compute/metadata"
4343
"golang.org/x/oauth2"

cluster-autoscaler/go.mod

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ require (
3838
golang.org/x/net v0.25.0
3939
golang.org/x/oauth2 v0.20.0
4040
golang.org/x/sys v0.20.0
41-
google.golang.org/api v0.126.0
41+
google.golang.org/api v0.151.0
4242
google.golang.org/grpc v1.59.0
4343
google.golang.org/protobuf v1.33.0
4444
gopkg.in/gcfg.v1 v1.2.3
@@ -50,12 +50,12 @@ require (
5050
k8s.io/client-go v0.31.0-alpha.2
5151
k8s.io/cloud-provider v0.30.0-alpha.3
5252
k8s.io/cloud-provider-aws v1.27.0
53+
k8s.io/cloud-provider-gcp/providers v0.28.2
5354
k8s.io/component-base v0.31.0-alpha.2
5455
k8s.io/component-helpers v0.31.0-alpha.2
5556
k8s.io/klog/v2 v2.120.1
5657
k8s.io/kubelet v0.31.0-alpha.2
5758
k8s.io/kubernetes v1.31.0-alpha.2
58-
k8s.io/legacy-cloud-providers v0.0.0
5959
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
6060
sigs.k8s.io/cloud-provider-azure v1.28.0
6161
sigs.k8s.io/yaml v1.4.0
@@ -71,7 +71,7 @@ require (
7171
github.com/Azure/go-autorest/logger v0.2.1 // indirect
7272
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
7373
github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1 // indirect
74-
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.18.1-0.20220218231025-f11817397a1b // indirect
74+
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.25.0 // indirect
7575
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect
7676
github.com/Microsoft/go-winio v0.6.0 // indirect
7777
github.com/Microsoft/hcsshim v0.8.25 // indirect
@@ -120,8 +120,8 @@ require (
120120
github.com/google/gofuzz v1.2.0 // indirect
121121
github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af // indirect
122122
github.com/google/s2a-go v0.1.7 // indirect
123-
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
124-
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
123+
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
124+
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
125125
github.com/gorilla/websocket v1.5.0 // indirect
126126
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
127127
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
@@ -186,10 +186,9 @@ require (
186186
golang.org/x/text v0.15.0 // indirect
187187
golang.org/x/time v0.3.0 // indirect
188188
golang.org/x/tools v0.21.0 // indirect
189-
google.golang.org/appengine v1.6.7 // indirect
190-
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
191-
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
192-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
189+
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
190+
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
191+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
193192
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
194193
gopkg.in/inf.v0 v0.9.1 // indirect
195194
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
@@ -259,8 +258,6 @@ replace k8s.io/kubectl => k8s.io/kubectl v0.31.0-alpha.2
259258

260259
replace k8s.io/kubelet => k8s.io/kubelet v0.31.0-alpha.2
261260

262-
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.0-alpha.3
263-
264261
replace k8s.io/metrics => k8s.io/metrics v0.31.0-alpha.2
265262

266263
replace k8s.io/mount-utils => k8s.io/mount-utils v0.31.0-alpha.2

cluster-autoscaler/go.sum

Lines changed: 16 additions & 410 deletions
Large diffs are not rendered by default.

cluster-autoscaler/vendor/github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/context.go

Lines changed: 16 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cluster-autoscaler/vendor/github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/gce_projects.go

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)