From 6f5cf1a6e0c86a9b1a91651d77d8b5473b0ea6cf Mon Sep 17 00:00:00 2001 From: Mike Crute Date: Thu, 2 May 2019 10:59:06 -0700 Subject: [PATCH] Staging legacy AWS cloud provider --- pkg/cloudprovider/providers/BUILD | 3 +- pkg/cloudprovider/providers/providers.go | 2 +- pkg/volume/awsebs/BUILD | 4 +-- pkg/volume/awsebs/attacher.go | 2 +- pkg/volume/awsebs/attacher_test.go | 2 +- pkg/volume/awsebs/aws_ebs.go | 2 +- pkg/volume/awsebs/aws_ebs_block.go | 2 +- pkg/volume/awsebs/aws_ebs_test.go | 2 +- pkg/volume/awsebs/aws_util.go | 2 +- staging/publishing/import-restrictions.yaml | 1 + staging/publishing/rules.yaml | 30 ++++++++++--------- .../src/k8s.io/legacy-cloud-providers/BUILD | 1 + .../k8s.io/legacy-cloud-providers}/aws/BUILD | 3 +- .../k8s.io/legacy-cloud-providers}/aws/OWNERS | 0 .../k8s.io/legacy-cloud-providers}/aws/aws.go | 0 .../legacy-cloud-providers}/aws/aws_fakes.go | 0 .../aws/aws_instancegroups.go | 0 .../aws/aws_loadbalancer.go | 0 .../aws/aws_loadbalancer_test.go | 0 .../aws/aws_metrics.go | 0 .../legacy-cloud-providers}/aws/aws_routes.go | 0 .../legacy-cloud-providers}/aws/aws_test.go | 0 .../legacy-cloud-providers}/aws/aws_utils.go | 0 .../aws/device_allocator.go | 0 .../aws/device_allocator_test.go | 0 .../legacy-cloud-providers}/aws/instances.go | 0 .../aws/instances_test.go | 0 .../aws/log_handler.go | 0 .../legacy-cloud-providers}/aws/regions.go | 0 .../aws/regions_test.go | 0 .../aws/retry_handler.go | 0 .../aws/retry_handler_test.go | 0 .../aws/sets_ippermissions.go | 0 .../legacy-cloud-providers}/aws/tags.go | 0 .../legacy-cloud-providers}/aws/tags_test.go | 0 .../legacy-cloud-providers}/aws/volumes.go | 0 .../src/k8s.io/legacy-cloud-providers/go.mod | 3 ++ .../src/k8s.io/legacy-cloud-providers/go.sum | 5 ++++ test/e2e/framework/providers/aws/BUILD | 2 +- test/e2e/framework/providers/aws/aws.go | 2 +- vendor/modules.txt | 1 + 41 files changed, 41 insertions(+), 28 deletions(-) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/aws/BUILD (97%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/aws/OWNERS (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/aws/aws.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/aws/aws_fakes.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/aws/aws_instancegroups.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/aws/aws_loadbalancer.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/aws/aws_loadbalancer_test.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/aws/aws_metrics.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/aws/aws_routes.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/aws/aws_test.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/aws/aws_utils.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/aws/device_allocator.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/aws/device_allocator_test.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/aws/instances.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/aws/instances_test.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/aws/log_handler.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/aws/regions.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/aws/regions_test.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/aws/retry_handler.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/aws/retry_handler_test.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/aws/sets_ippermissions.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/aws/tags.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/aws/tags_test.go (100%) rename {pkg/cloudprovider/providers => staging/src/k8s.io/legacy-cloud-providers}/aws/volumes.go (100%) diff --git a/pkg/cloudprovider/providers/BUILD b/pkg/cloudprovider/providers/BUILD index 0e11371e9d3..2305d470941 100644 --- a/pkg/cloudprovider/providers/BUILD +++ b/pkg/cloudprovider/providers/BUILD @@ -13,12 +13,12 @@ go_library( "//cmd/kubelet/app:__pkg__", ], deps = [ - "//pkg/cloudprovider/providers/aws:go_default_library", "//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/vsphere:go_default_library", ], @@ -35,7 +35,6 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/cloudprovider/providers/aws:all-srcs", "//pkg/cloudprovider/providers/cloudstack:all-srcs", "//pkg/cloudprovider/providers/fake:all-srcs", "//pkg/cloudprovider/providers/gce:all-srcs", diff --git a/pkg/cloudprovider/providers/providers.go b/pkg/cloudprovider/providers/providers.go index e8cd2498fab..23b25c3fae9 100644 --- a/pkg/cloudprovider/providers/providers.go +++ b/pkg/cloudprovider/providers/providers.go @@ -18,12 +18,12 @@ package cloudprovider import ( // Cloud providers - _ "k8s.io/kubernetes/pkg/cloudprovider/providers/aws" _ "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/vsphere" ) diff --git a/pkg/volume/awsebs/BUILD b/pkg/volume/awsebs/BUILD index 2186097271b..9de5f59337e 100644 --- a/pkg/volume/awsebs/BUILD +++ b/pkg/volume/awsebs/BUILD @@ -17,7 +17,6 @@ go_library( ], importpath = "k8s.io/kubernetes/pkg/volume/awsebs", deps = [ - "//pkg/cloudprovider/providers/aws:go_default_library", "//pkg/features:go_default_library", "//pkg/util/mount:go_default_library", "//pkg/volume:go_default_library", @@ -31,6 +30,7 @@ go_library( "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//staging/src/k8s.io/cloud-provider:go_default_library", "//staging/src/k8s.io/cloud-provider/volume/helpers:go_default_library", + "//staging/src/k8s.io/legacy-cloud-providers/aws:go_default_library", "//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/utils/strings:go_default_library", ], @@ -45,7 +45,6 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/cloudprovider/providers/aws:go_default_library", "//pkg/util/mount:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/testing:go_default_library", @@ -55,6 +54,7 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library", "//staging/src/k8s.io/client-go/util/testing:go_default_library", + "//staging/src/k8s.io/legacy-cloud-providers/aws:go_default_library", "//vendor/k8s.io/klog:go_default_library", ], ) diff --git a/pkg/volume/awsebs/attacher.go b/pkg/volume/awsebs/attacher.go index f82ba083446..603180b7e42 100644 --- a/pkg/volume/awsebs/attacher.go +++ b/pkg/volume/awsebs/attacher.go @@ -27,10 +27,10 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" - "k8s.io/kubernetes/pkg/cloudprovider/providers/aws" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" volumeutil "k8s.io/kubernetes/pkg/volume/util" + "k8s.io/legacy-cloud-providers/aws" ) type awsElasticBlockStoreAttacher struct { diff --git a/pkg/volume/awsebs/attacher_test.go b/pkg/volume/awsebs/attacher_test.go index 0124295c4b5..27e3c1675fd 100644 --- a/pkg/volume/awsebs/attacher_test.go +++ b/pkg/volume/awsebs/attacher_test.go @@ -25,9 +25,9 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/types" - "k8s.io/kubernetes/pkg/cloudprovider/providers/aws" "k8s.io/kubernetes/pkg/volume" volumetest "k8s.io/kubernetes/pkg/volume/testing" + "k8s.io/legacy-cloud-providers/aws" ) func TestGetVolumeName_Volume(t *testing.T) { diff --git a/pkg/volume/awsebs/aws_ebs.go b/pkg/volume/awsebs/aws_ebs.go index 77f2d589d8f..9532d96ed70 100644 --- a/pkg/volume/awsebs/aws_ebs.go +++ b/pkg/volume/awsebs/aws_ebs.go @@ -32,11 +32,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" utilfeature "k8s.io/apiserver/pkg/util/feature" - "k8s.io/kubernetes/pkg/cloudprovider/providers/aws" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" + "k8s.io/legacy-cloud-providers/aws" utilstrings "k8s.io/utils/strings" ) diff --git a/pkg/volume/awsebs/aws_ebs_block.go b/pkg/volume/awsebs/aws_ebs_block.go index c316ef23f97..6279a2ef245 100644 --- a/pkg/volume/awsebs/aws_ebs_block.go +++ b/pkg/volume/awsebs/aws_ebs_block.go @@ -25,11 +25,11 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/klog" - "k8s.io/kubernetes/pkg/cloudprovider/providers/aws" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" "k8s.io/kubernetes/pkg/volume/util/volumepathhandler" + "k8s.io/legacy-cloud-providers/aws" utilstrings "k8s.io/utils/strings" ) diff --git a/pkg/volume/awsebs/aws_ebs_test.go b/pkg/volume/awsebs/aws_ebs_test.go index 18119eb413a..58716757042 100644 --- a/pkg/volume/awsebs/aws_ebs_test.go +++ b/pkg/volume/awsebs/aws_ebs_test.go @@ -28,10 +28,10 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/kubernetes/fake" utiltesting "k8s.io/client-go/util/testing" - "k8s.io/kubernetes/pkg/cloudprovider/providers/aws" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" volumetest "k8s.io/kubernetes/pkg/volume/testing" + "k8s.io/legacy-cloud-providers/aws" ) func TestCanSupport(t *testing.T) { diff --git a/pkg/volume/awsebs/aws_util.go b/pkg/volume/awsebs/aws_util.go index 8dfac881bed..fdb0a2967f5 100644 --- a/pkg/volume/awsebs/aws_util.go +++ b/pkg/volume/awsebs/aws_util.go @@ -31,10 +31,10 @@ import ( "k8s.io/apimachinery/pkg/util/sets" cloudprovider "k8s.io/cloud-provider" volumehelpers "k8s.io/cloud-provider/volume/helpers" - "k8s.io/kubernetes/pkg/cloudprovider/providers/aws" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" volumeutil "k8s.io/kubernetes/pkg/volume/util" + "k8s.io/legacy-cloud-providers/aws" ) const ( diff --git a/staging/publishing/import-restrictions.yaml b/staging/publishing/import-restrictions.yaml index 6b5e9fb4fef..f6df9a1e886 100644 --- a/staging/publishing/import-restrictions.yaml +++ b/staging/publishing/import-restrictions.yaml @@ -209,6 +209,7 @@ - k8s.io/apimachinery - k8s.io/client-go - k8s.io/cloud-provider + - k8s.io/csi-translation-lib - k8s.io/klog - k8s.io/legacy-cloud-providers - k8s.io/utils diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml index a7bebf3581e..7c88bedbd45 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -286,6 +286,20 @@ rules: branch: master - repository: client-go branch: master +- destination: csi-translation-lib + library: true + branches: + - source: + branch: master + dir: staging/src/k8s.io/csi-translation-lib + name: master + dependencies: + - repository: api + branch: master + - repository: apimachinery + branch: master + - repository: cloud-provider + branch: master - destination: legacy-cloud-providers library: true branches: @@ -302,6 +316,8 @@ rules: branch: master - repository: cloud-provider branch: master + - repository: csi-translation-lib + branch: master - destination: node-api library: true branches: @@ -318,20 +334,6 @@ rules: branch: master - repository: code-generator branch: master -- destination: csi-translation-lib - library: true - branches: - - source: - branch: master - dir: staging/src/k8s.io/csi-translation-lib - name: master - dependencies: - - repository: api - branch: master - - repository: apimachinery - branch: master - - repository: cloud-provider - branch: master - destination: cri-api library: true branches: diff --git a/staging/src/k8s.io/legacy-cloud-providers/BUILD b/staging/src/k8s.io/legacy-cloud-providers/BUILD index dccc36bd9b6..693fdf288a5 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/BUILD +++ b/staging/src/k8s.io/legacy-cloud-providers/BUILD @@ -9,6 +9,7 @@ filegroup( name = "all-srcs", srcs = [ ":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/vsphere:all-srcs", ], diff --git a/pkg/cloudprovider/providers/aws/BUILD b/staging/src/k8s.io/legacy-cloud-providers/aws/BUILD similarity index 97% rename from pkg/cloudprovider/providers/aws/BUILD rename to staging/src/k8s.io/legacy-cloud-providers/aws/BUILD index 84513427c6e..f8c82a9a819 100644 --- a/pkg/cloudprovider/providers/aws/BUILD +++ b/staging/src/k8s.io/legacy-cloud-providers/aws/BUILD @@ -25,7 +25,8 @@ go_library( "tags.go", "volumes.go", ], - importpath = "k8s.io/kubernetes/pkg/cloudprovider/providers/aws", + importmap = "k8s.io/kubernetes/vendor/k8s.io/legacy-cloud-providers/aws", + importpath = "k8s.io/legacy-cloud-providers/aws", deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library", diff --git a/pkg/cloudprovider/providers/aws/OWNERS b/staging/src/k8s.io/legacy-cloud-providers/aws/OWNERS similarity index 100% rename from pkg/cloudprovider/providers/aws/OWNERS rename to staging/src/k8s.io/legacy-cloud-providers/aws/OWNERS diff --git a/pkg/cloudprovider/providers/aws/aws.go b/staging/src/k8s.io/legacy-cloud-providers/aws/aws.go similarity index 100% rename from pkg/cloudprovider/providers/aws/aws.go rename to staging/src/k8s.io/legacy-cloud-providers/aws/aws.go diff --git a/pkg/cloudprovider/providers/aws/aws_fakes.go b/staging/src/k8s.io/legacy-cloud-providers/aws/aws_fakes.go similarity index 100% rename from pkg/cloudprovider/providers/aws/aws_fakes.go rename to staging/src/k8s.io/legacy-cloud-providers/aws/aws_fakes.go diff --git a/pkg/cloudprovider/providers/aws/aws_instancegroups.go b/staging/src/k8s.io/legacy-cloud-providers/aws/aws_instancegroups.go similarity index 100% rename from pkg/cloudprovider/providers/aws/aws_instancegroups.go rename to staging/src/k8s.io/legacy-cloud-providers/aws/aws_instancegroups.go diff --git a/pkg/cloudprovider/providers/aws/aws_loadbalancer.go b/staging/src/k8s.io/legacy-cloud-providers/aws/aws_loadbalancer.go similarity index 100% rename from pkg/cloudprovider/providers/aws/aws_loadbalancer.go rename to staging/src/k8s.io/legacy-cloud-providers/aws/aws_loadbalancer.go diff --git a/pkg/cloudprovider/providers/aws/aws_loadbalancer_test.go b/staging/src/k8s.io/legacy-cloud-providers/aws/aws_loadbalancer_test.go similarity index 100% rename from pkg/cloudprovider/providers/aws/aws_loadbalancer_test.go rename to staging/src/k8s.io/legacy-cloud-providers/aws/aws_loadbalancer_test.go diff --git a/pkg/cloudprovider/providers/aws/aws_metrics.go b/staging/src/k8s.io/legacy-cloud-providers/aws/aws_metrics.go similarity index 100% rename from pkg/cloudprovider/providers/aws/aws_metrics.go rename to staging/src/k8s.io/legacy-cloud-providers/aws/aws_metrics.go diff --git a/pkg/cloudprovider/providers/aws/aws_routes.go b/staging/src/k8s.io/legacy-cloud-providers/aws/aws_routes.go similarity index 100% rename from pkg/cloudprovider/providers/aws/aws_routes.go rename to staging/src/k8s.io/legacy-cloud-providers/aws/aws_routes.go diff --git a/pkg/cloudprovider/providers/aws/aws_test.go b/staging/src/k8s.io/legacy-cloud-providers/aws/aws_test.go similarity index 100% rename from pkg/cloudprovider/providers/aws/aws_test.go rename to staging/src/k8s.io/legacy-cloud-providers/aws/aws_test.go diff --git a/pkg/cloudprovider/providers/aws/aws_utils.go b/staging/src/k8s.io/legacy-cloud-providers/aws/aws_utils.go similarity index 100% rename from pkg/cloudprovider/providers/aws/aws_utils.go rename to staging/src/k8s.io/legacy-cloud-providers/aws/aws_utils.go diff --git a/pkg/cloudprovider/providers/aws/device_allocator.go b/staging/src/k8s.io/legacy-cloud-providers/aws/device_allocator.go similarity index 100% rename from pkg/cloudprovider/providers/aws/device_allocator.go rename to staging/src/k8s.io/legacy-cloud-providers/aws/device_allocator.go diff --git a/pkg/cloudprovider/providers/aws/device_allocator_test.go b/staging/src/k8s.io/legacy-cloud-providers/aws/device_allocator_test.go similarity index 100% rename from pkg/cloudprovider/providers/aws/device_allocator_test.go rename to staging/src/k8s.io/legacy-cloud-providers/aws/device_allocator_test.go diff --git a/pkg/cloudprovider/providers/aws/instances.go b/staging/src/k8s.io/legacy-cloud-providers/aws/instances.go similarity index 100% rename from pkg/cloudprovider/providers/aws/instances.go rename to staging/src/k8s.io/legacy-cloud-providers/aws/instances.go diff --git a/pkg/cloudprovider/providers/aws/instances_test.go b/staging/src/k8s.io/legacy-cloud-providers/aws/instances_test.go similarity index 100% rename from pkg/cloudprovider/providers/aws/instances_test.go rename to staging/src/k8s.io/legacy-cloud-providers/aws/instances_test.go diff --git a/pkg/cloudprovider/providers/aws/log_handler.go b/staging/src/k8s.io/legacy-cloud-providers/aws/log_handler.go similarity index 100% rename from pkg/cloudprovider/providers/aws/log_handler.go rename to staging/src/k8s.io/legacy-cloud-providers/aws/log_handler.go diff --git a/pkg/cloudprovider/providers/aws/regions.go b/staging/src/k8s.io/legacy-cloud-providers/aws/regions.go similarity index 100% rename from pkg/cloudprovider/providers/aws/regions.go rename to staging/src/k8s.io/legacy-cloud-providers/aws/regions.go diff --git a/pkg/cloudprovider/providers/aws/regions_test.go b/staging/src/k8s.io/legacy-cloud-providers/aws/regions_test.go similarity index 100% rename from pkg/cloudprovider/providers/aws/regions_test.go rename to staging/src/k8s.io/legacy-cloud-providers/aws/regions_test.go diff --git a/pkg/cloudprovider/providers/aws/retry_handler.go b/staging/src/k8s.io/legacy-cloud-providers/aws/retry_handler.go similarity index 100% rename from pkg/cloudprovider/providers/aws/retry_handler.go rename to staging/src/k8s.io/legacy-cloud-providers/aws/retry_handler.go diff --git a/pkg/cloudprovider/providers/aws/retry_handler_test.go b/staging/src/k8s.io/legacy-cloud-providers/aws/retry_handler_test.go similarity index 100% rename from pkg/cloudprovider/providers/aws/retry_handler_test.go rename to staging/src/k8s.io/legacy-cloud-providers/aws/retry_handler_test.go diff --git a/pkg/cloudprovider/providers/aws/sets_ippermissions.go b/staging/src/k8s.io/legacy-cloud-providers/aws/sets_ippermissions.go similarity index 100% rename from pkg/cloudprovider/providers/aws/sets_ippermissions.go rename to staging/src/k8s.io/legacy-cloud-providers/aws/sets_ippermissions.go diff --git a/pkg/cloudprovider/providers/aws/tags.go b/staging/src/k8s.io/legacy-cloud-providers/aws/tags.go similarity index 100% rename from pkg/cloudprovider/providers/aws/tags.go rename to staging/src/k8s.io/legacy-cloud-providers/aws/tags.go diff --git a/pkg/cloudprovider/providers/aws/tags_test.go b/staging/src/k8s.io/legacy-cloud-providers/aws/tags_test.go similarity index 100% rename from pkg/cloudprovider/providers/aws/tags_test.go rename to staging/src/k8s.io/legacy-cloud-providers/aws/tags_test.go diff --git a/pkg/cloudprovider/providers/aws/volumes.go b/staging/src/k8s.io/legacy-cloud-providers/aws/volumes.go similarity index 100% rename from pkg/cloudprovider/providers/aws/volumes.go rename to staging/src/k8s.io/legacy-cloud-providers/aws/volumes.go diff --git a/staging/src/k8s.io/legacy-cloud-providers/go.mod b/staging/src/k8s.io/legacy-cloud-providers/go.mod index d69e38a77f5..8919928a9c1 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/go.mod +++ b/staging/src/k8s.io/legacy-cloud-providers/go.mod @@ -7,6 +7,7 @@ go 1.12 require ( github.com/Azure/azure-sdk-for-go v21.4.0+incompatible github.com/Azure/go-autorest v11.1.2+incompatible + 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 github.com/prometheus/client_golang v0.9.2 @@ -21,6 +22,7 @@ require ( k8s.io/apimachinery v0.0.0 k8s.io/client-go v0.0.0 k8s.io/cloud-provider v0.0.0 + k8s.io/csi-translation-lib v0.0.0 k8s.io/klog v0.3.0 k8s.io/utils v0.0.0-20190221042446-c2654d5206da sigs.k8s.io/yaml v1.1.0 @@ -37,5 +39,6 @@ replace ( k8s.io/client-go => ../client-go k8s.io/cloud-provider => ../cloud-provider k8s.io/component-base => ../component-base + k8s.io/csi-translation-lib => ../csi-translation-lib k8s.io/legacy-cloud-providers => ../legacy-cloud-providers ) diff --git a/staging/src/k8s.io/legacy-cloud-providers/go.sum b/staging/src/k8s.io/legacy-cloud-providers/go.sum index 29ba631b12c..37f0a3093ad 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/go.sum +++ b/staging/src/k8s.io/legacy-cloud-providers/go.sum @@ -8,6 +8,8 @@ github.com/BurntSushi/toml v0.3.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 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= +github.com/aws/aws-sdk-go v1.16.26 h1:GWkl3rkRO/JGRTWoLLIqwf7AWC4/W/1hMOUZqmX0js4= +github.com/aws/aws-sdk-go v1.16.26/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/beorn7/perks v0.0.0-20160229213445-3ac7bf7a47d1 h1:OnJHjoVbY69GG4gclp0ngXfywigLhR6rrgUxmxQRWO4= github.com/beorn7/perks v0.0.0-20160229213445-3ac7bf7a47d1/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/coreos/bbolt v1.3.1-coreos.6/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= @@ -61,6 +63,8 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM= +github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jonboulle/clockwork v0.0.0-20141017032234-72f9bd7c4e0c/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be h1:AHimNtVIpiBjPUhEF5KNCkrUyqTSA5zWUl8sQ2bfGBE= github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= @@ -103,6 +107,7 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/spf13/pflag v1.0.1 h1:aCvUg6QPl3ibpQUxyLkrEkCHtPqYJL4x9AuhqVqFis4= github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= diff --git a/test/e2e/framework/providers/aws/BUILD b/test/e2e/framework/providers/aws/BUILD index cbb3587423a..d694c2a6b50 100644 --- a/test/e2e/framework/providers/aws/BUILD +++ b/test/e2e/framework/providers/aws/BUILD @@ -6,8 +6,8 @@ go_library( importpath = "k8s.io/kubernetes/test/e2e/framework/providers/aws", visibility = ["//visibility:public"], deps = [ - "//pkg/cloudprovider/providers/aws:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", + "//staging/src/k8s.io/legacy-cloud-providers/aws:go_default_library", "//test/e2e/framework:go_default_library", "//vendor/github.com/aws/aws-sdk-go/aws:go_default_library", "//vendor/github.com/aws/aws-sdk-go/aws/awserr:go_default_library", diff --git a/test/e2e/framework/providers/aws/aws.go b/test/e2e/framework/providers/aws/aws.go index b0b8dc8a888..5ea60b6266c 100644 --- a/test/e2e/framework/providers/aws/aws.go +++ b/test/e2e/framework/providers/aws/aws.go @@ -27,8 +27,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "k8s.io/api/core/v1" - awscloud "k8s.io/kubernetes/pkg/cloudprovider/providers/aws" "k8s.io/kubernetes/test/e2e/framework" + awscloud "k8s.io/legacy-cloud-providers/aws" ) func init() { diff --git a/vendor/modules.txt b/vendor/modules.txt index 2f6be375b98..f6a9043e5d1 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1626,6 +1626,7 @@ k8s.io/kube-scheduler/config/v1alpha1 # k8s.io/kubelet v0.0.0 => ./staging/src/k8s.io/kubelet k8s.io/kubelet/config/v1beta1 # k8s.io/legacy-cloud-providers v0.0.0 => ./staging/src/k8s.io/legacy-cloud-providers +k8s.io/legacy-cloud-providers/aws k8s.io/legacy-cloud-providers/azure k8s.io/legacy-cloud-providers/azure/auth k8s.io/legacy-cloud-providers/vsphere