diff --git a/hack/.golint_failures b/hack/.golint_failures index adac8ddc34..8f7826272b 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -60,7 +60,6 @@ pkg/apis/storage/v1beta1/util pkg/capabilities pkg/cloudprovider/providers/fake pkg/cloudprovider/providers/photon -pkg/cloudprovider/providers/vsphere pkg/controller pkg/controller/apis/config/v1alpha1 pkg/controller/certificates @@ -606,6 +605,7 @@ staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1 staging/src/k8s.io/kube-aggregator/pkg/controllers/autoregister staging/src/k8s.io/kube-proxy/config/v1alpha1 staging/src/k8s.io/kubelet/config/v1beta1 +staging/src/k8s.io/legacy-cloud-providers/vsphere staging/src/k8s.io/metrics/pkg/apis/custom_metrics staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 staging/src/k8s.io/metrics/pkg/apis/external_metrics diff --git a/pkg/cloudprovider/providers/BUILD b/pkg/cloudprovider/providers/BUILD index 27eee08610..4610902f8d 100644 --- a/pkg/cloudprovider/providers/BUILD +++ b/pkg/cloudprovider/providers/BUILD @@ -1,9 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", @@ -23,7 +20,7 @@ go_library( "//pkg/cloudprovider/providers/openstack:go_default_library", "//pkg/cloudprovider/providers/ovirt:go_default_library", "//pkg/cloudprovider/providers/photon:go_default_library", - "//pkg/cloudprovider/providers/vsphere:go_default_library", + "//staging/src/k8s.io/legacy-cloud-providers/vsphere:go_default_library", ], ) @@ -46,7 +43,13 @@ filegroup( "//pkg/cloudprovider/providers/openstack:all-srcs", "//pkg/cloudprovider/providers/ovirt:all-srcs", "//pkg/cloudprovider/providers/photon:all-srcs", - "//pkg/cloudprovider/providers/vsphere:all-srcs", ], tags = ["automanaged"], ) + +go_test( + name = "go_default_test", + srcs = ["providers_test.go"], + embed = [":go_default_library"], + deps = ["//staging/src/k8s.io/legacy-cloud-providers/vsphere/testing:go_default_library"], +) diff --git a/pkg/cloudprovider/providers/providers.go b/pkg/cloudprovider/providers/providers.go index 7de9ca9a41..b648502647 100644 --- a/pkg/cloudprovider/providers/providers.go +++ b/pkg/cloudprovider/providers/providers.go @@ -25,5 +25,5 @@ import ( _ "k8s.io/kubernetes/pkg/cloudprovider/providers/openstack" _ "k8s.io/kubernetes/pkg/cloudprovider/providers/ovirt" _ "k8s.io/kubernetes/pkg/cloudprovider/providers/photon" - _ "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere" + _ "k8s.io/legacy-cloud-providers/vsphere" ) diff --git a/pkg/cloudprovider/providers/providers_test.go b/pkg/cloudprovider/providers/providers_test.go new file mode 100644 index 0000000000..69ff45e984 --- /dev/null +++ b/pkg/cloudprovider/providers/providers_test.go @@ -0,0 +1,23 @@ +/* +Copyright 2019 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package cloudprovider + +import ( + // transitive test dependencies are not vendored by go modules + // so we have to explicitly import them here + _ "k8s.io/legacy-cloud-providers/vsphere/testing" +) diff --git a/pkg/volume/vsphere_volume/BUILD b/pkg/volume/vsphere_volume/BUILD index 660ee835a6..1d07f3a363 100644 --- a/pkg/volume/vsphere_volume/BUILD +++ b/pkg/volume/vsphere_volume/BUILD @@ -16,8 +16,6 @@ go_library( ], importpath = "k8s.io/kubernetes/pkg/volume/vsphere_volume", deps = [ - "//pkg/cloudprovider/providers/vsphere:go_default_library", - "//pkg/cloudprovider/providers/vsphere/vclib:go_default_library", "//pkg/features:go_default_library", "//pkg/util/mount:go_default_library", "//pkg/volume:go_default_library", @@ -30,6 +28,8 @@ 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/vsphere:go_default_library", + "//staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib:go_default_library", "//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/utils/keymutex:go_default_library", "//vendor/k8s.io/utils/strings:go_default_library", @@ -46,8 +46,6 @@ go_test( embed = [":go_default_library"], deps = [ "//pkg/cloudprovider/providers/fake:go_default_library", - "//pkg/cloudprovider/providers/vsphere:go_default_library", - "//pkg/cloudprovider/providers/vsphere/vclib:go_default_library", "//pkg/util/mount:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/testing:go_default_library", @@ -56,6 +54,8 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//staging/src/k8s.io/client-go/util/testing:go_default_library", "//staging/src/k8s.io/cloud-provider:go_default_library", + "//staging/src/k8s.io/legacy-cloud-providers/vsphere:go_default_library", + "//staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib:go_default_library", "//vendor/k8s.io/klog:go_default_library", ], ) diff --git a/pkg/volume/vsphere_volume/attacher.go b/pkg/volume/vsphere_volume/attacher.go index 26e298bb7b..9b07cce451 100644 --- a/pkg/volume/vsphere_volume/attacher.go +++ b/pkg/volume/vsphere_volume/attacher.go @@ -25,10 +25,10 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/klog" - "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" volumeutil "k8s.io/kubernetes/pkg/volume/util" + "k8s.io/legacy-cloud-providers/vsphere" "k8s.io/utils/keymutex" ) diff --git a/pkg/volume/vsphere_volume/attacher_test.go b/pkg/volume/vsphere_volume/attacher_test.go index 08a59f593c..b7d453588b 100644 --- a/pkg/volume/vsphere_volume/attacher_test.go +++ b/pkg/volume/vsphere_volume/attacher_test.go @@ -22,9 +22,9 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" - "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere/vclib" "k8s.io/kubernetes/pkg/volume" volumetest "k8s.io/kubernetes/pkg/volume/testing" + "k8s.io/legacy-cloud-providers/vsphere/vclib" "k8s.io/klog" ) diff --git a/pkg/volume/vsphere_volume/vsphere_volume_test.go b/pkg/volume/vsphere_volume/vsphere_volume_test.go index 97217a1017..95e8c8a5fe 100644 --- a/pkg/volume/vsphere_volume/vsphere_volume_test.go +++ b/pkg/volume/vsphere_volume/vsphere_volume_test.go @@ -27,10 +27,10 @@ import ( utiltesting "k8s.io/client-go/util/testing" cloudprovider "k8s.io/cloud-provider" "k8s.io/kubernetes/pkg/cloudprovider/providers/fake" - "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" volumetest "k8s.io/kubernetes/pkg/volume/testing" + "k8s.io/legacy-cloud-providers/vsphere" ) func TestCanSupport(t *testing.T) { diff --git a/pkg/volume/vsphere_volume/vsphere_volume_util.go b/pkg/volume/vsphere_volume/vsphere_volume_util.go index 35dacb5ce9..738d35a5e7 100644 --- a/pkg/volume/vsphere_volume/vsphere_volume_util.go +++ b/pkg/volume/vsphere_volume/vsphere_volume_util.go @@ -27,11 +27,11 @@ import ( cloudprovider "k8s.io/cloud-provider" volumehelpers "k8s.io/cloud-provider/volume/helpers" "k8s.io/klog" - "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere" - "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere/vclib" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" volumeutil "k8s.io/kubernetes/pkg/volume/util" + "k8s.io/legacy-cloud-providers/vsphere" + "k8s.io/legacy-cloud-providers/vsphere/vclib" ) const ( diff --git a/staging/README.md b/staging/README.md index d9efa6505f..aebdfca0b0 100644 --- a/staging/README.md +++ b/staging/README.md @@ -24,6 +24,7 @@ Repositories currently staged here: - [`k8s.io/kube-proxy`](https://github.com/kubernetes/kube-proxy) - [`k8s.io/kube-scheduler`](https://github.com/kubernetes/kube-scheduler) - [`k8s.io/kubelet`](https://github.com/kubernetes/kubelet) +- [`k8s.io/legacy-cloud-providers`](https://github.com/kubernetes/legacy-cloud-providers) - [`k8s.io/metrics`](https://github.com/kubernetes/metrics) - [`k8s.io/node-api`](https://github.com/kubernetes/node-api) - [`k8s.io/sample-apiserver`](https://github.com/kubernetes/sample-apiserver) diff --git a/staging/publishing/import-restrictions.yaml b/staging/publishing/import-restrictions.yaml index 4f41cf2fa1..6b5e9fb4fe 100644 --- a/staging/publishing/import-restrictions.yaml +++ b/staging/publishing/import-restrictions.yaml @@ -203,6 +203,16 @@ - k8s.io/klog - k8s.io/utils +- baseImportPath: "./vendor/k8s.io/legacy-cloud-providers/" + allowedImports: + - k8s.io/api + - k8s.io/apimachinery + - k8s.io/client-go + - k8s.io/cloud-provider + - k8s.io/klog + - k8s.io/legacy-cloud-providers + - k8s.io/utils + - baseImportPath: "./vendor/k8s.io/node-api/" allowedImports: - k8s.io/apimachinery diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml index 8ac6601076..a7bebf3581 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -286,6 +286,22 @@ rules: branch: master - repository: client-go branch: master +- destination: legacy-cloud-providers + library: true + branches: + - source: + branch: master + dir: staging/src/k8s.io/legacy-cloud-providers + name: master + dependencies: + - repository: api + branch: master + - repository: apimachinery + branch: master + - repository: client-go + branch: master + - repository: cloud-provider + branch: master - destination: node-api library: true branches: diff --git a/staging/repos_generated.bzl b/staging/repos_generated.bzl index b71b1a636a..0cc30dedf4 100644 --- a/staging/repos_generated.bzl +++ b/staging/repos_generated.bzl @@ -33,6 +33,7 @@ staging_repos = [ "k8s.io/kube-proxy", "k8s.io/kube-scheduler", "k8s.io/kubelet", + "k8s.io/legacy-cloud-providers", "k8s.io/metrics", "k8s.io/node-api", "k8s.io/sample-apiserver", diff --git a/staging/src/BUILD b/staging/src/BUILD index 6163610c07..5ac37ecd68 100644 --- a/staging/src/BUILD +++ b/staging/src/BUILD @@ -32,6 +32,7 @@ filegroup( "//staging/src/k8s.io/kube-proxy:all-srcs", "//staging/src/k8s.io/kube-scheduler:all-srcs", "//staging/src/k8s.io/kubelet:all-srcs", + "//staging/src/k8s.io/legacy-cloud-providers:all-srcs", "//staging/src/k8s.io/metrics:all-srcs", "//staging/src/k8s.io/node-api:all-srcs", "//staging/src/k8s.io/sample-apiserver:all-srcs", diff --git a/staging/src/k8s.io/legacy-cloud-providers/.github/PULL_REQUEST_TEMPLATE.md b/staging/src/k8s.io/legacy-cloud-providers/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000000..e7e5eb834b --- /dev/null +++ b/staging/src/k8s.io/legacy-cloud-providers/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,2 @@ +Sorry, we do not accept changes directly against this repository. Please see +CONTRIBUTING.md for information on where and how to contribute instead. diff --git a/staging/src/k8s.io/legacy-cloud-providers/BUILD b/staging/src/k8s.io/legacy-cloud-providers/BUILD new file mode 100644 index 0000000000..68fee854f9 --- /dev/null +++ b/staging/src/k8s.io/legacy-cloud-providers/BUILD @@ -0,0 +1,16 @@ +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [ + ":package-srcs", + "//staging/src/k8s.io/legacy-cloud-providers/vsphere:all-srcs", + ], + tags = ["automanaged"], + visibility = ["//visibility:public"], +) diff --git a/staging/src/k8s.io/legacy-cloud-providers/LICENSE b/staging/src/k8s.io/legacy-cloud-providers/LICENSE new file mode 100644 index 0000000000..8dada3edaf --- /dev/null +++ b/staging/src/k8s.io/legacy-cloud-providers/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/staging/src/k8s.io/legacy-cloud-providers/OWNERS b/staging/src/k8s.io/legacy-cloud-providers/OWNERS new file mode 100644 index 0000000000..bf3e6b2a94 --- /dev/null +++ b/staging/src/k8s.io/legacy-cloud-providers/OWNERS @@ -0,0 +1,17 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +approvers: +- mikedanese +- dims +- andrewsykim +- cheftako +- mcrute +reviewers: +- mikedanese +- dims +- andrewsykim +- cheftako +- mcrute +labels: +- sig/cloud-provider +- area/cloudprovider diff --git a/staging/src/k8s.io/legacy-cloud-providers/README.md b/staging/src/k8s.io/legacy-cloud-providers/README.md new file mode 100644 index 0000000000..f3290ee395 --- /dev/null +++ b/staging/src/k8s.io/legacy-cloud-providers/README.md @@ -0,0 +1,29 @@ +# legacy-cloud-providers + +This repository hosts the legacy cloud providers that were previously hosted under +`k8s.io/kubernetes/pkg/cloudprovider/providers`. Out-of-tree cloud providers can consume +packages in this repo to support legacy implementations of their Kubernetes cloud provider. + +**Note:** go-get or vendor this package as `k8s.io/legacy-cloud-providers`. + +## Purpose + +To be consumed by out-of-tree cloud providers that wish to support legacy behavior +from their in-tree equivalents. + +## Compatibility + +The legacy providers here follow the same compatibility rules as cloud providers that +were previously in `k8s.io/kubernetes/pkg/cloudprovider/providers`. + +## Where does it come from? + +`legacy-cloud-providers` is synced from https://github.com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/legacy-cloud-providers. +Code changes are made in that location, merged into `k8s.io/kubernetes` and later synced here. + +## Things you should NOT do + + 1. Add a new cloud provider here. + 2. Directly modify anything under this repo. Those are driven from `k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers`. + sig-cloudprovider. + 3. Add new features/integrations to a cloud provider in this repo. Changes sync here should only be incremental bug fixes. diff --git a/staging/src/k8s.io/legacy-cloud-providers/SECURITY_CONTACTS b/staging/src/k8s.io/legacy-cloud-providers/SECURITY_CONTACTS new file mode 100644 index 0000000000..c8282d6bd6 --- /dev/null +++ b/staging/src/k8s.io/legacy-cloud-providers/SECURITY_CONTACTS @@ -0,0 +1,15 @@ +# Defined below are the security contacts for this repo. +# +# They are the contact point for the Product Security Committee to reach out +# to for triaging and handling of incoming issues. +# +# The below names agree to abide by the +# [Embargo Policy](https://git.k8s.io/security/private-distributors-list.md#embargo-policy) +# and will be removed and replaced if they violate that agreement. +# +# DO NOT REPORT SECURITY VULNERABILITIES DIRECTLY TO THESE NAMES, FOLLOW THE +# INSTRUCTIONS AT https://kubernetes.io/security/ + +cheftako +andrewsykim +dims diff --git a/staging/src/k8s.io/legacy-cloud-providers/code-of-conduct.md b/staging/src/k8s.io/legacy-cloud-providers/code-of-conduct.md new file mode 100644 index 0000000000..0d15c00cf3 --- /dev/null +++ b/staging/src/k8s.io/legacy-cloud-providers/code-of-conduct.md @@ -0,0 +1,3 @@ +# Kubernetes Community Code of Conduct + +Please refer to our [Kubernetes Community Code of Conduct](https://git.k8s.io/community/code-of-conduct.md) diff --git a/pkg/cloudprovider/providers/vsphere/BUILD b/staging/src/k8s.io/legacy-cloud-providers/vsphere/BUILD similarity index 85% rename from pkg/cloudprovider/providers/vsphere/BUILD rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/BUILD index 45e49e2a73..ebf4bf262c 100644 --- a/pkg/cloudprovider/providers/vsphere/BUILD +++ b/staging/src/k8s.io/legacy-cloud-providers/vsphere/BUILD @@ -17,10 +17,9 @@ go_library( "vsphere_util_unsupported.go", "vsphere_util_windows.go", ], - importpath = "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere", + importmap = "k8s.io/kubernetes/vendor/k8s.io/legacy-cloud-providers/vsphere", + importpath = "k8s.io/legacy-cloud-providers/vsphere", deps = [ - "//pkg/cloudprovider/providers/vsphere/vclib:go_default_library", - "//pkg/cloudprovider/providers/vsphere/vclib/diskmanagers:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", @@ -32,6 +31,8 @@ go_library( "//staging/src/k8s.io/cloud-provider:go_default_library", "//staging/src/k8s.io/cloud-provider/node/helpers:go_default_library", "//staging/src/k8s.io/cloud-provider/volume/helpers:go_default_library", + "//staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib:go_default_library", + "//staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers:go_default_library", "//vendor/github.com/vmware/govmomi/object:go_default_library", "//vendor/github.com/vmware/govmomi/property:go_default_library", "//vendor/github.com/vmware/govmomi/vapi/rest:go_default_library", @@ -54,8 +55,6 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/cloudprovider/providers/vsphere/vclib:go_default_library", - "//pkg/cloudprovider/providers/vsphere/vclib/fixtures: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/labels:go_default_library", @@ -64,6 +63,8 @@ go_test( "//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/cloud-provider:go_default_library", + "//staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib:go_default_library", + "//staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/fixtures:go_default_library", "//vendor/github.com/vmware/govmomi:go_default_library", "//vendor/github.com/vmware/govmomi/find:go_default_library", "//vendor/github.com/vmware/govmomi/lookup/simulator:go_default_library", @@ -90,7 +91,8 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/cloudprovider/providers/vsphere/vclib:all-srcs", + "//staging/src/k8s.io/legacy-cloud-providers/vsphere/testing:all-srcs", + "//staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/cloudprovider/providers/vsphere/OWNERS b/staging/src/k8s.io/legacy-cloud-providers/vsphere/OWNERS similarity index 60% rename from pkg/cloudprovider/providers/vsphere/OWNERS rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/OWNERS index eca27ff2f9..a0c8991a37 100644 --- a/pkg/cloudprovider/providers/vsphere/OWNERS +++ b/staging/src/k8s.io/legacy-cloud-providers/vsphere/OWNERS @@ -8,3 +8,11 @@ approvers: - frapposelli - dougm - SandeepPissay +reviewers: +- abrarshivani +- baludontu +- divyenpatel +- imkin +- frapposelli +- dougm +- SandeepPissay diff --git a/pkg/cloudprovider/providers/vsphere/credentialmanager.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/credentialmanager.go similarity index 100% rename from pkg/cloudprovider/providers/vsphere/credentialmanager.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/credentialmanager.go diff --git a/pkg/cloudprovider/providers/vsphere/credentialmanager_test.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/credentialmanager_test.go similarity index 100% rename from pkg/cloudprovider/providers/vsphere/credentialmanager_test.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/credentialmanager_test.go diff --git a/pkg/cloudprovider/providers/vsphere/nodemanager.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/nodemanager.go similarity index 99% rename from pkg/cloudprovider/providers/vsphere/nodemanager.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/nodemanager.go index f245e336f6..7fd890649d 100644 --- a/pkg/cloudprovider/providers/vsphere/nodemanager.go +++ b/staging/src/k8s.io/legacy-cloud-providers/vsphere/nodemanager.go @@ -27,7 +27,7 @@ import ( k8stypes "k8s.io/apimachinery/pkg/types" cloudprovider "k8s.io/cloud-provider" "k8s.io/klog" - "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere/vclib" + "k8s.io/legacy-cloud-providers/vsphere/vclib" ) // Stores info about the kubernetes node diff --git a/staging/src/k8s.io/legacy-cloud-providers/vsphere/testing/BUILD b/staging/src/k8s.io/legacy-cloud-providers/vsphere/testing/BUILD new file mode 100644 index 0000000000..e2306f4924 --- /dev/null +++ b/staging/src/k8s.io/legacy-cloud-providers/vsphere/testing/BUILD @@ -0,0 +1,29 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "go_default_library", + srcs = ["testing.go"], + importmap = "k8s.io/kubernetes/vendor/k8s.io/legacy-cloud-providers/vsphere/testing", + importpath = "k8s.io/legacy-cloud-providers/vsphere/testing", + visibility = ["//visibility:public"], + deps = [ + "//vendor/github.com/vmware/govmomi/lookup/simulator:go_default_library", + "//vendor/github.com/vmware/govmomi/simulator:go_default_library", + "//vendor/github.com/vmware/govmomi/sts/simulator:go_default_library", + "//vendor/github.com/vmware/govmomi/vapi/simulator:go_default_library", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], + visibility = ["//visibility:public"], +) diff --git a/staging/src/k8s.io/legacy-cloud-providers/vsphere/testing/testing.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/testing/testing.go new file mode 100644 index 0000000000..57579ac482 --- /dev/null +++ b/staging/src/k8s.io/legacy-cloud-providers/vsphere/testing/testing.go @@ -0,0 +1,27 @@ +/* +Copyright 2019 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package testing + +import ( + // test dependencies for k8s.io/legacy-cloud-providers/vsphere + // import this package to vendor test dependencies since go modules does not + // vendor transitive test dependencies + _ "github.com/vmware/govmomi/lookup/simulator" + _ "github.com/vmware/govmomi/simulator" + _ "github.com/vmware/govmomi/sts/simulator" + _ "github.com/vmware/govmomi/vapi/simulator" +) diff --git a/pkg/cloudprovider/providers/vsphere/vclib/BUILD b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/BUILD similarity index 84% rename from pkg/cloudprovider/providers/vsphere/vclib/BUILD rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/BUILD index f67627590e..8a32963b28 100644 --- a/pkg/cloudprovider/providers/vsphere/vclib/BUILD +++ b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/BUILD @@ -22,7 +22,8 @@ go_library( "volumeoptions.go", "vsphere_metrics.go", ], - importpath = "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere/vclib", + importmap = "k8s.io/kubernetes/vendor/k8s.io/legacy-cloud-providers/vsphere/vclib", + importpath = "k8s.io/legacy-cloud-providers/vsphere/vclib", deps = [ "//staging/src/k8s.io/client-go/pkg/version:go_default_library", "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library", @@ -52,8 +53,8 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/cloudprovider/providers/vsphere/vclib/diskmanagers:all-srcs", - "//pkg/cloudprovider/providers/vsphere/vclib/fixtures:all-srcs", + "//staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers:all-srcs", + "//staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/fixtures:all-srcs", ], tags = ["automanaged"], ) @@ -70,7 +71,7 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/cloudprovider/providers/vsphere/vclib/fixtures:go_default_library", + "//staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/fixtures:go_default_library", "//vendor/github.com/vmware/govmomi:go_default_library", "//vendor/github.com/vmware/govmomi/object:go_default_library", "//vendor/github.com/vmware/govmomi/simulator:go_default_library", diff --git a/pkg/cloudprovider/providers/vsphere/vclib/connection.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/connection.go similarity index 100% rename from pkg/cloudprovider/providers/vsphere/vclib/connection.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/connection.go diff --git a/pkg/cloudprovider/providers/vsphere/vclib/connection_test.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/connection_test.go similarity index 97% rename from pkg/cloudprovider/providers/vsphere/vclib/connection_test.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/connection_test.go index 3e34886060..faa0a2d864 100644 --- a/pkg/cloudprovider/providers/vsphere/vclib/connection_test.go +++ b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/connection_test.go @@ -30,8 +30,8 @@ import ( "strings" "testing" - "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere/vclib" - "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere/vclib/fixtures" + "k8s.io/legacy-cloud-providers/vsphere/vclib" + "k8s.io/legacy-cloud-providers/vsphere/vclib/fixtures" ) func createTestServer( diff --git a/pkg/cloudprovider/providers/vsphere/vclib/constants.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/constants.go similarity index 100% rename from pkg/cloudprovider/providers/vsphere/vclib/constants.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/constants.go diff --git a/pkg/cloudprovider/providers/vsphere/vclib/custom_errors.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/custom_errors.go similarity index 100% rename from pkg/cloudprovider/providers/vsphere/vclib/custom_errors.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/custom_errors.go diff --git a/pkg/cloudprovider/providers/vsphere/vclib/datacenter.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/datacenter.go similarity index 100% rename from pkg/cloudprovider/providers/vsphere/vclib/datacenter.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/datacenter.go diff --git a/pkg/cloudprovider/providers/vsphere/vclib/datacenter_test.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/datacenter_test.go similarity index 100% rename from pkg/cloudprovider/providers/vsphere/vclib/datacenter_test.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/datacenter_test.go diff --git a/pkg/cloudprovider/providers/vsphere/vclib/datastore.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/datastore.go similarity index 100% rename from pkg/cloudprovider/providers/vsphere/vclib/datastore.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/datastore.go diff --git a/pkg/cloudprovider/providers/vsphere/vclib/datastore_test.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/datastore_test.go similarity index 100% rename from pkg/cloudprovider/providers/vsphere/vclib/datastore_test.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/datastore_test.go diff --git a/pkg/cloudprovider/providers/vsphere/vclib/diskmanagers/BUILD b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers/BUILD similarity index 72% rename from pkg/cloudprovider/providers/vsphere/vclib/diskmanagers/BUILD rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers/BUILD index 4273c972f2..f99517c3c4 100644 --- a/pkg/cloudprovider/providers/vsphere/vclib/diskmanagers/BUILD +++ b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers/BUILD @@ -12,9 +12,10 @@ go_library( "virtualdisk.go", "vmdm.go", ], - importpath = "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere/vclib/diskmanagers", + importmap = "k8s.io/kubernetes/vendor/k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers", + importpath = "k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers", deps = [ - "//pkg/cloudprovider/providers/vsphere/vclib:go_default_library", + "//staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib:go_default_library", "//vendor/github.com/vmware/govmomi/object:go_default_library", "//vendor/github.com/vmware/govmomi/vim25/types:go_default_library", "//vendor/k8s.io/klog:go_default_library", diff --git a/pkg/cloudprovider/providers/vsphere/vclib/diskmanagers/vdm.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers/vdm.go similarity index 98% rename from pkg/cloudprovider/providers/vsphere/vclib/diskmanagers/vdm.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers/vdm.go index 9a1c4715cf..654d018a11 100644 --- a/pkg/cloudprovider/providers/vsphere/vclib/diskmanagers/vdm.go +++ b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers/vdm.go @@ -22,8 +22,9 @@ import ( "github.com/vmware/govmomi/object" "github.com/vmware/govmomi/vim25/types" + "k8s.io/klog" - "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere/vclib" + "k8s.io/legacy-cloud-providers/vsphere/vclib" ) // virtualDiskManager implements VirtualDiskProvider Interface for creating and deleting volume using VirtualDiskManager diff --git a/pkg/cloudprovider/providers/vsphere/vclib/diskmanagers/virtualdisk.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers/virtualdisk.go similarity index 97% rename from pkg/cloudprovider/providers/vsphere/vclib/diskmanagers/virtualdisk.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers/virtualdisk.go index 6d7f7f5fe9..5b8368c69d 100644 --- a/pkg/cloudprovider/providers/vsphere/vclib/diskmanagers/virtualdisk.go +++ b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers/virtualdisk.go @@ -21,7 +21,7 @@ import ( "fmt" "k8s.io/klog" - "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere/vclib" + "k8s.io/legacy-cloud-providers/vsphere/vclib" ) // VirtualDisk is for the Disk Management diff --git a/pkg/cloudprovider/providers/vsphere/vclib/diskmanagers/vmdm.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers/vmdm.go similarity index 99% rename from pkg/cloudprovider/providers/vsphere/vclib/diskmanagers/vmdm.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers/vmdm.go index 637ac514bf..0d45dc3a1e 100644 --- a/pkg/cloudprovider/providers/vsphere/vclib/diskmanagers/vmdm.go +++ b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers/vmdm.go @@ -24,8 +24,9 @@ import ( "github.com/vmware/govmomi/object" "github.com/vmware/govmomi/vim25/types" + "k8s.io/klog" - "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere/vclib" + "k8s.io/legacy-cloud-providers/vsphere/vclib" ) // vmDiskManager implements VirtualDiskProvider interface for creating volume using Virtual Machine Reconfigure approach diff --git a/pkg/cloudprovider/providers/vsphere/vclib/fixtures/BUILD b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/fixtures/BUILD similarity index 74% rename from pkg/cloudprovider/providers/vsphere/vclib/fixtures/BUILD rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/fixtures/BUILD index 026ee7bd22..42a9d2faba 100644 --- a/pkg/cloudprovider/providers/vsphere/vclib/fixtures/BUILD +++ b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/fixtures/BUILD @@ -7,7 +7,8 @@ go_library( "*.pem", "*.key", ]), - importpath = "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere/vclib/fixtures", + importmap = "k8s.io/kubernetes/vendor/k8s.io/legacy-cloud-providers/vsphere/vclib/fixtures", + importpath = "k8s.io/legacy-cloud-providers/vsphere/vclib/fixtures", visibility = ["//visibility:public"], ) diff --git a/pkg/cloudprovider/providers/vsphere/vclib/fixtures/ca.key b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/fixtures/ca.key similarity index 100% rename from pkg/cloudprovider/providers/vsphere/vclib/fixtures/ca.key rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/fixtures/ca.key diff --git a/pkg/cloudprovider/providers/vsphere/vclib/fixtures/ca.pem b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/fixtures/ca.pem similarity index 100% rename from pkg/cloudprovider/providers/vsphere/vclib/fixtures/ca.pem rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/fixtures/ca.pem diff --git a/pkg/cloudprovider/providers/vsphere/vclib/fixtures/createCerts.sh b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/fixtures/createCerts.sh similarity index 100% rename from pkg/cloudprovider/providers/vsphere/vclib/fixtures/createCerts.sh rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/fixtures/createCerts.sh diff --git a/pkg/cloudprovider/providers/vsphere/vclib/fixtures/fixtures.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/fixtures/fixtures.go similarity index 100% rename from pkg/cloudprovider/providers/vsphere/vclib/fixtures/fixtures.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/fixtures/fixtures.go diff --git a/pkg/cloudprovider/providers/vsphere/vclib/fixtures/invalid.pem b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/fixtures/invalid.pem similarity index 100% rename from pkg/cloudprovider/providers/vsphere/vclib/fixtures/invalid.pem rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/fixtures/invalid.pem diff --git a/pkg/cloudprovider/providers/vsphere/vclib/fixtures/server.csr b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/fixtures/server.csr similarity index 100% rename from pkg/cloudprovider/providers/vsphere/vclib/fixtures/server.csr rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/fixtures/server.csr diff --git a/pkg/cloudprovider/providers/vsphere/vclib/fixtures/server.key b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/fixtures/server.key similarity index 100% rename from pkg/cloudprovider/providers/vsphere/vclib/fixtures/server.key rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/fixtures/server.key diff --git a/pkg/cloudprovider/providers/vsphere/vclib/fixtures/server.pem b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/fixtures/server.pem similarity index 100% rename from pkg/cloudprovider/providers/vsphere/vclib/fixtures/server.pem rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/fixtures/server.pem diff --git a/pkg/cloudprovider/providers/vsphere/vclib/folder.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/folder.go similarity index 100% rename from pkg/cloudprovider/providers/vsphere/vclib/folder.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/folder.go diff --git a/pkg/cloudprovider/providers/vsphere/vclib/folder_test.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/folder_test.go similarity index 100% rename from pkg/cloudprovider/providers/vsphere/vclib/folder_test.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/folder_test.go diff --git a/pkg/cloudprovider/providers/vsphere/vclib/pbm.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/pbm.go similarity index 100% rename from pkg/cloudprovider/providers/vsphere/vclib/pbm.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/pbm.go diff --git a/pkg/cloudprovider/providers/vsphere/vclib/utils.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/utils.go similarity index 100% rename from pkg/cloudprovider/providers/vsphere/vclib/utils.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/utils.go diff --git a/pkg/cloudprovider/providers/vsphere/vclib/utils_test.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/utils_test.go similarity index 100% rename from pkg/cloudprovider/providers/vsphere/vclib/utils_test.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/utils_test.go diff --git a/pkg/cloudprovider/providers/vsphere/vclib/virtualmachine.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/virtualmachine.go similarity index 100% rename from pkg/cloudprovider/providers/vsphere/vclib/virtualmachine.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/virtualmachine.go diff --git a/pkg/cloudprovider/providers/vsphere/vclib/virtualmachine_test.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/virtualmachine_test.go similarity index 100% rename from pkg/cloudprovider/providers/vsphere/vclib/virtualmachine_test.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/virtualmachine_test.go diff --git a/pkg/cloudprovider/providers/vsphere/vclib/vmoptions.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/vmoptions.go similarity index 100% rename from pkg/cloudprovider/providers/vsphere/vclib/vmoptions.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/vmoptions.go diff --git a/pkg/cloudprovider/providers/vsphere/vclib/volumeoptions.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/volumeoptions.go similarity index 100% rename from pkg/cloudprovider/providers/vsphere/vclib/volumeoptions.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/volumeoptions.go diff --git a/pkg/cloudprovider/providers/vsphere/vclib/vsphere_metrics.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/vsphere_metrics.go similarity index 100% rename from pkg/cloudprovider/providers/vsphere/vclib/vsphere_metrics.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/vsphere_metrics.go diff --git a/pkg/cloudprovider/providers/vsphere/vsphere.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vsphere.go similarity index 99% rename from pkg/cloudprovider/providers/vsphere/vsphere.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vsphere.go index ff72c36d3c..f6946f1594 100644 --- a/pkg/cloudprovider/providers/vsphere/vsphere.go +++ b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vsphere.go @@ -47,8 +47,9 @@ import ( nodehelpers "k8s.io/cloud-provider/node/helpers" volumehelpers "k8s.io/cloud-provider/volume/helpers" "k8s.io/klog" - "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere/vclib" - "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere/vclib/diskmanagers" + + "k8s.io/legacy-cloud-providers/vsphere/vclib" + "k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers" ) // VSphere Cloud Provider constants diff --git a/pkg/cloudprovider/providers/vsphere/vsphere_test.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vsphere_test.go similarity index 99% rename from pkg/cloudprovider/providers/vsphere/vsphere_test.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vsphere_test.go index be7ea73f91..7fabd88943 100644 --- a/pkg/cloudprovider/providers/vsphere/vsphere_test.go +++ b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vsphere_test.go @@ -44,9 +44,10 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/rand" + cloudprovider "k8s.io/cloud-provider" - "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere/vclib" - "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere/vclib/fixtures" + "k8s.io/legacy-cloud-providers/vsphere/vclib" + "k8s.io/legacy-cloud-providers/vsphere/vclib/fixtures" ) // localhostCert was generated from crypto/tls/generate_cert.go with the following command: diff --git a/pkg/cloudprovider/providers/vsphere/vsphere_util.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vsphere_util.go similarity index 99% rename from pkg/cloudprovider/providers/vsphere/vsphere_util.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vsphere_util.go index ff0677a80d..6aa2cd11f6 100644 --- a/pkg/cloudprovider/providers/vsphere/vsphere_util.go +++ b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vsphere_util.go @@ -36,8 +36,8 @@ import ( "k8s.io/api/core/v1" k8stypes "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/version" - "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere/vclib" - "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere/vclib/diskmanagers" + "k8s.io/legacy-cloud-providers/vsphere/vclib" + "k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers" ) const ( diff --git a/pkg/cloudprovider/providers/vsphere/vsphere_util_linux.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vsphere_util_linux.go similarity index 100% rename from pkg/cloudprovider/providers/vsphere/vsphere_util_linux.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vsphere_util_linux.go diff --git a/pkg/cloudprovider/providers/vsphere/vsphere_util_test.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vsphere_util_test.go similarity index 96% rename from pkg/cloudprovider/providers/vsphere/vsphere_util_test.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vsphere_util_test.go index 702e1108e7..4e34b0c777 100644 --- a/pkg/cloudprovider/providers/vsphere/vsphere_util_test.go +++ b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vsphere_util_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere/vclib" + "k8s.io/legacy-cloud-providers/vsphere/vclib" "github.com/vmware/govmomi" "github.com/vmware/govmomi/simulator" diff --git a/pkg/cloudprovider/providers/vsphere/vsphere_util_unsupported.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vsphere_util_unsupported.go similarity index 100% rename from pkg/cloudprovider/providers/vsphere/vsphere_util_unsupported.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vsphere_util_unsupported.go diff --git a/pkg/cloudprovider/providers/vsphere/vsphere_util_windows.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vsphere_util_windows.go similarity index 100% rename from pkg/cloudprovider/providers/vsphere/vsphere_util_windows.go rename to staging/src/k8s.io/legacy-cloud-providers/vsphere/vsphere_util_windows.go diff --git a/vendor/k8s.io/legacy-cloud-providers b/vendor/k8s.io/legacy-cloud-providers new file mode 120000 index 0000000000..a6cbed3c9f --- /dev/null +++ b/vendor/k8s.io/legacy-cloud-providers @@ -0,0 +1 @@ +../../staging/src/k8s.io/legacy-cloud-providers \ No newline at end of file