From 796097ae401e8a9e0c26f1021fd73c085e3f410f Mon Sep 17 00:00:00 2001 From: Walter Fender Date: Thu, 2 May 2019 16:49:13 -0700 Subject: [PATCH] Staging the GCE Cloud Provider **What type of PR is this?** /kind cleanup **What this PR does / why we need it**: Staging the GCE Cloud Provider as part of KEP [20190125-removing-in-tree-providers](https://github.com/kubernetes/enhancements/blob/master/keps/sig-cloud-provider/20190125-removing-in-tree-providers.md). Staging repo setup here https://github.com/kubernetes/legacy-cloud-providers Moves the GCE cloud provider implementation to staging. This is in preparation for moving the cloud provider code out of tree entirely. However we need it in staging while the code needs to be consumed both in/out of tree. **Which issue(s) this PR fixes**: Fixes # **Special notes for your reviewer**: **Does this PR introduce a user-facing change?**: ``` NONE ``` Updated import dependency tracking. Factored in the cleanup from #77412 Minor fix to go.mod. --- go.mod | 1 - pkg/cloudprovider/providers/BUILD | 3 +-- pkg/cloudprovider/providers/providers.go | 2 +- pkg/controller/nodeipam/BUILD | 2 +- pkg/controller/nodeipam/ipam/BUILD | 2 +- pkg/controller/nodeipam/ipam/adapter.go | 2 +- pkg/controller/nodeipam/ipam/cloud_cidr_allocator.go | 2 +- pkg/controller/nodeipam/ipam/controller.go | 2 +- pkg/controller/nodeipam/node_ipam_controller_test.go | 2 +- pkg/volume/gcepd/BUILD | 2 +- pkg/volume/gcepd/attacher.go | 2 +- pkg/volume/gcepd/gce_pd.go | 2 +- pkg/volume/gcepd/gce_util.go | 2 +- staging/src/k8s.io/legacy-cloud-providers/BUILD | 1 + .../src/k8s.io/legacy-cloud-providers}/gce/BUILD | 3 ++- .../src/k8s.io/legacy-cloud-providers}/gce/OWNERS | 0 .../src/k8s.io/legacy-cloud-providers}/gce/doc.go | 2 +- .../src/k8s.io/legacy-cloud-providers}/gce/gce.go | 0 .../legacy-cloud-providers}/gce/gce_address_manager.go | 0 .../legacy-cloud-providers}/gce/gce_address_manager_test.go | 0 .../src/k8s.io/legacy-cloud-providers}/gce/gce_addresses.go | 0 .../src/k8s.io/legacy-cloud-providers}/gce/gce_alpha.go | 0 .../k8s.io/legacy-cloud-providers}/gce/gce_annotations.go | 0 .../legacy-cloud-providers}/gce/gce_annotations_test.go | 0 .../k8s.io/legacy-cloud-providers}/gce/gce_backendservice.go | 0 .../src/k8s.io/legacy-cloud-providers}/gce/gce_cert.go | 0 .../src/k8s.io/legacy-cloud-providers}/gce/gce_clusterid.go | 0 .../src/k8s.io/legacy-cloud-providers}/gce/gce_clusters.go | 0 .../src/k8s.io/legacy-cloud-providers}/gce/gce_disks.go | 0 .../src/k8s.io/legacy-cloud-providers}/gce/gce_disks_test.go | 0 .../src/k8s.io/legacy-cloud-providers}/gce/gce_fake.go | 0 .../src/k8s.io/legacy-cloud-providers}/gce/gce_firewall.go | 0 .../k8s.io/legacy-cloud-providers}/gce/gce_forwardingrule.go | 0 .../k8s.io/legacy-cloud-providers}/gce/gce_healthchecks.go | 0 .../legacy-cloud-providers}/gce/gce_healthchecks_test.go | 0 .../k8s.io/legacy-cloud-providers}/gce/gce_instancegroup.go | 0 .../src/k8s.io/legacy-cloud-providers}/gce/gce_instances.go | 0 .../src/k8s.io/legacy-cloud-providers}/gce/gce_interfaces.go | 0 .../k8s.io/legacy-cloud-providers}/gce/gce_loadbalancer.go | 0 .../legacy-cloud-providers}/gce/gce_loadbalancer_external.go | 0 .../gce/gce_loadbalancer_external_test.go | 0 .../legacy-cloud-providers}/gce/gce_loadbalancer_internal.go | 0 .../gce/gce_loadbalancer_internal_test.go | 0 .../legacy-cloud-providers}/gce/gce_loadbalancer_naming.go | 0 .../legacy-cloud-providers}/gce/gce_loadbalancer_test.go | 0 .../gce/gce_loadbalancer_utils_test.go | 0 .../legacy-cloud-providers}/gce/gce_networkendpointgroup.go | 0 .../src/k8s.io/legacy-cloud-providers}/gce/gce_routes.go | 0 .../k8s.io/legacy-cloud-providers}/gce/gce_securitypolicy.go | 0 .../src/k8s.io/legacy-cloud-providers}/gce/gce_targetpool.go | 0 .../k8s.io/legacy-cloud-providers}/gce/gce_targetproxy.go | 0 .../src/k8s.io/legacy-cloud-providers}/gce/gce_test.go | 0 .../src/k8s.io/legacy-cloud-providers}/gce/gce_tpu.go | 0 .../src/k8s.io/legacy-cloud-providers}/gce/gce_urlmap.go | 0 .../src/k8s.io/legacy-cloud-providers}/gce/gce_util.go | 0 .../src/k8s.io/legacy-cloud-providers}/gce/gce_util_test.go | 0 .../src/k8s.io/legacy-cloud-providers}/gce/gce_zones.go | 0 .../src/k8s.io/legacy-cloud-providers}/gce/metrics.go | 0 .../src/k8s.io/legacy-cloud-providers}/gce/metrics_test.go | 0 .../src/k8s.io/legacy-cloud-providers}/gce/support.go | 0 .../src/k8s.io/legacy-cloud-providers}/gce/token_source.go | 0 staging/src/k8s.io/legacy-cloud-providers/go.mod | 4 ++++ staging/src/k8s.io/legacy-cloud-providers/go.sum | 5 +++++ test/e2e/framework/providers/gce/BUILD | 2 +- test/e2e/framework/providers/gce/firewall.go | 2 +- test/e2e/framework/providers/gce/gce.go | 2 +- test/e2e/network/BUILD | 2 +- test/e2e/network/firewall.go | 2 +- test/e2e/network/network_tiers.go | 2 +- test/e2e/network/scale/localrun/BUILD | 2 +- test/e2e/network/scale/localrun/ingress_scale.go | 2 +- test/e2e/network/service.go | 2 +- test/integration/util/BUILD | 2 +- test/integration/util/cloud.go | 2 +- vendor/modules.txt | 1 + 75 files changed, 37 insertions(+), 27 deletions(-) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/BUILD (97%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/OWNERS (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/doc.go (90%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_address_manager.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_address_manager_test.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_addresses.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_alpha.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_annotations.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_annotations_test.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_backendservice.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_cert.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_clusterid.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_clusters.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_disks.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_disks_test.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_fake.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_firewall.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_forwardingrule.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_healthchecks.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_healthchecks_test.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_instancegroup.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_instances.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_interfaces.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_loadbalancer.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_loadbalancer_external.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_loadbalancer_external_test.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_loadbalancer_internal.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_loadbalancer_internal_test.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_loadbalancer_naming.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_loadbalancer_test.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_loadbalancer_utils_test.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_networkendpointgroup.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_routes.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_securitypolicy.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_targetpool.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_targetproxy.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_test.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_tpu.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_urlmap.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_util.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_util_test.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/gce_zones.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/metrics.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/metrics_test.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/support.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/gce/token_source.go (100%) diff --git a/go.mod b/go.mod index 3b68712c3ab..6345697a4cc 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/pkg/cloudprovider/providers/BUILD b/pkg/cloudprovider/providers/BUILD index 2305d470941..fd83ea439e8 100644 --- a/pkg/cloudprovider/providers/BUILD +++ b/pkg/cloudprovider/providers/BUILD @@ -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", ], ) @@ -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", diff --git a/pkg/cloudprovider/providers/providers.go b/pkg/cloudprovider/providers/providers.go index 23b25c3fae9..a93663bf52b 100644 --- a/pkg/cloudprovider/providers/providers.go +++ b/pkg/cloudprovider/providers/providers.go @@ -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" ) diff --git a/pkg/controller/nodeipam/BUILD b/pkg/controller/nodeipam/BUILD index c9378f00f4b..bedd8fa7763 100644 --- a/pkg/controller/nodeipam/BUILD +++ b/pkg/controller/nodeipam/BUILD @@ -11,7 +11,6 @@ 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", @@ -19,6 +18,7 @@ go_test( "//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", ], ) diff --git a/pkg/controller/nodeipam/ipam/BUILD b/pkg/controller/nodeipam/ipam/BUILD index d7dd6e6e1e1..b50ce534ddb 100644 --- a/pkg/controller/nodeipam/ipam/BUILD +++ b/pkg/controller/nodeipam/ipam/BUILD @@ -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", @@ -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", ], diff --git a/pkg/controller/nodeipam/ipam/adapter.go b/pkg/controller/nodeipam/ipam/adapter.go index 96402cf7812..54a998943de 100644 --- a/pkg/controller/nodeipam/ipam/adapter.go +++ b/pkg/controller/nodeipam/ipam/adapter.go @@ -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" ) diff --git a/pkg/controller/nodeipam/ipam/cloud_cidr_allocator.go b/pkg/controller/nodeipam/ipam/cloud_cidr_allocator.go index 21022555714..c5fde54632b 100644 --- a/pkg/controller/nodeipam/ipam/cloud_cidr_allocator.go +++ b/pkg/controller/nodeipam/ipam/cloud_cidr_allocator.go @@ -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 diff --git a/pkg/controller/nodeipam/ipam/controller.go b/pkg/controller/nodeipam/ipam/controller.go index 1c8253d671f..4710b74ea93 100644 --- a/pkg/controller/nodeipam/ipam/controller.go +++ b/pkg/controller/nodeipam/ipam/controller.go @@ -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. diff --git a/pkg/controller/nodeipam/node_ipam_controller_test.go b/pkg/controller/nodeipam/node_ipam_controller_test.go index c44ff60a348..50238804e1a 100644 --- a/pkg/controller/nodeipam/node_ipam_controller_test.go +++ b/pkg/controller/nodeipam/node_ipam_controller_test.go @@ -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) { diff --git a/pkg/volume/gcepd/BUILD b/pkg/volume/gcepd/BUILD index 892ee6cacaa..4b873daa32c 100644 --- a/pkg/volume/gcepd/BUILD +++ b/pkg/volume/gcepd/BUILD @@ -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", @@ -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", diff --git a/pkg/volume/gcepd/attacher.go b/pkg/volume/gcepd/attacher.go index 13a24fc5061..c3cecbbd06e 100644 --- a/pkg/volume/gcepd/attacher.go +++ b/pkg/volume/gcepd/attacher.go @@ -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 { diff --git a/pkg/volume/gcepd/gce_pd.go b/pkg/volume/gcepd/gce_pd.go index b6af4246624..f4f29a9c63d 100644 --- a/pkg/volume/gcepd/gce_pd.go +++ b/pkg/volume/gcepd/gce_pd.go @@ -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" ) diff --git a/pkg/volume/gcepd/gce_util.go b/pkg/volume/gcepd/gce_util.go index dd3b129aeb6..adc1ef4e987 100644 --- a/pkg/volume/gcepd/gce_util.go +++ b/pkg/volume/gcepd/gce_util.go @@ -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" ) diff --git a/staging/src/k8s.io/legacy-cloud-providers/BUILD b/staging/src/k8s.io/legacy-cloud-providers/BUILD index 693fdf288a5..be967137ea3 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/BUILD +++ b/staging/src/k8s.io/legacy-cloud-providers/BUILD @@ -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"], diff --git a/pkg/cloudprovider/providers/gce/BUILD b/staging/src/k8s.io/legacy-cloud-providers/gce/BUILD similarity index 97% rename from pkg/cloudprovider/providers/gce/BUILD rename to staging/src/k8s.io/legacy-cloud-providers/gce/BUILD index 322255092c2..1354a0ab1b7 100644 --- a/pkg/cloudprovider/providers/gce/BUILD +++ b/staging/src/k8s.io/legacy-cloud-providers/gce/BUILD @@ -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", diff --git a/pkg/cloudprovider/providers/gce/OWNERS b/staging/src/k8s.io/legacy-cloud-providers/gce/OWNERS similarity index 100% rename from pkg/cloudprovider/providers/gce/OWNERS rename to staging/src/k8s.io/legacy-cloud-providers/gce/OWNERS diff --git a/pkg/cloudprovider/providers/gce/doc.go b/staging/src/k8s.io/legacy-cloud-providers/gce/doc.go similarity index 90% rename from pkg/cloudprovider/providers/gce/doc.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/doc.go index 2981d939d04..bfee5f7f3ea 100644 --- a/pkg/cloudprovider/providers/gce/doc.go +++ b/staging/src/k8s.io/legacy-cloud-providers/gce/doc.go @@ -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" diff --git a/pkg/cloudprovider/providers/gce/gce.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce.go diff --git a/pkg/cloudprovider/providers/gce/gce_address_manager.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_address_manager.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_address_manager.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_address_manager.go diff --git a/pkg/cloudprovider/providers/gce/gce_address_manager_test.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_address_manager_test.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_address_manager_test.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_address_manager_test.go diff --git a/pkg/cloudprovider/providers/gce/gce_addresses.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_addresses.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_addresses.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_addresses.go diff --git a/pkg/cloudprovider/providers/gce/gce_alpha.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_alpha.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_alpha.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_alpha.go diff --git a/pkg/cloudprovider/providers/gce/gce_annotations.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_annotations.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_annotations.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_annotations.go diff --git a/pkg/cloudprovider/providers/gce/gce_annotations_test.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_annotations_test.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_annotations_test.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_annotations_test.go diff --git a/pkg/cloudprovider/providers/gce/gce_backendservice.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_backendservice.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_backendservice.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_backendservice.go diff --git a/pkg/cloudprovider/providers/gce/gce_cert.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_cert.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_cert.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_cert.go diff --git a/pkg/cloudprovider/providers/gce/gce_clusterid.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_clusterid.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_clusterid.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_clusterid.go diff --git a/pkg/cloudprovider/providers/gce/gce_clusters.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_clusters.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_clusters.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_clusters.go diff --git a/pkg/cloudprovider/providers/gce/gce_disks.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_disks.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_disks.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_disks.go diff --git a/pkg/cloudprovider/providers/gce/gce_disks_test.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_disks_test.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_disks_test.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_disks_test.go diff --git a/pkg/cloudprovider/providers/gce/gce_fake.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_fake.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_fake.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_fake.go diff --git a/pkg/cloudprovider/providers/gce/gce_firewall.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_firewall.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_firewall.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_firewall.go diff --git a/pkg/cloudprovider/providers/gce/gce_forwardingrule.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_forwardingrule.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_forwardingrule.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_forwardingrule.go diff --git a/pkg/cloudprovider/providers/gce/gce_healthchecks.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_healthchecks.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_healthchecks.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_healthchecks.go diff --git a/pkg/cloudprovider/providers/gce/gce_healthchecks_test.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_healthchecks_test.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_healthchecks_test.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_healthchecks_test.go diff --git a/pkg/cloudprovider/providers/gce/gce_instancegroup.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_instancegroup.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_instancegroup.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_instancegroup.go diff --git a/pkg/cloudprovider/providers/gce/gce_instances.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_instances.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_instances.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_instances.go diff --git a/pkg/cloudprovider/providers/gce/gce_interfaces.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_interfaces.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_interfaces.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_interfaces.go diff --git a/pkg/cloudprovider/providers/gce/gce_loadbalancer.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_loadbalancer.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer.go diff --git a/pkg/cloudprovider/providers/gce/gce_loadbalancer_external.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_external.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_loadbalancer_external.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_external.go diff --git a/pkg/cloudprovider/providers/gce/gce_loadbalancer_external_test.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_external_test.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_loadbalancer_external_test.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_external_test.go diff --git a/pkg/cloudprovider/providers/gce/gce_loadbalancer_internal.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_loadbalancer_internal.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal.go diff --git a/pkg/cloudprovider/providers/gce/gce_loadbalancer_internal_test.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal_test.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_loadbalancer_internal_test.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal_test.go diff --git a/pkg/cloudprovider/providers/gce/gce_loadbalancer_naming.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_naming.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_loadbalancer_naming.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_naming.go diff --git a/pkg/cloudprovider/providers/gce/gce_loadbalancer_test.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_test.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_loadbalancer_test.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_test.go diff --git a/pkg/cloudprovider/providers/gce/gce_loadbalancer_utils_test.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_utils_test.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_loadbalancer_utils_test.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_utils_test.go diff --git a/pkg/cloudprovider/providers/gce/gce_networkendpointgroup.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_networkendpointgroup.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_networkendpointgroup.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_networkendpointgroup.go diff --git a/pkg/cloudprovider/providers/gce/gce_routes.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_routes.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_routes.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_routes.go diff --git a/pkg/cloudprovider/providers/gce/gce_securitypolicy.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_securitypolicy.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_securitypolicy.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_securitypolicy.go diff --git a/pkg/cloudprovider/providers/gce/gce_targetpool.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_targetpool.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_targetpool.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_targetpool.go diff --git a/pkg/cloudprovider/providers/gce/gce_targetproxy.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_targetproxy.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_targetproxy.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_targetproxy.go diff --git a/pkg/cloudprovider/providers/gce/gce_test.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_test.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_test.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_test.go diff --git a/pkg/cloudprovider/providers/gce/gce_tpu.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_tpu.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_tpu.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_tpu.go diff --git a/pkg/cloudprovider/providers/gce/gce_urlmap.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_urlmap.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_urlmap.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_urlmap.go diff --git a/pkg/cloudprovider/providers/gce/gce_util.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_util.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_util.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_util.go diff --git a/pkg/cloudprovider/providers/gce/gce_util_test.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_util_test.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_util_test.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_util_test.go diff --git a/pkg/cloudprovider/providers/gce/gce_zones.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_zones.go similarity index 100% rename from pkg/cloudprovider/providers/gce/gce_zones.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/gce_zones.go diff --git a/pkg/cloudprovider/providers/gce/metrics.go b/staging/src/k8s.io/legacy-cloud-providers/gce/metrics.go similarity index 100% rename from pkg/cloudprovider/providers/gce/metrics.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/metrics.go diff --git a/pkg/cloudprovider/providers/gce/metrics_test.go b/staging/src/k8s.io/legacy-cloud-providers/gce/metrics_test.go similarity index 100% rename from pkg/cloudprovider/providers/gce/metrics_test.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/metrics_test.go diff --git a/pkg/cloudprovider/providers/gce/support.go b/staging/src/k8s.io/legacy-cloud-providers/gce/support.go similarity index 100% rename from pkg/cloudprovider/providers/gce/support.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/support.go diff --git a/pkg/cloudprovider/providers/gce/token_source.go b/staging/src/k8s.io/legacy-cloud-providers/gce/token_source.go similarity index 100% rename from pkg/cloudprovider/providers/gce/token_source.go rename to staging/src/k8s.io/legacy-cloud-providers/gce/token_source.go diff --git a/staging/src/k8s.io/legacy-cloud-providers/go.mod b/staging/src/k8s.io/legacy-cloud-providers/go.mod index 8919928a9c1..d3456aa4281 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/go.mod +++ b/staging/src/k8s.io/legacy-cloud-providers/go.mod @@ -5,8 +5,10 @@ module k8s.io/legacy-cloud-providers go 1.12 require ( + 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 github.com/aws/aws-sdk-go v1.16.26 github.com/dnaeon/go-vcr v1.0.1 // indirect github.com/marstr/guid v0.0.0-20170427235115-8bdf7d1a087c // indirect @@ -16,6 +18,8 @@ require ( github.com/stretchr/testify v1.2.2 github.com/vmware/govmomi v0.20.0 golang.org/x/crypto v0.0.0-20181025213731-e84da0312774 + golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a + google.golang.org/api v0.0.0-20181220000619-583d854617af gopkg.in/gcfg.v1 v1.2.0 gopkg.in/warnings.v0 v0.1.1 // indirect k8s.io/api v0.0.0 diff --git a/staging/src/k8s.io/legacy-cloud-providers/go.sum b/staging/src/k8s.io/legacy-cloud-providers/go.sum index 37f0a3093ad..e4b2adf3403 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/go.sum +++ b/staging/src/k8s.io/legacy-cloud-providers/go.sum @@ -1,3 +1,4 @@ +cloud.google.com/go v0.34.0 h1:eOI3/cP2VTU6uZLDYAoic+eyzzB9YyGmJ7eIjl8rOPg= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/Azure/azure-sdk-for-go v21.4.0+incompatible h1:rsdM2HqR64WhJv7YqMAjWOLAebbx4c9/gzcLC7yoDDE= github.com/Azure/azure-sdk-for-go v21.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= @@ -5,6 +6,8 @@ github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX github.com/Azure/go-autorest v11.1.2+incompatible h1:viZ3tV5l4gE2Sw0xrasFHytCGtzYCrT+um/rrSQ1BfA= github.com/Azure/go-autorest v11.1.2+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/BurntSushi/toml v0.3.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20181220005116-f8e995905100 h1:EXrpgbxknFeRM6X/OgRqcbVtl5zqUFD5eV8O8M1BLzo= +github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20181220005116-f8e995905100/go.mod h1:iroGtC8B3tQiqtds1l+mgk/BBOrxbqjH+eUfFQYRc14= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= @@ -133,6 +136,8 @@ golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5f golang.org/x/time v0.0.0-20161028155119-f51c12702a4d h1:TnM+PKb3ylGmZvyPXmo9m/wktg7Jn/a/fNmr33HSj8g= golang.org/x/time v0.0.0-20161028155119-f51c12702a4d/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20190313210603-aa82965741a9/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +google.golang.org/api v0.0.0-20181220000619-583d854617af h1:iQMS7JKv/0w/iiWf1M49Cg3dmOkBoBZT5KheqPDpaac= +google.golang.org/api v0.0.0-20181220000619-583d854617af/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20170731182057-09f6ed296fc6/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= diff --git a/test/e2e/framework/providers/gce/BUILD b/test/e2e/framework/providers/gce/BUILD index 76a57c3d4e0..40593c78cd6 100644 --- a/test/e2e/framework/providers/gce/BUILD +++ b/test/e2e/framework/providers/gce/BUILD @@ -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", @@ -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", diff --git a/test/e2e/framework/providers/gce/firewall.go b/test/e2e/framework/providers/gce/firewall.go index 82d5b145f53..de3e4ff9e6b 100644 --- a/test/e2e/framework/providers/gce/firewall.go +++ b/test/e2e/framework/providers/gce/firewall.go @@ -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. diff --git a/test/e2e/framework/providers/gce/gce.go b/test/e2e/framework/providers/gce/gce.go index 4758b5091a1..e0333d09bdf 100644 --- a/test/e2e/framework/providers/gce/gce.go +++ b/test/e2e/framework/providers/gce/gce.go @@ -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() { diff --git a/test/e2e/network/BUILD b/test/e2e/network/BUILD index 495843b22a0..657601f733d 100644 --- a/test/e2e/network/BUILD +++ b/test/e2e/network/BUILD @@ -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", @@ -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", diff --git a/test/e2e/network/firewall.go b/test/e2e/network/firewall.go index c5dd02bb2a4..ecce3c4195d 100644 --- a/test/e2e/network/firewall.go +++ b/test/e2e/network/firewall.go @@ -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" diff --git a/test/e2e/network/network_tiers.go b/test/e2e/network/network_tiers.go index 438fcc9147b..c5c7b09bde3 100644 --- a/test/e2e/network/network_tiers.go +++ b/test/e2e/network/network_tiers.go @@ -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" diff --git a/test/e2e/network/scale/localrun/BUILD b/test/e2e/network/scale/localrun/BUILD index 5066276eee6..e61abbfb71b 100644 --- a/test/e2e/network/scale/localrun/BUILD +++ b/test/e2e/network/scale/localrun/BUILD @@ -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", diff --git a/test/e2e/network/scale/localrun/ingress_scale.go b/test/e2e/network/scale/localrun/ingress_scale.go index 2cb237ec51b..ecd9d7c8b9a 100644 --- a/test/e2e/network/scale/localrun/ingress_scale.go +++ b/test/e2e/network/scale/localrun/ingress_scale.go @@ -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" diff --git a/test/e2e/network/service.go b/test/e2e/network/service.go index b03fedf0191..63285ab6ac7 100644 --- a/test/e2e/network/service.go +++ b/test/e2e/network/service.go @@ -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" diff --git a/test/integration/util/BUILD b/test/integration/util/BUILD index fa9d69305a6..a92fd0f5e5a 100644 --- a/test/integration/util/BUILD +++ b/test/integration/util/BUILD @@ -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", @@ -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", diff --git a/test/integration/util/cloud.go b/test/integration/util/cloud.go index c701a5410b3..3c6fb84d312 100644 --- a/test/integration/util/cloud.go +++ b/test/integration/util/cloud.go @@ -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 ( diff --git a/vendor/modules.txt b/vendor/modules.txt index f6a9043e5d1..94a09ee2500 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -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