Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Staging the GCE Cloud Provider #77374

Merged
merged 1 commit into from
May 8, 2019
Merged

Staging the GCE Cloud Provider #77374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ go 1.12

require (
bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690
cloud.google.com/go v0.34.0
github.com/Azure/azure-sdk-for-go v21.4.0+incompatible
github.com/Azure/go-autorest v11.1.2+incompatible
github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20181220005116-f8e995905100
Expand Down
3 changes: 1 addition & 2 deletions pkg/cloudprovider/providers/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ go_library(
],
deps = [
"//pkg/cloudprovider/providers/cloudstack:go_default_library",
"//pkg/cloudprovider/providers/gce:go_default_library",
"//pkg/cloudprovider/providers/openstack:go_default_library",
"//pkg/cloudprovider/providers/ovirt:go_default_library",
"//pkg/cloudprovider/providers/photon:go_default_library",
"//staging/src/k8s.io/legacy-cloud-providers/aws:go_default_library",
"//staging/src/k8s.io/legacy-cloud-providers/azure:go_default_library",
"//staging/src/k8s.io/legacy-cloud-providers/gce:go_default_library",
"//staging/src/k8s.io/legacy-cloud-providers/vsphere:go_default_library",
],
)
Expand All @@ -37,7 +37,6 @@ filegroup(
":package-srcs",
"//pkg/cloudprovider/providers/cloudstack:all-srcs",
"//pkg/cloudprovider/providers/fake:all-srcs",
"//pkg/cloudprovider/providers/gce:all-srcs",
"//pkg/cloudprovider/providers/openstack:all-srcs",
"//pkg/cloudprovider/providers/ovirt:all-srcs",
"//pkg/cloudprovider/providers/photon:all-srcs",
Expand Down
2 changes: 1 addition & 1 deletion pkg/cloudprovider/providers/providers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ package cloudprovider
import (
// Cloud providers
_ "k8s.io/kubernetes/pkg/cloudprovider/providers/cloudstack"
_ "k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
_ "k8s.io/kubernetes/pkg/cloudprovider/providers/openstack"
_ "k8s.io/kubernetes/pkg/cloudprovider/providers/ovirt"
_ "k8s.io/kubernetes/pkg/cloudprovider/providers/photon"
_ "k8s.io/legacy-cloud-providers/aws"
_ "k8s.io/legacy-cloud-providers/azure"
_ "k8s.io/legacy-cloud-providers/gce"
_ "k8s.io/legacy-cloud-providers/vsphere"
)
2 changes: 1 addition & 1 deletion pkg/controller/nodeipam/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ go_test(
srcs = ["node_ipam_controller_test.go"],
embed = [":go_default_library"],
deps = [
"//pkg/cloudprovider/providers/gce:go_default_library",
"//pkg/controller:go_default_library",
"//pkg/controller/nodeipam/ipam:go_default_library",
"//pkg/controller/testutil:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/client-go/informers:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library",
"//staging/src/k8s.io/legacy-cloud-providers/gce:go_default_library",
],
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/nodeipam/ipam/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ go_library(
],
importpath = "k8s.io/kubernetes/pkg/controller/nodeipam/ipam",
deps = [
"//pkg/cloudprovider/providers/gce:go_default_library",
"//pkg/controller:go_default_library",
"//pkg/controller/nodeipam/ipam/cidrset:go_default_library",
"//pkg/controller/nodeipam/ipam/sync:go_default_library",
Expand All @@ -67,6 +66,7 @@ go_library(
"//staging/src/k8s.io/client-go/tools/cache:go_default_library",
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
"//staging/src/k8s.io/cloud-provider:go_default_library",
"//staging/src/k8s.io/legacy-cloud-providers/gce:go_default_library",
"//staging/src/k8s.io/metrics/pkg/client/clientset/versioned/scheme:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
],
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/nodeipam/ipam/adapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
clientset "k8s.io/client-go/kubernetes"
v1core "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/client-go/tools/record"
"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
nodeutil "k8s.io/kubernetes/pkg/util/node"
"k8s.io/legacy-cloud-providers/gce"
"k8s.io/metrics/pkg/client/clientset/versioned/scheme"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/nodeipam/ipam/cloud_cidr_allocator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ import (
"k8s.io/client-go/kubernetes/scheme"
v1core "k8s.io/client-go/kubernetes/typed/core/v1"
cloudprovider "k8s.io/cloud-provider"
"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
"k8s.io/kubernetes/pkg/controller"
nodeutil "k8s.io/kubernetes/pkg/controller/util/node"
schedulerapi "k8s.io/kubernetes/pkg/scheduler/api"
utilnode "k8s.io/kubernetes/pkg/util/node"
utiltaints "k8s.io/kubernetes/pkg/util/taints"
"k8s.io/legacy-cloud-providers/gce"
)

// nodeProcessingInfo tracks information related to current nodes in processing
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/nodeipam/ipam/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ import (
clientset "k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/cache"
cloudprovider "k8s.io/cloud-provider"
"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
"k8s.io/kubernetes/pkg/controller/nodeipam/ipam/cidrset"
nodesync "k8s.io/kubernetes/pkg/controller/nodeipam/ipam/sync"
nodeutil "k8s.io/kubernetes/pkg/controller/util/node"
"k8s.io/legacy-cloud-providers/gce"
)

// Config for the IPAM controller.
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/nodeipam/node_ipam_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/informers"
"k8s.io/client-go/kubernetes/fake"
"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/controller/nodeipam/ipam"
"k8s.io/kubernetes/pkg/controller/testutil"
"k8s.io/legacy-cloud-providers/gce"
)

func newTestNodeIpamController(clusterCIDR, serviceCIDR *net.IPNet, nodeCIDRMaskSize int, allocatorType ipam.CIDRAllocatorType) (*Controller, error) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/volume/gcepd/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ go_library(
],
importpath = "k8s.io/kubernetes/pkg/volume/gcepd",
deps = [
"//pkg/cloudprovider/providers/gce:go_default_library",
"//pkg/features:go_default_library",
"//pkg/util/mount:go_default_library",
"//pkg/volume:go_default_library",
Expand All @@ -32,6 +31,7 @@ go_library(
"//staging/src/k8s.io/cloud-provider:go_default_library",
"//staging/src/k8s.io/cloud-provider/volume:go_default_library",
"//staging/src/k8s.io/cloud-provider/volume/helpers:go_default_library",
"//staging/src/k8s.io/legacy-cloud-providers/gce:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
"//vendor/k8s.io/utils/exec:go_default_library",
"//vendor/k8s.io/utils/path:go_default_library",
Expand Down
2 changes: 1 addition & 1 deletion pkg/volume/gcepd/attacher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/klog"
"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
"k8s.io/kubernetes/pkg/util/mount"
"k8s.io/kubernetes/pkg/volume"
volumeutil "k8s.io/kubernetes/pkg/volume/util"
"k8s.io/legacy-cloud-providers/gce"
)

type gcePersistentDiskAttacher struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/volume/gcepd/gce_pd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ import (
utilfeature "k8s.io/apiserver/pkg/util/feature"
volumehelpers "k8s.io/cloud-provider/volume/helpers"
"k8s.io/klog"
gcecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
"k8s.io/kubernetes/pkg/features"
"k8s.io/kubernetes/pkg/util/mount"
"k8s.io/kubernetes/pkg/volume"
"k8s.io/kubernetes/pkg/volume/util"
gcecloud "k8s.io/legacy-cloud-providers/gce"
utilstrings "k8s.io/utils/strings"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/volume/gcepd/gce_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ import (
cloudvolume "k8s.io/cloud-provider/volume"
volumehelpers "k8s.io/cloud-provider/volume/helpers"
"k8s.io/klog"
gcecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
"k8s.io/kubernetes/pkg/util/mount"
"k8s.io/kubernetes/pkg/volume"
volumeutil "k8s.io/kubernetes/pkg/volume/util"
gcecloud "k8s.io/legacy-cloud-providers/gce"
"k8s.io/utils/exec"
utilpath "k8s.io/utils/path"
)
Expand Down
1 change: 1 addition & 0 deletions staging/src/k8s.io/legacy-cloud-providers/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ filegroup(
":package-srcs",
"//staging/src/k8s.io/legacy-cloud-providers/aws:all-srcs",
"//staging/src/k8s.io/legacy-cloud-providers/azure:all-srcs",
"//staging/src/k8s.io/legacy-cloud-providers/gce:all-srcs",
"//staging/src/k8s.io/legacy-cloud-providers/vsphere:all-srcs",
],
tags = ["automanaged"],
Expand Down
3 changes: 2 additions & 1 deletion pkg/cloudprovider/providers/gce/BUILD → ...c/k8s.io/legacy-cloud-providers/gce/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ go_library(
"support.go",
"token_source.go",
],
importpath = "k8s.io/kubernetes/pkg/cloudprovider/providers/gce",
importmap = "k8s.io/kubernetes/vendor/k8s.io/legacy-cloud-providers/gce",
importpath = "k8s.io/legacy-cloud-providers/gce",
visibility = ["//visibility:public"],
deps = [
"//staging/src/k8s.io/api/core/v1:go_default_library",
Expand Down
0 pkg/cloudprovider/providers/gce/OWNERS → .../k8s.io/legacy-cloud-providers/gce/OWNERS
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/cloudprovider/providers/gce/doc.go → .../k8s.io/legacy-cloud-providers/gce/doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ limitations under the License.

// Package gce is an implementation of Interface, LoadBalancer
// and Instances for Google Compute Engine.
package gce // import "k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
package gce // import "k8s.io/legacy-cloud-providers/gce"
0 pkg/cloudprovider/providers/gce/gce.go → .../k8s.io/legacy-cloud-providers/gce/gce.go
View file
Open in desktop
File renamed without changes.
0 ...ider/providers/gce/gce_address_manager.go → ...loud-providers/gce/gce_address_manager.go
View file
Open in desktop
File renamed without changes.
0 ...providers/gce/gce_address_manager_test.go → ...providers/gce/gce_address_manager_test.go
View file
Open in desktop
File renamed without changes.
0 ...udprovider/providers/gce/gce_addresses.go → ...gacy-cloud-providers/gce/gce_addresses.go
View file
Open in desktop
File renamed without changes.
0 pkg/cloudprovider/providers/gce/gce_alpha.go → ...o/legacy-cloud-providers/gce/gce_alpha.go
View file
Open in desktop
File renamed without changes.
0 ...provider/providers/gce/gce_annotations.go → ...cy-cloud-providers/gce/gce_annotations.go
View file
Open in desktop
File renamed without changes.
0 ...der/providers/gce/gce_annotations_test.go → ...oud-providers/gce/gce_annotations_test.go
View file
Open in desktop
File renamed without changes.
0 ...vider/providers/gce/gce_backendservice.go → ...cloud-providers/gce/gce_backendservice.go
View file
Open in desktop
File renamed without changes.
0 pkg/cloudprovider/providers/gce/gce_cert.go → ...io/legacy-cloud-providers/gce/gce_cert.go
View file
Open in desktop
File renamed without changes.
0 ...udprovider/providers/gce/gce_clusterid.go → ...gacy-cloud-providers/gce/gce_clusterid.go
View file
Open in desktop
File renamed without changes.
0 ...oudprovider/providers/gce/gce_clusters.go → ...egacy-cloud-providers/gce/gce_clusters.go
View file
Open in desktop
File renamed without changes.
0 pkg/cloudprovider/providers/gce/gce_disks.go → ...o/legacy-cloud-providers/gce/gce_disks.go
View file
Open in desktop
File renamed without changes.
0 ...dprovider/providers/gce/gce_disks_test.go → ...acy-cloud-providers/gce/gce_disks_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/cloudprovider/providers/gce/gce_fake.go → ...io/legacy-cloud-providers/gce/gce_fake.go
View file
Open in desktop
File renamed without changes.
0 ...oudprovider/providers/gce/gce_firewall.go → ...egacy-cloud-providers/gce/gce_firewall.go
View file
Open in desktop
File renamed without changes.
0 ...vider/providers/gce/gce_forwardingrule.go → ...cloud-providers/gce/gce_forwardingrule.go
View file
Open in desktop
File renamed without changes.
0 ...rovider/providers/gce/gce_healthchecks.go → ...y-cloud-providers/gce/gce_healthchecks.go
View file
Open in desktop
File renamed without changes.
0 ...er/providers/gce/gce_healthchecks_test.go → ...ud-providers/gce/gce_healthchecks_test.go
View file
Open in desktop
File renamed without changes.
0 ...ovider/providers/gce/gce_instancegroup.go → ...-cloud-providers/gce/gce_instancegroup.go
View file
Open in desktop
File renamed without changes.
0 ...udprovider/providers/gce/gce_instances.go → ...gacy-cloud-providers/gce/gce_instances.go
View file
Open in desktop
File renamed without changes.
0 ...dprovider/providers/gce/gce_interfaces.go → ...acy-cloud-providers/gce/gce_interfaces.go
View file
Open in desktop
File renamed without changes.
0 ...rovider/providers/gce/gce_loadbalancer.go → ...y-cloud-providers/gce/gce_loadbalancer.go
View file
Open in desktop
File renamed without changes.
0 ...roviders/gce/gce_loadbalancer_external.go → ...roviders/gce/gce_loadbalancer_external.go
View file
Open in desktop
File renamed without changes.
0 ...ers/gce/gce_loadbalancer_external_test.go → ...ers/gce/gce_loadbalancer_external_test.go
View file
Open in desktop
File renamed without changes.
0 ...roviders/gce/gce_loadbalancer_internal.go → ...roviders/gce/gce_loadbalancer_internal.go
View file
Open in desktop
File renamed without changes.
0 ...ers/gce/gce_loadbalancer_internal_test.go → ...ers/gce/gce_loadbalancer_internal_test.go
View file
Open in desktop
File renamed without changes.
0 .../providers/gce/gce_loadbalancer_naming.go → ...-providers/gce/gce_loadbalancer_naming.go
View file
Open in desktop
File renamed without changes.
0 ...er/providers/gce/gce_loadbalancer_test.go → ...ud-providers/gce/gce_loadbalancer_test.go
View file
Open in desktop
File renamed without changes.
0 ...viders/gce/gce_loadbalancer_utils_test.go → ...viders/gce/gce_loadbalancer_utils_test.go
View file
Open in desktop
File renamed without changes.
0 ...providers/gce/gce_networkendpointgroup.go → ...providers/gce/gce_networkendpointgroup.go
View file
Open in desktop
File renamed without changes.
0 ...cloudprovider/providers/gce/gce_routes.go → .../legacy-cloud-providers/gce/gce_routes.go
View file
Open in desktop
File renamed without changes.
0 ...vider/providers/gce/gce_securitypolicy.go → ...cloud-providers/gce/gce_securitypolicy.go
View file
Open in desktop
File renamed without changes.
0 ...dprovider/providers/gce/gce_targetpool.go → ...acy-cloud-providers/gce/gce_targetpool.go
View file
Open in desktop
File renamed without changes.
0 ...provider/providers/gce/gce_targetproxy.go → ...cy-cloud-providers/gce/gce_targetproxy.go
View file
Open in desktop
File renamed without changes.
0 pkg/cloudprovider/providers/gce/gce_test.go → ...io/legacy-cloud-providers/gce/gce_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/cloudprovider/providers/gce/gce_tpu.go → ....io/legacy-cloud-providers/gce/gce_tpu.go
View file
Open in desktop
File renamed without changes.
0 ...cloudprovider/providers/gce/gce_urlmap.go → .../legacy-cloud-providers/gce/gce_urlmap.go
View file
Open in desktop
File renamed without changes.
0 pkg/cloudprovider/providers/gce/gce_util.go → ...io/legacy-cloud-providers/gce/gce_util.go
View file
Open in desktop
File renamed without changes.
0 ...udprovider/providers/gce/gce_util_test.go → ...gacy-cloud-providers/gce/gce_util_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/cloudprovider/providers/gce/gce_zones.go → ...o/legacy-cloud-providers/gce/gce_zones.go
View file
Open in desktop
File renamed without changes.
0 pkg/cloudprovider/providers/gce/metrics.go → ....io/legacy-cloud-providers/gce/metrics.go
View file
Open in desktop
File renamed without changes.
0 ...oudprovider/providers/gce/metrics_test.go → ...egacy-cloud-providers/gce/metrics_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/cloudprovider/providers/gce/support.go → ....io/legacy-cloud-providers/gce/support.go
View file
Open in desktop
File renamed without changes.
0 ...oudprovider/providers/gce/token_source.go → ...egacy-cloud-providers/gce/token_source.go
View file
Open in desktop
File renamed without changes.
4 changes: 4 additions & 0 deletions staging/src/k8s.io/legacy-cloud-providers/go.mod
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions staging/src/k8s.io/legacy-cloud-providers/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/e2e/framework/providers/gce/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ go_library(
importpath = "k8s.io/kubernetes/test/e2e/framework/providers/gce",
visibility = ["//visibility:public"],
deps = [
"//pkg/cloudprovider/providers/gce:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library",
Expand All @@ -22,6 +21,7 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
"//staging/src/k8s.io/cloud-provider:go_default_library",
"//staging/src/k8s.io/legacy-cloud-providers/gce:go_default_library",
"//test/e2e/framework:go_default_library",
"//test/utils:go_default_library",
"//vendor/github.com/onsi/ginkgo:go_default_library",
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/framework/providers/gce/firewall.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ import (
"time"

compute "google.golang.org/api/compute/v1"
gcecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/gce"

"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/wait"
cloudprovider "k8s.io/cloud-provider"
"k8s.io/kubernetes/test/e2e/framework"
gcecloud "k8s.io/legacy-cloud-providers/gce"
)

// MakeFirewallNameForLBService return the expected firewall name for a LB service.
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/framework/providers/gce/gce.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
"k8s.io/apimachinery/pkg/util/uuid"
"k8s.io/apimachinery/pkg/util/wait"
clientset "k8s.io/client-go/kubernetes"
gcecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
"k8s.io/kubernetes/test/e2e/framework"
gcecloud "k8s.io/legacy-cloud-providers/gce"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/network/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ go_library(
importpath = "k8s.io/kubernetes/test/e2e/network",
deps = [
"//pkg/apis/core:go_default_library",
"//pkg/cloudprovider/providers/gce:go_default_library",
"//pkg/controller/endpoint:go_default_library",
"//pkg/master/ports:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
Expand All @@ -57,6 +56,7 @@ go_library(
"//staging/src/k8s.io/client-go/util/flowcontrol:go_default_library",
"//staging/src/k8s.io/client-go/util/workqueue:go_default_library",
"//staging/src/k8s.io/cloud-provider:go_default_library",
"//staging/src/k8s.io/legacy-cloud-providers/gce:go_default_library",
"//test/e2e/framework:go_default_library",
"//test/e2e/framework/auth:go_default_library",
"//test/e2e/framework/endpoints:go_default_library",
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/network/firewall.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
clientset "k8s.io/client-go/kubernetes"
cloudprovider "k8s.io/cloud-provider"
gcecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
"k8s.io/kubernetes/pkg/master/ports"
"k8s.io/kubernetes/test/e2e/framework"
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
"k8s.io/kubernetes/test/e2e/framework/providers/gce"
gcecloud "k8s.io/legacy-cloud-providers/gce"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/network/network_tiers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ import (
"k8s.io/apimachinery/pkg/util/wait"
clientset "k8s.io/client-go/kubernetes"
cloudprovider "k8s.io/cloud-provider"
gcecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
"k8s.io/kubernetes/test/e2e/framework"
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
"k8s.io/kubernetes/test/e2e/framework/providers/gce"
gcecloud "k8s.io/legacy-cloud-providers/gce"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/network/scale/localrun/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ go_library(
importpath = "k8s.io/kubernetes/test/e2e/network/scale/localrun",
visibility = ["//visibility:private"],
deps = [
"//pkg/cloudprovider/providers/gce:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
"//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library",
"//staging/src/k8s.io/legacy-cloud-providers/gce:go_default_library",
"//test/e2e/framework:go_default_library",
"//test/e2e/framework/ingress:go_default_library",
"//test/e2e/framework/providers/gce:go_default_library",
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/network/scale/localrun/ingress_scale.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
clientset "k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"
gcecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
gcecloud "k8s.io/legacy-cloud-providers/gce"

"k8s.io/kubernetes/test/e2e/framework"
"k8s.io/kubernetes/test/e2e/framework/ingress"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/network/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ import (
"k8s.io/apimachinery/pkg/util/wait"
clientset "k8s.io/client-go/kubernetes"
cloudprovider "k8s.io/cloud-provider"
gcecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
"k8s.io/kubernetes/pkg/controller/endpoint"
"k8s.io/kubernetes/test/e2e/framework"
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
"k8s.io/kubernetes/test/e2e/framework/providers/gce"
imageutils "k8s.io/kubernetes/test/utils/image"
gcecloud "k8s.io/legacy-cloud-providers/gce"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down
2 changes: 1 addition & 1 deletion test/integration/util/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ go_library(
importpath = "k8s.io/kubernetes/test/integration/util",
deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/cloudprovider/providers/gce:go_default_library",
"//pkg/scheduler:go_default_library",
"//pkg/scheduler/algorithmprovider/defaults:go_default_library",
"//pkg/scheduler/api:go_default_library",
Expand All @@ -24,6 +23,7 @@ go_library(
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
"//staging/src/k8s.io/legacy-cloud-providers/gce:go_default_library",
"//test/integration/framework:go_default_library",
"//vendor/github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud:go_default_library",
"//vendor/golang.org/x/oauth2:go_default_library",
Expand Down
2 changes: 1 addition & 1 deletion test/integration/util/cloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud"
"golang.org/x/oauth2"
"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
"k8s.io/legacy-cloud-providers/gce"
)

const (
Expand Down
1 change: 1 addition & 0 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1629,6 +1629,7 @@ k8s.io/kubelet/config/v1beta1
k8s.io/legacy-cloud-providers/aws
k8s.io/legacy-cloud-providers/azure
k8s.io/legacy-cloud-providers/azure/auth
k8s.io/legacy-cloud-providers/gce
k8s.io/legacy-cloud-providers/vsphere
k8s.io/legacy-cloud-providers/vsphere/testing
k8s.io/legacy-cloud-providers/vsphere/vclib
Expand Down