mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-04 09:49:50 +00:00
Merge pull request #29726 from anguslees/lb-autodetect
Automatic merge from submit-queue openstack: Autodetect LBaaS v1 vs v2 ```release-note * openstack: autodetect LBaaS v1/v2 by querying for available extensions. For most installs, this effectively changes the default from v1 to v2. Existing installs can add "lb-version = v1" to the provider config file to continue to use v1. ``` <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/29726) <!-- Reviewable:end -->
This commit is contained in:
commit
7df59f75cd
10
Godeps/Godeps.json
generated
10
Godeps/Godeps.json
generated
@ -1795,6 +1795,11 @@
|
|||||||
"Comment": "v1.0.0-920-g934dbf8",
|
"Comment": "v1.0.0-920-g934dbf8",
|
||||||
"Rev": "934dbf81977c67c521c75492dc1f55ca74dc5b04"
|
"Rev": "934dbf81977c67c521c75492dc1f55ca74dc5b04"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"ImportPath": "github.com/rackspace/gophercloud/openstack/common/extensions",
|
||||||
|
"Comment": "v1.0.0-920-g934dbf8",
|
||||||
|
"Rev": "934dbf81977c67c521c75492dc1f55ca74dc5b04"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "github.com/rackspace/gophercloud/openstack/compute/v2/extensions/bootfromvolume",
|
"ImportPath": "github.com/rackspace/gophercloud/openstack/compute/v2/extensions/bootfromvolume",
|
||||||
"Comment": "v1.0.0-920-g934dbf8",
|
"Comment": "v1.0.0-920-g934dbf8",
|
||||||
@ -1840,6 +1845,11 @@
|
|||||||
"Comment": "v1.0.0-920-g934dbf8",
|
"Comment": "v1.0.0-920-g934dbf8",
|
||||||
"Rev": "934dbf81977c67c521c75492dc1f55ca74dc5b04"
|
"Rev": "934dbf81977c67c521c75492dc1f55ca74dc5b04"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"ImportPath": "github.com/rackspace/gophercloud/openstack/networking/v2/extensions",
|
||||||
|
"Comment": "v1.0.0-920-g934dbf8",
|
||||||
|
"Rev": "934dbf81977c67c521c75492dc1f55ca74dc5b04"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/floatingips",
|
"ImportPath": "github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/floatingips",
|
||||||
"Comment": "v1.0.0-920-g934dbf8",
|
"Comment": "v1.0.0-920-g934dbf8",
|
||||||
|
398
Godeps/LICENSES
generated
398
Godeps/LICENSES
generated
@ -55094,6 +55094,205 @@ specific language governing permissions and limitations under the License.
|
|||||||
================================================================================
|
================================================================================
|
||||||
|
|
||||||
|
|
||||||
|
================================================================================
|
||||||
|
= vendor/github.com/rackspace/gophercloud/openstack/common/extensions licensed under: =
|
||||||
|
|
||||||
|
Copyright 2012-2013 Rackspace, Inc.
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
------
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
= vendor/github.com/rackspace/gophercloud/LICENSE dd19699707373c2ca31531a659130416 -
|
||||||
|
================================================================================
|
||||||
|
|
||||||
|
|
||||||
================================================================================
|
================================================================================
|
||||||
= vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/bootfromvolume licensed under: =
|
= vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/bootfromvolume licensed under: =
|
||||||
|
|
||||||
@ -56885,6 +57084,205 @@ specific language governing permissions and limitations under the License.
|
|||||||
================================================================================
|
================================================================================
|
||||||
|
|
||||||
|
|
||||||
|
================================================================================
|
||||||
|
= vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions licensed under: =
|
||||||
|
|
||||||
|
Copyright 2012-2013 Rackspace, Inc.
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
------
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
= vendor/github.com/rackspace/gophercloud/LICENSE dd19699707373c2ca31531a659130416 -
|
||||||
|
================================================================================
|
||||||
|
|
||||||
|
|
||||||
================================================================================
|
================================================================================
|
||||||
= vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/floatingips licensed under: =
|
= vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/floatingips licensed under: =
|
||||||
|
|
||||||
|
@ -78,7 +78,7 @@ type LoadBalancer struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type LoadBalancerOpts struct {
|
type LoadBalancerOpts struct {
|
||||||
LBVersion string `gcfg:"lb-version"` // v1 or v2
|
LBVersion string `gcfg:"lb-version"` // overrides autodetection. v1 or v2
|
||||||
SubnetId string `gcfg:"subnet-id"` // required
|
SubnetId string `gcfg:"subnet-id"` // required
|
||||||
FloatingNetworkId string `gcfg:"floating-network-id"`
|
FloatingNetworkId string `gcfg:"floating-network-id"`
|
||||||
LBMethod string `gcfg:"lb-method"`
|
LBMethod string `gcfg:"lb-method"`
|
||||||
@ -390,13 +390,35 @@ func (os *OpenStack) LoadBalancer() (cloudprovider.LoadBalancer, bool) {
|
|||||||
return nil, false
|
return nil, false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
lbversion := os.lbOpts.LBVersion
|
||||||
|
if lbversion == "" {
|
||||||
|
// No version specified, try newest supported by server
|
||||||
|
netExts, err := networkExtensions(network)
|
||||||
|
if err != nil {
|
||||||
|
glog.Warningf("Failed to list neutron extensions: %v", err)
|
||||||
|
return nil, false
|
||||||
|
}
|
||||||
|
|
||||||
|
if netExts["lbaasv2"] {
|
||||||
|
lbversion = "v2"
|
||||||
|
} else if netExts["lbaas"] {
|
||||||
|
lbversion = "v1"
|
||||||
|
} else {
|
||||||
|
glog.Warningf("Failed to find neutron LBaaS extension (v1 or v2)")
|
||||||
|
return nil, false
|
||||||
|
}
|
||||||
|
glog.V(3).Infof("Using LBaaS extension %v", lbversion)
|
||||||
|
}
|
||||||
|
|
||||||
glog.V(1).Info("Claiming to support LoadBalancer")
|
glog.V(1).Info("Claiming to support LoadBalancer")
|
||||||
|
|
||||||
if os.lbOpts.LBVersion == "v2" {
|
if os.lbOpts.LBVersion == "v2" {
|
||||||
return &LbaasV2{LoadBalancer{network, compute, os.lbOpts}}, true
|
return &LbaasV2{LoadBalancer{network, compute, os.lbOpts}}, true
|
||||||
} else {
|
} else if lbversion == "v1" {
|
||||||
|
|
||||||
return &LbaasV1{LoadBalancer{network, compute, os.lbOpts}}, true
|
return &LbaasV1{LoadBalancer{network, compute, os.lbOpts}}, true
|
||||||
|
} else {
|
||||||
|
glog.Warningf("Config error: unrecognised lb-version \"%v\"", lbversion)
|
||||||
|
return nil, false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -20,6 +20,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/rackspace/gophercloud"
|
"github.com/rackspace/gophercloud"
|
||||||
|
"github.com/rackspace/gophercloud/openstack/networking/v2/extensions"
|
||||||
"github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/floatingips"
|
"github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/floatingips"
|
||||||
"github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/members"
|
"github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/members"
|
||||||
"github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/monitors"
|
"github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/monitors"
|
||||||
@ -55,6 +56,24 @@ type LbaasV2 struct {
|
|||||||
LoadBalancer
|
LoadBalancer
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func networkExtensions(client *gophercloud.ServiceClient) (map[string]bool, error) {
|
||||||
|
seen := make(map[string]bool)
|
||||||
|
|
||||||
|
pager := extensions.List(client)
|
||||||
|
err := pager.EachPage(func(page pagination.Page) (bool, error) {
|
||||||
|
exts, err := extensions.ExtractExtensions(page)
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
for _, ext := range exts {
|
||||||
|
seen[ext.Alias] = true
|
||||||
|
}
|
||||||
|
return true, nil
|
||||||
|
})
|
||||||
|
|
||||||
|
return seen, err
|
||||||
|
}
|
||||||
|
|
||||||
func getPortIDByIP(client *gophercloud.ServiceClient, ipAddress string) (string, error) {
|
func getPortIDByIP(client *gophercloud.ServiceClient, ipAddress string) (string, error) {
|
||||||
var portID string
|
var portID string
|
||||||
|
|
||||||
|
@ -205,7 +205,11 @@ func TestLoadBalancer(t *testing.T) {
|
|||||||
t.Skipf("No config found in environment")
|
t.Skipf("No config found in environment")
|
||||||
}
|
}
|
||||||
|
|
||||||
cfg.LoadBalancer.LBVersion = "v1"
|
versions := []string{"v1", "v2", ""}
|
||||||
|
|
||||||
|
for _, v := range versions {
|
||||||
|
t.Logf("Trying LBVersion = '%s'\n", v)
|
||||||
|
cfg.LoadBalancer.LBVersion = v
|
||||||
|
|
||||||
os, err := newOpenStack(cfg)
|
os, err := newOpenStack(cfg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -224,31 +228,6 @@ func TestLoadBalancer(t *testing.T) {
|
|||||||
if exists {
|
if exists {
|
||||||
t.Fatalf("GetLoadBalancer(\"noexist\") returned exists")
|
t.Fatalf("GetLoadBalancer(\"noexist\") returned exists")
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
func TestLoadBalancerV2(t *testing.T) {
|
|
||||||
cfg, ok := configFromEnv()
|
|
||||||
if !ok {
|
|
||||||
t.Skipf("No config found in environment")
|
|
||||||
}
|
|
||||||
cfg.LoadBalancer.LBVersion = "v2"
|
|
||||||
|
|
||||||
os, err := newOpenStack(cfg)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("Failed to construct/authenticate OpenStack: %s", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
lbaas, ok := os.LoadBalancer()
|
|
||||||
if !ok {
|
|
||||||
t.Fatalf("LoadBalancer() returned false - perhaps your stack doesn't support Neutron?")
|
|
||||||
}
|
|
||||||
|
|
||||||
_, exists, err := lbaas.GetLoadBalancer(testClusterName, &api.Service{ObjectMeta: api.ObjectMeta{Name: "noexist"}})
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("GetLoadBalancer(\"noexist\") returned error: %s", err)
|
|
||||||
}
|
|
||||||
if exists {
|
|
||||||
t.Fatalf("GetLoadBalancer(\"noexist\") returned exists")
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
15
vendor/github.com/rackspace/gophercloud/openstack/common/extensions/doc.go
generated
vendored
Normal file
15
vendor/github.com/rackspace/gophercloud/openstack/common/extensions/doc.go
generated
vendored
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
// Package extensions provides information and interaction with the different extensions available
|
||||||
|
// for an OpenStack service.
|
||||||
|
//
|
||||||
|
// The purpose of OpenStack API extensions is to:
|
||||||
|
//
|
||||||
|
// - Introduce new features in the API without requiring a version change.
|
||||||
|
// - Introduce vendor-specific niche functionality.
|
||||||
|
// - Act as a proving ground for experimental functionalities that might be included in a future
|
||||||
|
// version of the API.
|
||||||
|
//
|
||||||
|
// Extensions usually have tags that prevent conflicts with other extensions that define attributes
|
||||||
|
// or resources with the same names, and with core resources and attributes.
|
||||||
|
// Because an extension might not be supported by all plug-ins, its availability varies with deployments
|
||||||
|
// and the specific plug-in.
|
||||||
|
package extensions
|
1
vendor/github.com/rackspace/gophercloud/openstack/common/extensions/errors.go
generated
vendored
Executable file
1
vendor/github.com/rackspace/gophercloud/openstack/common/extensions/errors.go
generated
vendored
Executable file
@ -0,0 +1 @@
|
|||||||
|
package extensions
|
91
vendor/github.com/rackspace/gophercloud/openstack/common/extensions/fixtures.go
generated
vendored
Normal file
91
vendor/github.com/rackspace/gophercloud/openstack/common/extensions/fixtures.go
generated
vendored
Normal file
@ -0,0 +1,91 @@
|
|||||||
|
// +build fixtures
|
||||||
|
|
||||||
|
package extensions
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
th "github.com/rackspace/gophercloud/testhelper"
|
||||||
|
"github.com/rackspace/gophercloud/testhelper/client"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ListOutput provides a single page of Extension results.
|
||||||
|
const ListOutput = `
|
||||||
|
{
|
||||||
|
"extensions": [
|
||||||
|
{
|
||||||
|
"updated": "2013-01-20T00:00:00-00:00",
|
||||||
|
"name": "Neutron Service Type Management",
|
||||||
|
"links": [],
|
||||||
|
"namespace": "http://docs.openstack.org/ext/neutron/service-type/api/v1.0",
|
||||||
|
"alias": "service-type",
|
||||||
|
"description": "API for retrieving service providers for Neutron advanced services"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}`
|
||||||
|
|
||||||
|
// GetOutput provides a single Extension result.
|
||||||
|
const GetOutput = `
|
||||||
|
{
|
||||||
|
"extension": {
|
||||||
|
"updated": "2013-02-03T10:00:00-00:00",
|
||||||
|
"name": "agent",
|
||||||
|
"links": [],
|
||||||
|
"namespace": "http://docs.openstack.org/ext/agent/api/v2.0",
|
||||||
|
"alias": "agent",
|
||||||
|
"description": "The agent management extension."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
`
|
||||||
|
|
||||||
|
// ListedExtension is the Extension that should be parsed from ListOutput.
|
||||||
|
var ListedExtension = Extension{
|
||||||
|
Updated: "2013-01-20T00:00:00-00:00",
|
||||||
|
Name: "Neutron Service Type Management",
|
||||||
|
Links: []interface{}{},
|
||||||
|
Namespace: "http://docs.openstack.org/ext/neutron/service-type/api/v1.0",
|
||||||
|
Alias: "service-type",
|
||||||
|
Description: "API for retrieving service providers for Neutron advanced services",
|
||||||
|
}
|
||||||
|
|
||||||
|
// ExpectedExtensions is a slice containing the Extension that should be parsed from ListOutput.
|
||||||
|
var ExpectedExtensions = []Extension{ListedExtension}
|
||||||
|
|
||||||
|
// SingleExtension is the Extension that should be parsed from GetOutput.
|
||||||
|
var SingleExtension = &Extension{
|
||||||
|
Updated: "2013-02-03T10:00:00-00:00",
|
||||||
|
Name: "agent",
|
||||||
|
Links: []interface{}{},
|
||||||
|
Namespace: "http://docs.openstack.org/ext/agent/api/v2.0",
|
||||||
|
Alias: "agent",
|
||||||
|
Description: "The agent management extension.",
|
||||||
|
}
|
||||||
|
|
||||||
|
// HandleListExtensionsSuccessfully creates an HTTP handler at `/extensions` on the test handler
|
||||||
|
// mux that response with a list containing a single tenant.
|
||||||
|
func HandleListExtensionsSuccessfully(t *testing.T) {
|
||||||
|
th.Mux.HandleFunc("/extensions", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
th.TestMethod(t, r, "GET")
|
||||||
|
th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
|
||||||
|
|
||||||
|
w.Header().Add("Content-Type", "application/json")
|
||||||
|
|
||||||
|
fmt.Fprintf(w, ListOutput)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// HandleGetExtensionSuccessfully creates an HTTP handler at `/extensions/agent` that responds with
|
||||||
|
// a JSON payload corresponding to SingleExtension.
|
||||||
|
func HandleGetExtensionSuccessfully(t *testing.T) {
|
||||||
|
th.Mux.HandleFunc("/extensions/agent", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
th.TestMethod(t, r, "GET")
|
||||||
|
th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
|
||||||
|
|
||||||
|
w.Header().Add("Content-Type", "application/json")
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
|
||||||
|
fmt.Fprintf(w, GetOutput)
|
||||||
|
})
|
||||||
|
}
|
21
vendor/github.com/rackspace/gophercloud/openstack/common/extensions/requests.go
generated
vendored
Executable file
21
vendor/github.com/rackspace/gophercloud/openstack/common/extensions/requests.go
generated
vendored
Executable file
@ -0,0 +1,21 @@
|
|||||||
|
package extensions
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/rackspace/gophercloud"
|
||||||
|
"github.com/rackspace/gophercloud/pagination"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Get retrieves information for a specific extension using its alias.
|
||||||
|
func Get(c *gophercloud.ServiceClient, alias string) GetResult {
|
||||||
|
var res GetResult
|
||||||
|
_, res.Err = c.Get(ExtensionURL(c, alias), &res.Body, nil)
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
|
||||||
|
// List returns a Pager which allows you to iterate over the full collection of extensions.
|
||||||
|
// It does not accept query parameters.
|
||||||
|
func List(c *gophercloud.ServiceClient) pagination.Pager {
|
||||||
|
return pagination.NewPager(c, ListExtensionURL(c), func(r pagination.PageResult) pagination.Page {
|
||||||
|
return ExtensionPage{pagination.SinglePageBase(r)}
|
||||||
|
})
|
||||||
|
}
|
65
vendor/github.com/rackspace/gophercloud/openstack/common/extensions/results.go
generated
vendored
Executable file
65
vendor/github.com/rackspace/gophercloud/openstack/common/extensions/results.go
generated
vendored
Executable file
@ -0,0 +1,65 @@
|
|||||||
|
package extensions
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/mitchellh/mapstructure"
|
||||||
|
"github.com/rackspace/gophercloud"
|
||||||
|
"github.com/rackspace/gophercloud/pagination"
|
||||||
|
)
|
||||||
|
|
||||||
|
// GetResult temporarily stores the result of a Get call.
|
||||||
|
// Use its Extract() method to interpret it as an Extension.
|
||||||
|
type GetResult struct {
|
||||||
|
gophercloud.Result
|
||||||
|
}
|
||||||
|
|
||||||
|
// Extract interprets a GetResult as an Extension.
|
||||||
|
func (r GetResult) Extract() (*Extension, error) {
|
||||||
|
if r.Err != nil {
|
||||||
|
return nil, r.Err
|
||||||
|
}
|
||||||
|
|
||||||
|
var res struct {
|
||||||
|
Extension *Extension `json:"extension"`
|
||||||
|
}
|
||||||
|
|
||||||
|
err := mapstructure.Decode(r.Body, &res)
|
||||||
|
|
||||||
|
return res.Extension, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Extension is a struct that represents an OpenStack extension.
|
||||||
|
type Extension struct {
|
||||||
|
Updated string `json:"updated" mapstructure:"updated"`
|
||||||
|
Name string `json:"name" mapstructure:"name"`
|
||||||
|
Links []interface{} `json:"links" mapstructure:"links"`
|
||||||
|
Namespace string `json:"namespace" mapstructure:"namespace"`
|
||||||
|
Alias string `json:"alias" mapstructure:"alias"`
|
||||||
|
Description string `json:"description" mapstructure:"description"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ExtensionPage is the page returned by a pager when traversing over a collection of extensions.
|
||||||
|
type ExtensionPage struct {
|
||||||
|
pagination.SinglePageBase
|
||||||
|
}
|
||||||
|
|
||||||
|
// IsEmpty checks whether an ExtensionPage struct is empty.
|
||||||
|
func (r ExtensionPage) IsEmpty() (bool, error) {
|
||||||
|
is, err := ExtractExtensions(r)
|
||||||
|
if err != nil {
|
||||||
|
return true, err
|
||||||
|
}
|
||||||
|
return len(is) == 0, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ExtractExtensions accepts a Page struct, specifically an ExtensionPage struct, and extracts the
|
||||||
|
// elements into a slice of Extension structs.
|
||||||
|
// In other words, a generic collection is mapped into a relevant slice.
|
||||||
|
func ExtractExtensions(page pagination.Page) ([]Extension, error) {
|
||||||
|
var resp struct {
|
||||||
|
Extensions []Extension `mapstructure:"extensions"`
|
||||||
|
}
|
||||||
|
|
||||||
|
err := mapstructure.Decode(page.(ExtensionPage).Body, &resp)
|
||||||
|
|
||||||
|
return resp.Extensions, err
|
||||||
|
}
|
13
vendor/github.com/rackspace/gophercloud/openstack/common/extensions/urls.go
generated
vendored
Normal file
13
vendor/github.com/rackspace/gophercloud/openstack/common/extensions/urls.go
generated
vendored
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
package extensions
|
||||||
|
|
||||||
|
import "github.com/rackspace/gophercloud"
|
||||||
|
|
||||||
|
// ExtensionURL generates the URL for an extension resource by name.
|
||||||
|
func ExtensionURL(c *gophercloud.ServiceClient, name string) string {
|
||||||
|
return c.ServiceURL("extensions", name)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ListExtensionURL generates the URL for the extensions resource collection.
|
||||||
|
func ListExtensionURL(c *gophercloud.ServiceClient) string {
|
||||||
|
return c.ServiceURL("extensions")
|
||||||
|
}
|
41
vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/delegate.go
generated
vendored
Normal file
41
vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/delegate.go
generated
vendored
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
package extensions
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/rackspace/gophercloud"
|
||||||
|
common "github.com/rackspace/gophercloud/openstack/common/extensions"
|
||||||
|
"github.com/rackspace/gophercloud/pagination"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Extension is a single OpenStack extension.
|
||||||
|
type Extension struct {
|
||||||
|
common.Extension
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetResult wraps a GetResult from common.
|
||||||
|
type GetResult struct {
|
||||||
|
common.GetResult
|
||||||
|
}
|
||||||
|
|
||||||
|
// ExtractExtensions interprets a Page as a slice of Extensions.
|
||||||
|
func ExtractExtensions(page pagination.Page) ([]Extension, error) {
|
||||||
|
inner, err := common.ExtractExtensions(page)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
outer := make([]Extension, len(inner))
|
||||||
|
for index, ext := range inner {
|
||||||
|
outer[index] = Extension{ext}
|
||||||
|
}
|
||||||
|
return outer, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get retrieves information for a specific extension using its alias.
|
||||||
|
func Get(c *gophercloud.ServiceClient, alias string) GetResult {
|
||||||
|
return GetResult{common.Get(c, alias)}
|
||||||
|
}
|
||||||
|
|
||||||
|
// List returns a Pager which allows you to iterate over the full collection of extensions.
|
||||||
|
// It does not accept query parameters.
|
||||||
|
func List(c *gophercloud.ServiceClient) pagination.Pager {
|
||||||
|
return common.List(c)
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user