diff --git a/go.mod b/go.mod index 9ab84c198d..4b75b4acca 100644 --- a/go.mod +++ b/go.mod @@ -48,7 +48,6 @@ require ( github.com/d2g/dhcp4client v0.0.0-20170829104524-6e570ed0a266 github.com/davecgh/go-spew v1.1.1 github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd - github.com/dnaeon/go-vcr v1.0.1 // indirect github.com/docker/distribution v0.0.0-20170726174610-edc3ab29cdff github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0 github.com/docker/go-connections v0.3.0 @@ -101,7 +100,6 @@ require ( github.com/lithammer/dedent v1.1.0 github.com/lpabon/godbc v0.1.1 // indirect github.com/magiconair/properties v0.0.0-20160816085511-61b492c03cf4 // indirect - github.com/marstr/guid v0.0.0-20170427235115-8bdf7d1a087c // indirect github.com/mattn/go-shellwords v0.0.0-20180605041737-f8471b0a71de // indirect github.com/mesos/mesos-go v0.0.9 // indirect github.com/mholt/caddy v0.0.0-20180213163048-2de495001514 @@ -133,9 +131,7 @@ require ( github.com/quobyte/api v0.1.2 github.com/rancher/go-rancher v0.0.0-20160922212217-09693a8743ba github.com/robfig/cron v0.0.0-20170309132418-df38d32658d8 - github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c github.com/russross/blackfriday v0.0.0-20151117072312-300106c228d5 - github.com/satori/go.uuid v1.2.0 // indirect github.com/seccomp/libseccomp-golang v0.0.0-20150813023252-1b506fc7c24e // indirect github.com/shurcooL/sanitized_anchor_name v0.0.0-20151028001915-10ef21a441db // indirect github.com/sigma/go-inotify v0.0.0-20181102212354-c87b6cf5033d diff --git a/pkg/cloudprovider/providers/BUILD b/pkg/cloudprovider/providers/BUILD index 4610902f8d..0e11371e9d 100644 --- a/pkg/cloudprovider/providers/BUILD +++ b/pkg/cloudprovider/providers/BUILD @@ -14,12 +14,12 @@ go_library( ], deps = [ "//pkg/cloudprovider/providers/aws:go_default_library", - "//pkg/cloudprovider/providers/azure: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/azure:go_default_library", "//staging/src/k8s.io/legacy-cloud-providers/vsphere:go_default_library", ], ) @@ -36,7 +36,6 @@ filegroup( srcs = [ ":package-srcs", "//pkg/cloudprovider/providers/aws:all-srcs", - "//pkg/cloudprovider/providers/azure: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 b648502647..e8cd2498fa 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/aws" - _ "k8s.io/kubernetes/pkg/cloudprovider/providers/azure" _ "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/azure" _ "k8s.io/legacy-cloud-providers/vsphere" ) diff --git a/pkg/credentialprovider/azure/BUILD b/pkg/credentialprovider/azure/BUILD index 97543ff85e..fe89a90f5d 100644 --- a/pkg/credentialprovider/azure/BUILD +++ b/pkg/credentialprovider/azure/BUILD @@ -14,8 +14,8 @@ go_library( ], importpath = "k8s.io/kubernetes/pkg/credentialprovider/azure", deps = [ - "//pkg/cloudprovider/providers/azure/auth:go_default_library", "//pkg/credentialprovider:go_default_library", + "//staging/src/k8s.io/legacy-cloud-providers/azure/auth:go_default_library", "//vendor/github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry:go_default_library", "//vendor/github.com/Azure/go-autorest/autorest:go_default_library", "//vendor/github.com/Azure/go-autorest/autorest/adal:go_default_library", diff --git a/pkg/credentialprovider/azure/azure_credentials.go b/pkg/credentialprovider/azure/azure_credentials.go index 555fed24c4..b7d4cfb8ad 100644 --- a/pkg/credentialprovider/azure/azure_credentials.go +++ b/pkg/credentialprovider/azure/azure_credentials.go @@ -32,8 +32,8 @@ import ( "k8s.io/klog" "sigs.k8s.io/yaml" - "k8s.io/kubernetes/pkg/cloudprovider/providers/azure/auth" "k8s.io/kubernetes/pkg/credentialprovider" + "k8s.io/legacy-cloud-providers/azure/auth" ) var flagConfigFile = pflag.String("azure-container-registry-config", "", diff --git a/pkg/volume/azure_dd/BUILD b/pkg/volume/azure_dd/BUILD index 6ec2eaf5ff..fb93b436e2 100644 --- a/pkg/volume/azure_dd/BUILD +++ b/pkg/volume/azure_dd/BUILD @@ -22,7 +22,6 @@ go_library( importpath = "k8s.io/kubernetes/pkg/volume/azure_dd", deps = [ "//pkg/apis/core:go_default_library", - "//pkg/cloudprovider/providers/azure:go_default_library", "//pkg/features:go_default_library", "//pkg/util/mount:go_default_library", "//pkg/volume:go_default_library", @@ -37,6 +36,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/azure:go_default_library", "//vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute:go_default_library", "//vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2018-07-01/storage:go_default_library", "//vendor/k8s.io/klog:go_default_library", diff --git a/pkg/volume/azure_dd/attacher.go b/pkg/volume/azure_dd/attacher.go index a009be39da..3f0ca0ef8c 100644 --- a/pkg/volume/azure_dd/attacher.go +++ b/pkg/volume/azure_dd/attacher.go @@ -27,14 +27,14 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute" "k8s.io/klog" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" cloudprovider "k8s.io/cloud-provider" - "k8s.io/kubernetes/pkg/cloudprovider/providers/azure" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" + "k8s.io/legacy-cloud-providers/azure" ) type azureDiskDetacher struct { diff --git a/pkg/volume/azure_dd/azure_common.go b/pkg/volume/azure_dd/azure_common.go index a6b0c2704d..89cf06b647 100644 --- a/pkg/volume/azure_dd/azure_common.go +++ b/pkg/volume/azure_dd/azure_common.go @@ -27,13 +27,13 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" api "k8s.io/kubernetes/pkg/apis/core" - "k8s.io/kubernetes/pkg/cloudprovider/providers/azure" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" + "k8s.io/legacy-cloud-providers/azure" utilstrings "k8s.io/utils/strings" ) diff --git a/pkg/volume/azure_dd/azure_dd.go b/pkg/volume/azure_dd/azure_dd.go index 74b1caa427..19551bc41c 100644 --- a/pkg/volume/azure_dd/azure_dd.go +++ b/pkg/volume/azure_dd/azure_dd.go @@ -26,13 +26,13 @@ import ( "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2018-07-01/storage" "k8s.io/klog" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/kubernetes/pkg/cloudprovider/providers/azure" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" + "k8s.io/legacy-cloud-providers/azure" ) // interface exposed by the cloud provider implementing Disk functionality diff --git a/pkg/volume/azure_dd/azure_provision.go b/pkg/volume/azure_dd/azure_provision.go index ffe3e77e8b..8d0c4f9e0a 100644 --- a/pkg/volume/azure_dd/azure_provision.go +++ b/pkg/volume/azure_dd/azure_provision.go @@ -23,16 +23,16 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2018-07-01/storage" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" utilfeature "k8s.io/apiserver/pkg/util/feature" volumehelpers "k8s.io/cloud-provider/volume/helpers" - "k8s.io/kubernetes/pkg/cloudprovider/providers/azure" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" + "k8s.io/legacy-cloud-providers/azure" ) type azureDiskProvisioner struct { diff --git a/pkg/volume/azure_file/BUILD b/pkg/volume/azure_file/BUILD index aa15bf7ec9..999850dc49 100644 --- a/pkg/volume/azure_file/BUILD +++ b/pkg/volume/azure_file/BUILD @@ -16,7 +16,6 @@ go_library( ], importpath = "k8s.io/kubernetes/pkg/volume/azure_file", deps = [ - "//pkg/cloudprovider/providers/azure:go_default_library", "//pkg/util/mount:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", @@ -27,6 +26,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/types: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/azure:go_default_library", "//vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2018-07-01/storage:go_default_library", "//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/utils/strings:go_default_library", @@ -38,7 +38,6 @@ go_test( srcs = ["azure_file_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/cloudprovider/providers/azure:go_default_library", "//pkg/cloudprovider/providers/fake:go_default_library", "//pkg/util/mount:go_default_library", "//pkg/volume:go_default_library", @@ -47,6 +46,7 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//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/legacy-cloud-providers/azure:go_default_library", "//vendor/github.com/Azure/go-autorest/autorest/to:go_default_library", ], ) diff --git a/pkg/volume/azure_file/azure_file.go b/pkg/volume/azure_file/azure_file.go index 32a849612c..5db49ba2e8 100644 --- a/pkg/volume/azure_file/azure_file.go +++ b/pkg/volume/azure_file/azure_file.go @@ -22,17 +22,17 @@ import ( "os" "runtime" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" cloudprovider "k8s.io/cloud-provider" volumehelpers "k8s.io/cloud-provider/volume/helpers" "k8s.io/klog" - "k8s.io/kubernetes/pkg/cloudprovider/providers/azure" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" volutil "k8s.io/kubernetes/pkg/volume/util" + "k8s.io/legacy-cloud-providers/azure" utilstrings "k8s.io/utils/strings" ) diff --git a/pkg/volume/azure_file/azure_file_test.go b/pkg/volume/azure_file/azure_file_test.go index 43dcd20818..80cd1d62e6 100644 --- a/pkg/volume/azure_file/azure_file_test.go +++ b/pkg/volume/azure_file/azure_file_test.go @@ -26,15 +26,15 @@ import ( "testing" "github.com/Azure/go-autorest/autorest/to" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/kubernetes/fake" - "k8s.io/kubernetes/pkg/cloudprovider/providers/azure" fakecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" volumetest "k8s.io/kubernetes/pkg/volume/testing" + "k8s.io/legacy-cloud-providers/azure" ) func TestCanSupport(t *testing.T) { diff --git a/pkg/volume/azure_file/azure_provision.go b/pkg/volume/azure_file/azure_provision.go index 132de0c9cf..cfca683a4a 100644 --- a/pkg/volume/azure_file/azure_provision.go +++ b/pkg/volume/azure_file/azure_provision.go @@ -21,16 +21,15 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2018-07-01/storage" - "k8s.io/klog" - - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" cloudprovider "k8s.io/cloud-provider" volumehelpers "k8s.io/cloud-provider/volume/helpers" - "k8s.io/kubernetes/pkg/cloudprovider/providers/azure" + "k8s.io/klog" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" + "k8s.io/legacy-cloud-providers/azure" utilstrings "k8s.io/utils/strings" ) diff --git a/staging/src/k8s.io/legacy-cloud-providers/BUILD b/staging/src/k8s.io/legacy-cloud-providers/BUILD index 68fee854f9..dccc36bd9b 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/azure:all-srcs", "//staging/src/k8s.io/legacy-cloud-providers/vsphere:all-srcs", ], tags = ["automanaged"], diff --git a/pkg/cloudprovider/providers/azure/BUILD b/staging/src/k8s.io/legacy-cloud-providers/azure/BUILD similarity index 93% rename from pkg/cloudprovider/providers/azure/BUILD rename to staging/src/k8s.io/legacy-cloud-providers/azure/BUILD index 3f9249e93c..11fc4b92d1 100644 --- a/pkg/cloudprovider/providers/azure/BUILD +++ b/staging/src/k8s.io/legacy-cloud-providers/azure/BUILD @@ -34,9 +34,9 @@ go_library( "azure_wrap.go", "azure_zones.go", ], - importpath = "k8s.io/kubernetes/pkg/cloudprovider/providers/azure", + importmap = "k8s.io/kubernetes/vendor/k8s.io/legacy-cloud-providers/azure", + importpath = "k8s.io/legacy-cloud-providers/azure", deps = [ - "//pkg/cloudprovider/providers/azure/auth:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", @@ -58,6 +58,7 @@ go_library( "//staging/src/k8s.io/cloud-provider/volume:go_default_library", "//staging/src/k8s.io/cloud-provider/volume/errors:go_default_library", "//staging/src/k8s.io/cloud-provider/volume/helpers:go_default_library", + "//staging/src/k8s.io/legacy-cloud-providers/azure/auth:go_default_library", "//vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute:go_default_library", "//vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network:go_default_library", "//vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2018-07-01/storage:go_default_library", @@ -95,13 +96,13 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/cloudprovider/providers/azure/auth: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/types:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/cloud-provider:go_default_library", "//staging/src/k8s.io/cloud-provider/service/helpers:go_default_library", + "//staging/src/k8s.io/legacy-cloud-providers/azure/auth:go_default_library", "//vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute:go_default_library", "//vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network:go_default_library", "//vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2018-07-01/storage:go_default_library", @@ -122,7 +123,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/cloudprovider/providers/azure/auth:all-srcs", + "//staging/src/k8s.io/legacy-cloud-providers/azure/auth:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/cloudprovider/providers/azure/OWNERS b/staging/src/k8s.io/legacy-cloud-providers/azure/OWNERS similarity index 100% rename from pkg/cloudprovider/providers/azure/OWNERS rename to staging/src/k8s.io/legacy-cloud-providers/azure/OWNERS diff --git a/pkg/cloudprovider/providers/azure/auth/BUILD b/staging/src/k8s.io/legacy-cloud-providers/azure/auth/BUILD similarity index 83% rename from pkg/cloudprovider/providers/azure/auth/BUILD rename to staging/src/k8s.io/legacy-cloud-providers/azure/auth/BUILD index a0eca41215..fa7f92444f 100644 --- a/pkg/cloudprovider/providers/azure/auth/BUILD +++ b/staging/src/k8s.io/legacy-cloud-providers/azure/auth/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["azure_auth.go"], - importpath = "k8s.io/kubernetes/pkg/cloudprovider/providers/azure/auth", + importmap = "k8s.io/kubernetes/vendor/k8s.io/legacy-cloud-providers/azure/auth", + importpath = "k8s.io/legacy-cloud-providers/azure/auth", visibility = ["//visibility:public"], deps = [ "//vendor/github.com/Azure/go-autorest/autorest/adal:go_default_library", diff --git a/pkg/cloudprovider/providers/azure/auth/azure_auth.go b/staging/src/k8s.io/legacy-cloud-providers/azure/auth/azure_auth.go similarity index 100% rename from pkg/cloudprovider/providers/azure/auth/azure_auth.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/auth/azure_auth.go diff --git a/pkg/cloudprovider/providers/azure/azure.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure.go similarity index 99% rename from pkg/cloudprovider/providers/azure/azure.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure.go index a2aa10f111..9bdc76d725 100644 --- a/pkg/cloudprovider/providers/azure/azure.go +++ b/staging/src/k8s.io/legacy-cloud-providers/azure/azure.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/informers" @@ -36,7 +36,7 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/client-go/util/flowcontrol" cloudprovider "k8s.io/cloud-provider" - "k8s.io/kubernetes/pkg/cloudprovider/providers/azure/auth" + "k8s.io/legacy-cloud-providers/azure/auth" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute" "github.com/Azure/go-autorest/autorest" diff --git a/pkg/cloudprovider/providers/azure/azure_backoff.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_backoff.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_backoff.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_backoff.go diff --git a/pkg/cloudprovider/providers/azure/azure_backoff_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_backoff_test.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_backoff_test.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_backoff_test.go diff --git a/pkg/cloudprovider/providers/azure/azure_blobDiskController.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_blobDiskController.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_blobDiskController.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_blobDiskController.go diff --git a/pkg/cloudprovider/providers/azure/azure_cache.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_cache.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_cache.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_cache.go diff --git a/pkg/cloudprovider/providers/azure/azure_cache_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_cache_test.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_cache_test.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_cache_test.go diff --git a/pkg/cloudprovider/providers/azure/azure_client.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_client.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_client.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_client.go diff --git a/pkg/cloudprovider/providers/azure/azure_controller_common.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_common.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_controller_common.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_common.go diff --git a/pkg/cloudprovider/providers/azure/azure_controller_common_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_common_test.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_controller_common_test.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_common_test.go diff --git a/pkg/cloudprovider/providers/azure/azure_controller_standard.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_standard.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_controller_standard.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_standard.go diff --git a/pkg/cloudprovider/providers/azure/azure_controller_vmss.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_vmss.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_controller_vmss.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_vmss.go diff --git a/pkg/cloudprovider/providers/azure/azure_fakes.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_fakes.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_fakes.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_fakes.go diff --git a/pkg/cloudprovider/providers/azure/azure_file.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_file.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_file.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_file.go diff --git a/pkg/cloudprovider/providers/azure/azure_instance_metadata.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_instance_metadata.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_instance_metadata.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_instance_metadata.go diff --git a/pkg/cloudprovider/providers/azure/azure_instances.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_instances.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_instances.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_instances.go diff --git a/pkg/cloudprovider/providers/azure/azure_instances_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_instances_test.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_instances_test.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_instances_test.go diff --git a/pkg/cloudprovider/providers/azure/azure_loadbalancer.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_loadbalancer.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_loadbalancer.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_loadbalancer.go diff --git a/pkg/cloudprovider/providers/azure/azure_loadbalancer_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_loadbalancer_test.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_loadbalancer_test.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_loadbalancer_test.go diff --git a/pkg/cloudprovider/providers/azure/azure_managedDiskController.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_managedDiskController.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_managedDiskController.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_managedDiskController.go diff --git a/pkg/cloudprovider/providers/azure/azure_metrics.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_metrics.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_metrics.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_metrics.go diff --git a/pkg/cloudprovider/providers/azure/azure_metrics_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_metrics_test.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_metrics_test.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_metrics_test.go diff --git a/pkg/cloudprovider/providers/azure/azure_routes.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_routes.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_routes.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_routes.go diff --git a/pkg/cloudprovider/providers/azure/azure_routes_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_routes_test.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_routes_test.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_routes_test.go diff --git a/pkg/cloudprovider/providers/azure/azure_standard.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_standard.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_standard.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_standard.go diff --git a/pkg/cloudprovider/providers/azure/azure_standard_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_standard_test.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_standard_test.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_standard_test.go diff --git a/pkg/cloudprovider/providers/azure/azure_storage.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_storage.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_storage.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_storage.go diff --git a/pkg/cloudprovider/providers/azure/azure_storage_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_storage_test.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_storage_test.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_storage_test.go diff --git a/pkg/cloudprovider/providers/azure/azure_storageaccount.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_storageaccount.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_storageaccount.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_storageaccount.go diff --git a/pkg/cloudprovider/providers/azure/azure_storageaccount_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_storageaccount_test.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_storageaccount_test.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_storageaccount_test.go diff --git a/pkg/cloudprovider/providers/azure/azure_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_test.go similarity index 99% rename from pkg/cloudprovider/providers/azure/azure_test.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_test.go index 4c2fd437ab..aae754303b 100644 --- a/pkg/cloudprovider/providers/azure/azure_test.go +++ b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_test.go @@ -26,12 +26,12 @@ import ( "strings" "testing" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" servicehelpers "k8s.io/cloud-provider/service/helpers" - "k8s.io/kubernetes/pkg/cloudprovider/providers/azure/auth" + "k8s.io/legacy-cloud-providers/azure/auth" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network" diff --git a/pkg/cloudprovider/providers/azure/azure_vmsets.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_vmsets.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_vmsets.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_vmsets.go diff --git a/pkg/cloudprovider/providers/azure/azure_vmss.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_vmss.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_vmss.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_vmss.go diff --git a/pkg/cloudprovider/providers/azure/azure_vmss_cache.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_vmss_cache.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_vmss_cache.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_vmss_cache.go diff --git a/pkg/cloudprovider/providers/azure/azure_vmss_cache_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_vmss_cache_test.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_vmss_cache_test.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_vmss_cache_test.go diff --git a/pkg/cloudprovider/providers/azure/azure_vmss_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_vmss_test.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_vmss_test.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_vmss_test.go diff --git a/pkg/cloudprovider/providers/azure/azure_wrap.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_wrap.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_wrap.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_wrap.go diff --git a/pkg/cloudprovider/providers/azure/azure_wrap_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_wrap_test.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_wrap_test.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_wrap_test.go diff --git a/pkg/cloudprovider/providers/azure/azure_zones.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_zones.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_zones.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_zones.go diff --git a/pkg/cloudprovider/providers/azure/azure_zones_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_zones_test.go similarity index 100% rename from pkg/cloudprovider/providers/azure/azure_zones_test.go rename to staging/src/k8s.io/legacy-cloud-providers/azure/azure_zones_test.go diff --git a/staging/src/k8s.io/legacy-cloud-providers/go.mod b/staging/src/k8s.io/legacy-cloud-providers/go.mod index 50a98e62f5..ba7c6addb2 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/go.mod +++ b/staging/src/k8s.io/legacy-cloud-providers/go.mod @@ -5,8 +5,16 @@ module k8s.io/legacy-cloud-providers 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/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 + github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c + github.com/satori/go.uuid v1.2.0 // indirect + github.com/stretchr/testify v1.2.2 github.com/vmware/govmomi v0.20.0 + golang.org/x/crypto v0.0.0-20181025213731-e84da0312774 gopkg.in/gcfg.v1 v1.2.0 gopkg.in/warnings.v0 v0.1.1 // indirect k8s.io/api v0.0.0 @@ -14,6 +22,8 @@ require ( k8s.io/client-go v0.0.0 k8s.io/cloud-provider v0.0.0 k8s.io/klog v0.3.0 + k8s.io/utils v0.0.0-20190221042446-c2654d5206da + sigs.k8s.io/yaml v1.1.0 ) replace ( diff --git a/staging/src/k8s.io/legacy-cloud-providers/go.sum b/staging/src/k8s.io/legacy-cloud-providers/go.sum index f6b2f61578..71e6fdf825 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/go.sum +++ b/staging/src/k8s.io/legacy-cloud-providers/go.sum @@ -1,5 +1,8 @@ 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= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= +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/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= @@ -15,7 +18,10 @@ github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7 github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda h1:NyywMz59neOoVRFDz+ccfKWxn784fiHMDnZSy6T+JXY= github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dnaeon/go-vcr v1.0.1 h1:r8L/HqC0Hje5AXMu1ooW8oyQyOFv4GxqpL0nRP7SLLY= +github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= @@ -60,6 +66,8 @@ github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be h1:AHimNtVIpiBjPU github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/marstr/guid v0.0.0-20170427235115-8bdf7d1a087c h1:N7uWGS2fTwH/4BwxbHiJZNAFTSJ5yPU0emHsQWvkxEY= +github.com/marstr/guid v0.0.0-20170427235115-8bdf7d1a087c/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= @@ -89,6 +97,10 @@ github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 h1:PnBWHBf+6L0jO github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c h1:ht7N4d/B7Ezf58nvMNVF3OlvDlz9pp+WHVcRNS0nink= +github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto= +github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= +github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/spf13/pflag v1.0.1 h1:aCvUg6QPl3ibpQUxyLkrEkCHtPqYJL4x9AuhqVqFis4= diff --git a/test/e2e/framework/providers/azure/BUILD b/test/e2e/framework/providers/azure/BUILD index 038c7832e9..07058db97b 100644 --- a/test/e2e/framework/providers/azure/BUILD +++ b/test/e2e/framework/providers/azure/BUILD @@ -6,9 +6,9 @@ go_library( importpath = "k8s.io/kubernetes/test/e2e/framework/providers/azure", visibility = ["//visibility:public"], deps = [ - "//pkg/cloudprovider/providers/azure:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library", + "//staging/src/k8s.io/legacy-cloud-providers/azure:go_default_library", "//test/e2e/framework:go_default_library", ], ) diff --git a/test/e2e/framework/providers/azure/azure.go b/test/e2e/framework/providers/azure/azure.go index 32c500a081..5e7be56139 100644 --- a/test/e2e/framework/providers/azure/azure.go +++ b/test/e2e/framework/providers/azure/azure.go @@ -21,10 +21,10 @@ import ( "fmt" "os" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/uuid" - "k8s.io/kubernetes/pkg/cloudprovider/providers/azure" "k8s.io/kubernetes/test/e2e/framework" + "k8s.io/legacy-cloud-providers/azure" ) func init() { diff --git a/vendor/modules.txt b/vendor/modules.txt index 8a998fd195..9d230e04c7 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1630,6 +1630,8 @@ 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/azure +k8s.io/legacy-cloud-providers/azure/auth k8s.io/legacy-cloud-providers/vsphere k8s.io/legacy-cloud-providers/vsphere/testing k8s.io/legacy-cloud-providers/vsphere/vclib