Merge pull request #55657 from dims/update-gophercloud-for-1.9

Automatic merge from submit-queue (batch tested with PRs 55657, 54758, 47584, 55758, 55651). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Update Gophercloud dependency for reauth problem

**What this PR does / why we need it**:

Fixes picked up from gophercloud:
443743e883...0b6b13c4dd

Including the one for endless loop on reauth:
https://github.com/gophercloud/gophercloud/pull/604

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #55656

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```

Kubernetes-commit: 08659652a2fa3c3f7ecbe91c591a5021f343c355
This commit is contained in:
Kubernetes Publisher 2017-11-15 23:57:19 -08:00
commit 8fa1ff825c
6 changed files with 726 additions and 705 deletions

176
Godeps/Godeps.json generated
View File

@ -172,31 +172,31 @@
},
{
"ImportPath": "github.com/gophercloud/gophercloud",
"Rev": "443743e88335413103dcf1997e46d401b264fbcd"
"Rev": "0b6b13c4dd9e07a89f83cbe4617c13ad646d6362"
},
{
"ImportPath": "github.com/gophercloud/gophercloud/openstack",
"Rev": "443743e88335413103dcf1997e46d401b264fbcd"
"Rev": "0b6b13c4dd9e07a89f83cbe4617c13ad646d6362"
},
{
"ImportPath": "github.com/gophercloud/gophercloud/openstack/identity/v2/tenants",
"Rev": "443743e88335413103dcf1997e46d401b264fbcd"
"Rev": "0b6b13c4dd9e07a89f83cbe4617c13ad646d6362"
},
{
"ImportPath": "github.com/gophercloud/gophercloud/openstack/identity/v2/tokens",
"Rev": "443743e88335413103dcf1997e46d401b264fbcd"
"Rev": "0b6b13c4dd9e07a89f83cbe4617c13ad646d6362"
},
{
"ImportPath": "github.com/gophercloud/gophercloud/openstack/identity/v3/tokens",
"Rev": "443743e88335413103dcf1997e46d401b264fbcd"
"Rev": "0b6b13c4dd9e07a89f83cbe4617c13ad646d6362"
},
{
"ImportPath": "github.com/gophercloud/gophercloud/openstack/utils",
"Rev": "443743e88335413103dcf1997e46d401b264fbcd"
"Rev": "0b6b13c4dd9e07a89f83cbe4617c13ad646d6362"
},
{
"ImportPath": "github.com/gophercloud/gophercloud/pagination",
"Rev": "443743e88335413103dcf1997e46d401b264fbcd"
"Rev": "0b6b13c4dd9e07a89f83cbe4617c13ad646d6362"
},
{
"ImportPath": "github.com/gregjones/httpcache",
@ -372,327 +372,327 @@
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "42558894029e0453e560ff39f84da83a3b673b5a"
},
{
"ImportPath": "k8s.io/api/apps/v1",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "42558894029e0453e560ff39f84da83a3b673b5a"
},
{
"ImportPath": "k8s.io/api/apps/v1beta1",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "42558894029e0453e560ff39f84da83a3b673b5a"
},
{
"ImportPath": "k8s.io/api/apps/v1beta2",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "42558894029e0453e560ff39f84da83a3b673b5a"
},
{
"ImportPath": "k8s.io/api/authentication/v1",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "42558894029e0453e560ff39f84da83a3b673b5a"
},
{
"ImportPath": "k8s.io/api/authentication/v1beta1",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "42558894029e0453e560ff39f84da83a3b673b5a"
},
{
"ImportPath": "k8s.io/api/authorization/v1",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "42558894029e0453e560ff39f84da83a3b673b5a"
},
{
"ImportPath": "k8s.io/api/authorization/v1beta1",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "42558894029e0453e560ff39f84da83a3b673b5a"
},
{
"ImportPath": "k8s.io/api/autoscaling/v1",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "42558894029e0453e560ff39f84da83a3b673b5a"
},
{
"ImportPath": "k8s.io/api/autoscaling/v2beta1",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "42558894029e0453e560ff39f84da83a3b673b5a"
},
{
"ImportPath": "k8s.io/api/batch/v1",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "42558894029e0453e560ff39f84da83a3b673b5a"
},
{
"ImportPath": "k8s.io/api/batch/v1beta1",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "42558894029e0453e560ff39f84da83a3b673b5a"
},
{
"ImportPath": "k8s.io/api/batch/v2alpha1",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "42558894029e0453e560ff39f84da83a3b673b5a"
},
{
"ImportPath": "k8s.io/api/certificates/v1beta1",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "42558894029e0453e560ff39f84da83a3b673b5a"
},
{
"ImportPath": "k8s.io/api/core/v1",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "42558894029e0453e560ff39f84da83a3b673b5a"
},
{
"ImportPath": "k8s.io/api/extensions/v1beta1",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "42558894029e0453e560ff39f84da83a3b673b5a"
},
{
"ImportPath": "k8s.io/api/imagepolicy/v1alpha1",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "42558894029e0453e560ff39f84da83a3b673b5a"
},
{
"ImportPath": "k8s.io/api/networking/v1",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "42558894029e0453e560ff39f84da83a3b673b5a"
},
{
"ImportPath": "k8s.io/api/policy/v1beta1",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "42558894029e0453e560ff39f84da83a3b673b5a"
},
{
"ImportPath": "k8s.io/api/rbac/v1",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "42558894029e0453e560ff39f84da83a3b673b5a"
},
{
"ImportPath": "k8s.io/api/rbac/v1alpha1",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "42558894029e0453e560ff39f84da83a3b673b5a"
},
{
"ImportPath": "k8s.io/api/rbac/v1beta1",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "42558894029e0453e560ff39f84da83a3b673b5a"
},
{
"ImportPath": "k8s.io/api/scheduling/v1alpha1",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "42558894029e0453e560ff39f84da83a3b673b5a"
},
{
"ImportPath": "k8s.io/api/settings/v1alpha1",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "42558894029e0453e560ff39f84da83a3b673b5a"
},
{
"ImportPath": "k8s.io/api/storage/v1",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "42558894029e0453e560ff39f84da83a3b673b5a"
},
{
"ImportPath": "k8s.io/api/storage/v1alpha1",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "42558894029e0453e560ff39f84da83a3b673b5a"
},
{
"ImportPath": "k8s.io/api/storage/v1beta1",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "42558894029e0453e560ff39f84da83a3b673b5a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/unstructured",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "06a5842e5143186ea755df4856ab23485473c206"
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6"
},
{
"ImportPath": "k8s.io/kube-openapi/pkg/common",

View File

@ -1 +1,2 @@
**/*.swp
.idea

12
vendor/github.com/gophercloud/gophercloud/.zuul.yaml generated vendored Normal file
View File

@ -0,0 +1,12 @@
- project:
name: gophercloud/gophercloud
check:
jobs:
- gophercloud-unittest
- gophercloud-acceptance-test
recheck-mitaka:
jobs:
- gophercloud-acceptance-test-mitaka
recheck-pike:
jobs:
- gophercloud-acceptance-test-pike

View File

@ -346,3 +346,11 @@ func NewImageServiceV2(client *gophercloud.ProviderClient, eo gophercloud.Endpoi
sc.ResourceBase = sc.Endpoint + "v2/"
return sc, err
}
// NewLoadBalancerV2 creates a ServiceClient that may be used to access the v2
// load balancer service.
func NewLoadBalancerV2(client *gophercloud.ProviderClient, eo gophercloud.EndpointOpts) (*gophercloud.ServiceClient, error) {
sc, err := initClientOpts(client, eo, "load-balancer")
sc.ResourceBase = sc.Endpoint + "v2.0/"
return sc, err
}

View File

@ -22,7 +22,6 @@ var (
// Depending on the pagination strategy of a particular resource, there may be an additional subinterface that the result type
// will need to implement.
type Page interface {
// NextPageURL generates the URL for the page of data that follows this collection.
// Return "" if no such page exists.
NextPageURL() (string, error)

View File

@ -145,10 +145,6 @@ func (client *ProviderClient) Request(method, url string, options *RequestOpts)
}
req.Header.Set("Accept", applicationJSON)
for k, v := range client.AuthenticatedHeaders() {
req.Header.Add(k, v)
}
// Set the User-Agent header
req.Header.Set("User-Agent", client.UserAgent.Join())
@ -162,6 +158,11 @@ func (client *ProviderClient) Request(method, url string, options *RequestOpts)
}
}
// get latest token from client
for k, v := range client.AuthenticatedHeaders() {
req.Header.Set(k, v)
}
// Set connection parameter to close the connection immediately when we've got the response
req.Close = true