diff --git a/Godeps/LICENSES b/Godeps/LICENSES index b5155e9ccbdd..dc86b9e71e62 100644 --- a/Godeps/LICENSES +++ b/Godeps/LICENSES @@ -2181,216 +2181,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ================================================================================ -================================================================================ -= vendor/github.com/codedellemc/goscaleio licensed under: = - -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. - - -= vendor/github.com/codedellemc/goscaleio/LICENSE d2794c0df5b907fdace235a619d80314 -================================================================================ - - ================================================================================ = vendor/github.com/container-storage-interface/spec licensed under: = @@ -17463,6 +17253,216 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ================================================================================ +================================================================================ += vendor/github.com/thecodeteam/goscaleio licensed under: = + +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. + + += vendor/github.com/thecodeteam/goscaleio/LICENSE d2794c0df5b907fdace235a619d80314 +================================================================================ + + ================================================================================ = vendor/github.com/tmc/grpc-websocket-proxy licensed under: = diff --git a/go.mod b/go.mod index 2a8c5342cf77..3011507ded94 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,6 @@ require ( github.com/client9/misspell v0.3.4 github.com/cloudflare/cfssl v0.0.0-20180726162950-56268a613adf github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313 - github.com/codedellemc/goscaleio v0.0.0-20170830184815-20e2ce2cf885 github.com/codegangsta/negroni v1.0.0 // indirect github.com/container-storage-interface/spec v1.1.0 github.com/containerd/console v0.0.0-20170925154832-84eeaae905fa // indirect @@ -132,6 +131,7 @@ require ( github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc github.com/stretchr/testify v1.3.0 github.com/syndtr/gocapability v0.0.0-20160928074757-e7cb7fa329f4 // indirect + github.com/thecodeteam/goscaleio v0.1.0 github.com/urfave/negroni v1.0.0 // indirect github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936 // indirect @@ -219,7 +219,6 @@ replace ( github.com/client9/misspell => github.com/client9/misspell v0.3.4 github.com/cloudflare/cfssl => github.com/cloudflare/cfssl v0.0.0-20180726162950-56268a613adf github.com/clusterhq/flocker-go => github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313 - github.com/codedellemc/goscaleio => github.com/codedellemc/goscaleio v0.0.0-20170830184815-20e2ce2cf885 github.com/codegangsta/negroni => github.com/codegangsta/negroni v1.0.0 github.com/container-storage-interface/spec => github.com/container-storage-interface/spec v1.1.0 github.com/containerd/console => github.com/containerd/console v0.0.0-20170925154832-84eeaae905fa @@ -390,6 +389,7 @@ replace ( github.com/stretchr/objx => github.com/stretchr/objx v0.2.0 github.com/stretchr/testify => github.com/stretchr/testify v1.3.0 github.com/syndtr/gocapability => github.com/syndtr/gocapability v0.0.0-20160928074757-e7cb7fa329f4 + github.com/thecodeteam/goscaleio => github.com/thecodeteam/goscaleio v0.1.0 github.com/tmc/grpc-websocket-proxy => github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8 github.com/ugorji/go/codec => github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 github.com/urfave/negroni => github.com/urfave/negroni v1.0.0 diff --git a/go.sum b/go.sum index f788908c00ee..c9f2dd1efefb 100644 --- a/go.sum +++ b/go.sum @@ -65,8 +65,6 @@ github.com/cloudflare/cfssl v0.0.0-20180726162950-56268a613adf h1:eOyFuj3h/Vj5e4 github.com/cloudflare/cfssl v0.0.0-20180726162950-56268a613adf/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA= github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313 h1:eIHD9GNM3Hp7kcRW5mvcz7WTR3ETeoYYKwpgA04kaXE= github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313/go.mod h1:P1wt9Z3DP8O6W3rvwCt0REIlshg1InHImaLW0t3ObY0= -github.com/codedellemc/goscaleio v0.0.0-20170830184815-20e2ce2cf885 h1:R+oTsULuK7IPPnvgrETxBo4W5UU3GDcX0jQMxuW4hVU= -github.com/codedellemc/goscaleio v0.0.0-20170830184815-20e2ce2cf885/go.mod h1:JIHmDHNZO4tmA3y3RHp6+Gap6kFsNf55W9Pn/3YS9IY= github.com/codegangsta/negroni v1.0.0 h1:+aYywywx4bnKXWvoWtRfJ91vC59NbEhEY03sZjQhbVY= github.com/codegangsta/negroni v1.0.0/go.mod h1:v0y3T5G7Y1UlFfyxFn/QLRU4a2EuNau2iZY63YTKWo0= github.com/container-storage-interface/spec v1.1.0 h1:qPsTqtR1VUPvMPeK0UnCZMtXaKGyyLPG8gj/wG6VqMs= @@ -388,6 +386,8 @@ github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/syndtr/gocapability v0.0.0-20160928074757-e7cb7fa329f4 h1:w58e6FAOMd+rUgOfhaBb+ZVOQIOfUkpv5AAQVmf6hsI= github.com/syndtr/gocapability v0.0.0-20160928074757-e7cb7fa329f4/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= +github.com/thecodeteam/goscaleio v0.1.0 h1:SB5tO98lawC+UK8ds/U2jyfOCH7GTcFztcF5x9gbut4= +github.com/thecodeteam/goscaleio v0.1.0/go.mod h1:68sdkZAsK8bvEwBlbQnlLS+xU+hvLYM/iQ8KXej1AwM= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8 h1:ndzgwNDnKIqyCvHTXaCqh9KlOWKvBry6nuXMJmonVsE= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= diff --git a/pkg/volume/scaleio/BUILD b/pkg/volume/scaleio/BUILD index cc6c67f4f315..c9b54e127345 100644 --- a/pkg/volume/scaleio/BUILD +++ b/pkg/volume/scaleio/BUILD @@ -24,7 +24,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", - "//vendor/github.com/codedellemc/goscaleio/types/v1:go_default_library", + "//vendor/github.com/thecodeteam/goscaleio/types/v1:go_default_library", "//vendor/k8s.io/klog:go_default_library", ], ) @@ -49,8 +49,8 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library", "//staging/src/k8s.io/cloud-provider/volume/helpers:go_default_library", - "//vendor/github.com/codedellemc/goscaleio:go_default_library", - "//vendor/github.com/codedellemc/goscaleio/types/v1:go_default_library", + "//vendor/github.com/thecodeteam/goscaleio:go_default_library", + "//vendor/github.com/thecodeteam/goscaleio/types/v1: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", diff --git a/pkg/volume/scaleio/sio_client.go b/pkg/volume/scaleio/sio_client.go index 2182460754ee..bc9b9868f7ba 100644 --- a/pkg/volume/scaleio/sio_client.go +++ b/pkg/volume/scaleio/sio_client.go @@ -30,8 +30,8 @@ import ( "k8s.io/kubernetes/pkg/util/mount" - sio "github.com/codedellemc/goscaleio" - siotypes "github.com/codedellemc/goscaleio/types/v1" + sio "github.com/thecodeteam/goscaleio" + siotypes "github.com/thecodeteam/goscaleio/types/v1" "k8s.io/klog" ) diff --git a/pkg/volume/scaleio/sio_mgr.go b/pkg/volume/scaleio/sio_mgr.go index 56a0680d1fa4..e63b58da1884 100644 --- a/pkg/volume/scaleio/sio_mgr.go +++ b/pkg/volume/scaleio/sio_mgr.go @@ -24,7 +24,7 @@ import ( "k8s.io/klog" - siotypes "github.com/codedellemc/goscaleio/types/v1" + siotypes "github.com/thecodeteam/goscaleio/types/v1" ) type sioMgr struct { diff --git a/pkg/volume/scaleio/sio_mgr_test.go b/pkg/volume/scaleio/sio_mgr_test.go index b1dff3ca1a86..1815a5cba15b 100644 --- a/pkg/volume/scaleio/sio_mgr_test.go +++ b/pkg/volume/scaleio/sio_mgr_test.go @@ -23,7 +23,7 @@ import ( "k8s.io/kubernetes/pkg/util/mount" - siotypes "github.com/codedellemc/goscaleio/types/v1" + siotypes "github.com/thecodeteam/goscaleio/types/v1" ) var ( diff --git a/vendor/BUILD b/vendor/BUILD index 749aaf216b7a..bca0d4c6d84b 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -86,7 +86,6 @@ filegroup( "//vendor/github.com/cloudflare/cfssl/ocsp/config:all-srcs", "//vendor/github.com/cloudflare/cfssl/signer:all-srcs", "//vendor/github.com/clusterhq/flocker-go:all-srcs", - "//vendor/github.com/codedellemc/goscaleio:all-srcs", "//vendor/github.com/container-storage-interface/spec/lib/go/csi:all-srcs", "//vendor/github.com/containerd/console:all-srcs", "//vendor/github.com/containerd/containerd/api/services/containers/v1:all-srcs", @@ -343,6 +342,7 @@ filegroup( "//vendor/github.com/stretchr/testify/mock:all-srcs", "//vendor/github.com/stretchr/testify/require:all-srcs", "//vendor/github.com/syndtr/gocapability/capability:all-srcs", + "//vendor/github.com/thecodeteam/goscaleio:all-srcs", "//vendor/github.com/tmc/grpc-websocket-proxy/wsproxy:all-srcs", "//vendor/github.com/vishvananda/netlink:all-srcs", "//vendor/github.com/vishvananda/netns:all-srcs", diff --git a/vendor/github.com/codedellemc/goscaleio/.gitignore b/vendor/github.com/codedellemc/goscaleio/.gitignore deleted file mode 100644 index a67c18279fb0..000000000000 --- a/vendor/github.com/codedellemc/goscaleio/.gitignore +++ /dev/null @@ -1,420 +0,0 @@ -*.*-e -.*-e -*-e -vendor/ -.build/ -.rpmbuild/ -example -release/* -golang-crosscompile/ -.project -*.d -*.out -.gaesdk/ - -# Created by https://www.gitignore.io - -### Windows ### -# Windows image file caches -Thumbs.db -ehthumbs.db - -# Folder config file -Desktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msm -*.msp - -# Windows shortcuts -*.lnk - - -### OSX ### -.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon - - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - - -### Eclipse ### -*.pydevproject -.metadata -.gradle -bin/ -tmp/ -*.tmp -*.bak -*.swp -*~.nib -local.properties -.settings/ -.loadpath - -# Eclipse Core -.project - -# External tool builders -.externalToolBuilders/ - -# Locally stored "Eclipse launch configurations" -*.launch - -# CDT-specific -.cproject - -# JDT-specific (Eclipse Java Development Tools) -.classpath - -# PDT-specific -.buildpath - -# sbteclipse plugin -.target - -# TeXlipse plugin -.texlipse - - -### Go ### -# Compiled Object files, Static and Dynamic libs (Shared Objects) -*.o -*.a -*.so - -# Folders -_obj -_test - -# Architecture specific extensions/prefixes -*.[568vq] -[568vq].out - -*.cgo1.go -*.cgo2.c -_cgo_defun.c -_cgo_gotypes.go -_cgo_export.* - -_testmain.go - -*.exe -*.test -*.prof - - -### SublimeText ### -# cache files for sublime text -*.tmlanguage.cache -*.tmPreferences.cache -*.stTheme.cache - -# workspace files are user-specific -*.sublime-workspace - -# project files should be checked into the repository, unless a significant -# proportion of contributors will probably not be using SublimeText -# *.sublime-project - -# sftp configuration file -sftp-config.json - - -### VisualStudio ### -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# User-specific files -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -build/ -bld/ -[Bb]in/ -[Oo]bj/ - -# Visual Studo 2015 cache/options directory -.vs/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opensdf -*.sdf -*.cachefile - -# Visual Studio profiler -*.psess -*.vsp -*.vspx - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding addin-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# NCrunch -_NCrunch_* -.*crunch*.local.xml - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# TODO: Comment the next line if you want to checkin your web deploy settings -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/packages/* -# except build/, which is used as an MSBuild target. -!**/packages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/packages/repositories.config - -# Windows Azure Build Output -csx/ -*.build.csdef - -# Windows Store app package directory -AppPackages/ - -# Others -*.[Cc]ache -ClientBin/ -[Ss]tyle[Cc]op.* -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.pfx -*.publishsettings -node_modules/ -bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm - -# SQL Server files -*.mdf -*.ldf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings - -# Microsoft Fakes -FakesAssemblies/ - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - - -### Maven ### -target/ -pom.xml.tag -pom.xml.releaseBackup -pom.xml.versionsBackup -pom.xml.next -release.properties -dependency-reduced-pom.xml -buildNumber.properties - - -### Java ### -*.class - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.jar -*.war -*.ear - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* - - -### Intellij ### -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm - -*.iml - -## Directory-based project format: -.idea/ -# if you remove the above rule, at least ignore the following: - -# User-specific stuff: -# .idea/workspace.xml -# .idea/tasks.xml -# .idea/dictionaries - -# Sensitive or high-churn files: -# .idea/dataSources.ids -# .idea/dataSources.xml -# .idea/sqlDataSources.xml -# .idea/dynamic.xml -# .idea/uiDesigner.xml - -# Gradle: -# .idea/gradle.xml -# .idea/libraries - -# Mongo Explorer plugin: -# .idea/mongoSettings.xml - -## File-based project format: -*.ipr -*.iws - -## Plugin-specific files: - -# IntelliJ -/out/ - -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties diff --git a/vendor/github.com/codedellemc/goscaleio/.travis.yml b/vendor/github.com/codedellemc/goscaleio/.travis.yml deleted file mode 100644 index 4cb22c9de910..000000000000 --- a/vendor/github.com/codedellemc/goscaleio/.travis.yml +++ /dev/null @@ -1,10 +0,0 @@ -language: go - -install: - - go get -t ./... - - go get code.google.com/p/go.tools/cmd/cover - - go get github.com/mattn/goveralls - -script: - - PATH="$HOME/gopath/bin:$PATH" - - script/coverage --coveralls diff --git a/vendor/github.com/thecodeteam/goscaleio/.gitignore b/vendor/github.com/thecodeteam/goscaleio/.gitignore new file mode 100644 index 000000000000..3aef02675d47 --- /dev/null +++ b/vendor/github.com/thecodeteam/goscaleio/.gitignore @@ -0,0 +1,17 @@ +# Binaries for programs and plugins +*.exe +*.dll +*.so +*.dylib + +# Test binary, build with `go test -c` +*.test + +# Output of the go coverage tool, specifically when used with LiteIDE +*.out + +# Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736 +.glide/ + +# A macOS metadata file +.DS_Store diff --git a/vendor/github.com/thecodeteam/goscaleio/.travis.yml b/vendor/github.com/thecodeteam/goscaleio/.travis.yml new file mode 100644 index 000000000000..9f9f43fda333 --- /dev/null +++ b/vendor/github.com/thecodeteam/goscaleio/.travis.yml @@ -0,0 +1,11 @@ +go_import_path: github.com/thecodeteam/goscaleio + +language: go +go: + - 1.8.3 + - 1.9.1 +os: + - linux + +install: true +script: go build diff --git a/vendor/github.com/codedellemc/goscaleio/BUILD b/vendor/github.com/thecodeteam/goscaleio/BUILD similarity index 77% rename from vendor/github.com/codedellemc/goscaleio/BUILD rename to vendor/github.com/thecodeteam/goscaleio/BUILD index dbd5dbe2d2f1..19460ee186f7 100644 --- a/vendor/github.com/codedellemc/goscaleio/BUILD +++ b/vendor/github.com/thecodeteam/goscaleio/BUILD @@ -16,12 +16,12 @@ go_library( "user.go", "volume.go", ], - importmap = "k8s.io/kubernetes/vendor/github.com/codedellemc/goscaleio", - importpath = "github.com/codedellemc/goscaleio", + importmap = "k8s.io/kubernetes/vendor/github.com/thecodeteam/goscaleio", + importpath = "github.com/thecodeteam/goscaleio", visibility = ["//visibility:public"], deps = [ - "//vendor/github.com/codedellemc/goscaleio/types/v1:go_default_library", "//vendor/github.com/sirupsen/logrus:go_default_library", + "//vendor/github.com/thecodeteam/goscaleio/types/v1:go_default_library", ], ) @@ -36,7 +36,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//vendor/github.com/codedellemc/goscaleio/types/v1:all-srcs", + "//vendor/github.com/thecodeteam/goscaleio/types/v1:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/vendor/github.com/thecodeteam/goscaleio/Gopkg.lock b/vendor/github.com/thecodeteam/goscaleio/Gopkg.lock new file mode 100644 index 000000000000..5f9c1bedfb2b --- /dev/null +++ b/vendor/github.com/thecodeteam/goscaleio/Gopkg.lock @@ -0,0 +1,27 @@ +# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. + + +[[projects]] + name = "github.com/sirupsen/logrus" + packages = ["."] + revision = "f006c2ac4710855cf0f916dd6b77acf6b048dc6e" + version = "v1.0.3" + +[[projects]] + branch = "master" + name = "golang.org/x/crypto" + packages = ["ssh/terminal"] + revision = "2509b142fb2b797aa7587dad548f113b2c0f20ce" + +[[projects]] + branch = "master" + name = "golang.org/x/sys" + packages = ["unix","windows"] + revision = "164713f0dfcec4e80be8b53e1f0811f5f0d84578" + +[solve-meta] + analyzer-name = "dep" + analyzer-version = 1 + inputs-digest = "9a4df6c2b9cbc7b6a8c1f52444dc0bace4dc5e03a39109d0e2f7956c62319982" + solver-name = "gps-cdcl" + solver-version = 1 diff --git a/vendor/github.com/thecodeteam/goscaleio/Gopkg.toml b/vendor/github.com/thecodeteam/goscaleio/Gopkg.toml new file mode 100644 index 000000000000..b0e2232b194f --- /dev/null +++ b/vendor/github.com/thecodeteam/goscaleio/Gopkg.toml @@ -0,0 +1,4 @@ +# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md +# for detailed Gopkg.toml documentation. +# +# Refer to https://github.com/toml-lang/toml for detailed TOML docs. diff --git a/vendor/github.com/codedellemc/goscaleio/LICENSE b/vendor/github.com/thecodeteam/goscaleio/LICENSE similarity index 100% rename from vendor/github.com/codedellemc/goscaleio/LICENSE rename to vendor/github.com/thecodeteam/goscaleio/LICENSE diff --git a/vendor/github.com/codedellemc/goscaleio/README.md b/vendor/github.com/thecodeteam/goscaleio/README.md similarity index 100% rename from vendor/github.com/codedellemc/goscaleio/README.md rename to vendor/github.com/thecodeteam/goscaleio/README.md diff --git a/vendor/github.com/thecodeteam/goscaleio/VERSION b/vendor/github.com/thecodeteam/goscaleio/VERSION new file mode 100644 index 000000000000..6e8bf73aa550 --- /dev/null +++ b/vendor/github.com/thecodeteam/goscaleio/VERSION @@ -0,0 +1 @@ +0.1.0 diff --git a/vendor/github.com/codedellemc/goscaleio/api.go b/vendor/github.com/thecodeteam/goscaleio/api.go similarity index 99% rename from vendor/github.com/codedellemc/goscaleio/api.go rename to vendor/github.com/thecodeteam/goscaleio/api.go index 55e601a9d75f..2b17c8886c1f 100644 --- a/vendor/github.com/codedellemc/goscaleio/api.go +++ b/vendor/github.com/thecodeteam/goscaleio/api.go @@ -16,7 +16,7 @@ import ( "strings" "time" - types "github.com/codedellemc/goscaleio/types/v1" + types "github.com/thecodeteam/goscaleio/types/v1" log "github.com/sirupsen/logrus" ) diff --git a/vendor/github.com/codedellemc/goscaleio/certs.go b/vendor/github.com/thecodeteam/goscaleio/certs.go similarity index 100% rename from vendor/github.com/codedellemc/goscaleio/certs.go rename to vendor/github.com/thecodeteam/goscaleio/certs.go diff --git a/vendor/github.com/codedellemc/goscaleio/device.go b/vendor/github.com/thecodeteam/goscaleio/device.go similarity index 98% rename from vendor/github.com/codedellemc/goscaleio/device.go rename to vendor/github.com/thecodeteam/goscaleio/device.go index d29cb4e41741..d1e2b23f9caa 100644 --- a/vendor/github.com/codedellemc/goscaleio/device.go +++ b/vendor/github.com/thecodeteam/goscaleio/device.go @@ -8,7 +8,7 @@ import ( "io/ioutil" "reflect" - types "github.com/codedellemc/goscaleio/types/v1" + types "github.com/thecodeteam/goscaleio/types/v1" ) type Device struct { diff --git a/vendor/github.com/codedellemc/goscaleio/instance.go b/vendor/github.com/thecodeteam/goscaleio/instance.go similarity index 99% rename from vendor/github.com/codedellemc/goscaleio/instance.go rename to vendor/github.com/thecodeteam/goscaleio/instance.go index b5c41f2ee6c1..6753ea664506 100644 --- a/vendor/github.com/codedellemc/goscaleio/instance.go +++ b/vendor/github.com/thecodeteam/goscaleio/instance.go @@ -8,7 +8,7 @@ import ( "io/ioutil" "strings" - types "github.com/codedellemc/goscaleio/types/v1" + types "github.com/thecodeteam/goscaleio/types/v1" ) func (client *Client) GetInstance(systemhref string) (systems []*types.System, err error) { diff --git a/vendor/github.com/codedellemc/goscaleio/protectiondomain.go b/vendor/github.com/thecodeteam/goscaleio/protectiondomain.go similarity index 98% rename from vendor/github.com/codedellemc/goscaleio/protectiondomain.go rename to vendor/github.com/thecodeteam/goscaleio/protectiondomain.go index 5731136379d5..abad3e25b954 100644 --- a/vendor/github.com/codedellemc/goscaleio/protectiondomain.go +++ b/vendor/github.com/thecodeteam/goscaleio/protectiondomain.go @@ -7,7 +7,7 @@ import ( "fmt" "io/ioutil" - types "github.com/codedellemc/goscaleio/types/v1" + types "github.com/thecodeteam/goscaleio/types/v1" ) type ProtectionDomain struct { diff --git a/vendor/github.com/codedellemc/goscaleio/scsiinitiator.go b/vendor/github.com/thecodeteam/goscaleio/scsiinitiator.go similarity index 95% rename from vendor/github.com/codedellemc/goscaleio/scsiinitiator.go rename to vendor/github.com/thecodeteam/goscaleio/scsiinitiator.go index 3c4d2443397f..d2bbc810ad3e 100644 --- a/vendor/github.com/codedellemc/goscaleio/scsiinitiator.go +++ b/vendor/github.com/thecodeteam/goscaleio/scsiinitiator.go @@ -3,7 +3,7 @@ package goscaleio import ( "fmt" - types "github.com/codedellemc/goscaleio/types/v1" + types "github.com/thecodeteam/goscaleio/types/v1" ) func (system *System) GetScsiInitiator() (scsiInitiators []types.ScsiInitiator, err error) { diff --git a/vendor/github.com/codedellemc/goscaleio/sdc.go b/vendor/github.com/thecodeteam/goscaleio/sdc.go similarity index 97% rename from vendor/github.com/codedellemc/goscaleio/sdc.go rename to vendor/github.com/thecodeteam/goscaleio/sdc.go index 97d2fb70f094..a590d744aef0 100644 --- a/vendor/github.com/codedellemc/goscaleio/sdc.go +++ b/vendor/github.com/thecodeteam/goscaleio/sdc.go @@ -10,7 +10,7 @@ import ( "reflect" "strings" - types "github.com/codedellemc/goscaleio/types/v1" + types "github.com/thecodeteam/goscaleio/types/v1" ) type Sdc struct { @@ -131,7 +131,7 @@ func GetSdcLocalGUID() (sdcGUID string, err error) { out, err := exec.Command("/opt/emc/scaleio/sdc/bin/drv_cfg", "--query_guid").Output() if err != nil { - return "", fmt.Errorf("Error querying volumes: ", err) + return "", fmt.Errorf("GetSdcLocalGUID: query vols failed: %v", err) } sdcGUID = strings.Replace(string(out), "\n", "", -1) diff --git a/vendor/github.com/codedellemc/goscaleio/sds.go b/vendor/github.com/thecodeteam/goscaleio/sds.go similarity index 94% rename from vendor/github.com/codedellemc/goscaleio/sds.go rename to vendor/github.com/thecodeteam/goscaleio/sds.go index 7ca5483ed848..c63d70267a0d 100644 --- a/vendor/github.com/codedellemc/goscaleio/sds.go +++ b/vendor/github.com/thecodeteam/goscaleio/sds.go @@ -8,7 +8,7 @@ import ( "io/ioutil" "reflect" - types "github.com/codedellemc/goscaleio/types/v1" + types "github.com/thecodeteam/goscaleio/types/v1" ) type Sds struct { @@ -41,13 +41,13 @@ func (protectionDomain *ProtectionDomain) CreateSds(name string, ipList []string return "", fmt.Errorf("Must provide at least 1 SDS IP") } else if len(ipList) == 1 { sdsIP := types.SdsIp{IP: ipList[0], Role: "all"} - sdsIPList := &types.SdsIpList{sdsIP} + sdsIPList := &types.SdsIpList{SdsIP: sdsIP} sdsParam.IPList = append(sdsParam.IPList, sdsIPList) } else if len(ipList) >= 2 { sdsIP1 := types.SdsIp{IP: ipList[0], Role: "sdcOnly"} sdsIP2 := types.SdsIp{IP: ipList[1], Role: "sdsOnly"} - sdsIPList1 := &types.SdsIpList{sdsIP1} - sdsIPList2 := &types.SdsIpList{sdsIP2} + sdsIPList1 := &types.SdsIpList{SdsIP: sdsIP1} + sdsIPList2 := &types.SdsIpList{SdsIP: sdsIP2} sdsParam.IPList = append(sdsParam.IPList, sdsIPList1) sdsParam.IPList = append(sdsParam.IPList, sdsIPList2) } diff --git a/vendor/github.com/codedellemc/goscaleio/storagepool.go b/vendor/github.com/thecodeteam/goscaleio/storagepool.go similarity index 98% rename from vendor/github.com/codedellemc/goscaleio/storagepool.go rename to vendor/github.com/thecodeteam/goscaleio/storagepool.go index d1a16277c1e2..b9288d4d773a 100644 --- a/vendor/github.com/codedellemc/goscaleio/storagepool.go +++ b/vendor/github.com/thecodeteam/goscaleio/storagepool.go @@ -7,7 +7,7 @@ import ( "fmt" "io/ioutil" - types "github.com/codedellemc/goscaleio/types/v1" + types "github.com/thecodeteam/goscaleio/types/v1" ) type StoragePool struct { diff --git a/vendor/github.com/codedellemc/goscaleio/system.go b/vendor/github.com/thecodeteam/goscaleio/system.go similarity index 98% rename from vendor/github.com/codedellemc/goscaleio/system.go rename to vendor/github.com/thecodeteam/goscaleio/system.go index 9b67c843e5be..ea4d9d4f8f3e 100644 --- a/vendor/github.com/codedellemc/goscaleio/system.go +++ b/vendor/github.com/thecodeteam/goscaleio/system.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - types "github.com/codedellemc/goscaleio/types/v1" + types "github.com/thecodeteam/goscaleio/types/v1" ) type System struct { diff --git a/vendor/github.com/codedellemc/goscaleio/types/v1/BUILD b/vendor/github.com/thecodeteam/goscaleio/types/v1/BUILD similarity index 78% rename from vendor/github.com/codedellemc/goscaleio/types/v1/BUILD rename to vendor/github.com/thecodeteam/goscaleio/types/v1/BUILD index 4a7e13213f4e..0461664988ff 100644 --- a/vendor/github.com/codedellemc/goscaleio/types/v1/BUILD +++ b/vendor/github.com/thecodeteam/goscaleio/types/v1/BUILD @@ -3,8 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["types.go"], - importmap = "k8s.io/kubernetes/vendor/github.com/codedellemc/goscaleio/types/v1", - importpath = "github.com/codedellemc/goscaleio/types/v1", + importmap = "k8s.io/kubernetes/vendor/github.com/thecodeteam/goscaleio/types/v1", + importpath = "github.com/thecodeteam/goscaleio/types/v1", visibility = ["//visibility:public"], ) diff --git a/vendor/github.com/codedellemc/goscaleio/types/v1/types.go b/vendor/github.com/thecodeteam/goscaleio/types/v1/types.go similarity index 100% rename from vendor/github.com/codedellemc/goscaleio/types/v1/types.go rename to vendor/github.com/thecodeteam/goscaleio/types/v1/types.go diff --git a/vendor/github.com/codedellemc/goscaleio/user.go b/vendor/github.com/thecodeteam/goscaleio/user.go similarity index 95% rename from vendor/github.com/codedellemc/goscaleio/user.go rename to vendor/github.com/thecodeteam/goscaleio/user.go index 417a9b8fa90b..a322fa47d29f 100644 --- a/vendor/github.com/codedellemc/goscaleio/user.go +++ b/vendor/github.com/thecodeteam/goscaleio/user.go @@ -3,7 +3,7 @@ package goscaleio import ( "fmt" - types "github.com/codedellemc/goscaleio/types/v1" + types "github.com/thecodeteam/goscaleio/types/v1" ) func (system *System) GetUser() (user []types.User, err error) { diff --git a/vendor/github.com/codedellemc/goscaleio/volume.go b/vendor/github.com/thecodeteam/goscaleio/volume.go similarity index 98% rename from vendor/github.com/codedellemc/goscaleio/volume.go rename to vendor/github.com/thecodeteam/goscaleio/volume.go index f5b59cb403ad..7fce6ef00a40 100644 --- a/vendor/github.com/codedellemc/goscaleio/volume.go +++ b/vendor/github.com/thecodeteam/goscaleio/volume.go @@ -12,7 +12,7 @@ import ( "sort" "strings" - types "github.com/codedellemc/goscaleio/types/v1" + types "github.com/thecodeteam/goscaleio/types/v1" ) type SdcMappedVolume struct { @@ -140,7 +140,8 @@ func GetLocalVolumeMap() (mappedVolumes []*SdcMappedVolume, err error) { out, err := exec.Command("/opt/emc/scaleio/sdc/bin/drv_cfg", "--query_vols").Output() if err != nil { - return []*SdcMappedVolume{}, fmt.Errorf("Error querying volumes: ", err) + return []*SdcMappedVolume{}, + fmt.Errorf("GetLocalVolumeMap: query vols failed: %v", err) } result := string(out) diff --git a/vendor/modules.txt b/vendor/modules.txt index a6518c76540e..c61345f8eb19 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -161,9 +161,6 @@ github.com/cloudflare/cfssl/signer github.com/cloudflare/cfssl/signer/local # github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313 => github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313 github.com/clusterhq/flocker-go -# github.com/codedellemc/goscaleio v0.0.0-20170830184815-20e2ce2cf885 => github.com/codedellemc/goscaleio v0.0.0-20170830184815-20e2ce2cf885 -github.com/codedellemc/goscaleio -github.com/codedellemc/goscaleio/types/v1 # github.com/container-storage-interface/spec v1.1.0 => github.com/container-storage-interface/spec v1.1.0 github.com/container-storage-interface/spec/lib/go/csi # github.com/containerd/console v0.0.0-20170925154832-84eeaae905fa => github.com/containerd/console v0.0.0-20170925154832-84eeaae905fa @@ -761,6 +758,9 @@ github.com/stretchr/testify/mock github.com/stretchr/testify/require # github.com/syndtr/gocapability v0.0.0-20160928074757-e7cb7fa329f4 => github.com/syndtr/gocapability v0.0.0-20160928074757-e7cb7fa329f4 github.com/syndtr/gocapability/capability +# github.com/thecodeteam/goscaleio v0.1.0 => github.com/thecodeteam/goscaleio v0.1.0 +github.com/thecodeteam/goscaleio +github.com/thecodeteam/goscaleio/types/v1 # github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8 => github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8 github.com/tmc/grpc-websocket-proxy/wsproxy # github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e => github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e