mirror of
https://github.com/kubernetes/client-go.git
synced 2025-08-27 19:28:58 +00:00
Merge pull request #59821 from dims/update-latest-gophercloud-1.10
Automatic merge from submit-queue (batch tested with PRs 59634, 59821, 57850, 59916, 60032). 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 to latest gophercloud/gophercloud for 1.10
**What this PR does / why we need it**:
Looks like we end up with just the following change:
https://github.com/gophercloud/gophercloud/pull/730
(Prevent Recursive BuildRequestBody)
The full set of changes between the old and new SHA are here:
8e59687aa4...6da026c32e
**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 #
**Special notes for your reviewer**:
**Release note**:
```release-note
NONE
```
Kubernetes-commit: 77254255223774543cdf9941cd7c32f99da11261
This commit is contained in:
Kubernetes Publisher
commit
fd88764ee8
120
Godeps/Godeps.json
generated
120
Godeps/Godeps.json
generated
@ -136,31 +136,31 @@
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/gophercloud/gophercloud",
|
||||
"Rev": "8e59687aa4b27ab22a0bf3295f1e165ff7bd5f97"
|
||||
"Rev": "6da026c32e2d622cc242d32984259c77237aefe1"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/gophercloud/gophercloud/openstack",
|
||||
"Rev": "8e59687aa4b27ab22a0bf3295f1e165ff7bd5f97"
|
||||
"Rev": "6da026c32e2d622cc242d32984259c77237aefe1"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/gophercloud/gophercloud/openstack/identity/v2/tenants",
|
||||
"Rev": "8e59687aa4b27ab22a0bf3295f1e165ff7bd5f97"
|
||||
"Rev": "6da026c32e2d622cc242d32984259c77237aefe1"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/gophercloud/gophercloud/openstack/identity/v2/tokens",
|
||||
"Rev": "8e59687aa4b27ab22a0bf3295f1e165ff7bd5f97"
|
||||
"Rev": "6da026c32e2d622cc242d32984259c77237aefe1"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/gophercloud/gophercloud/openstack/identity/v3/tokens",
|
||||
"Rev": "8e59687aa4b27ab22a0bf3295f1e165ff7bd5f97"
|
||||
"Rev": "6da026c32e2d622cc242d32984259c77237aefe1"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/gophercloud/gophercloud/openstack/utils",
|
||||
"Rev": "8e59687aa4b27ab22a0bf3295f1e165ff7bd5f97"
|
||||
"Rev": "6da026c32e2d622cc242d32984259c77237aefe1"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/gophercloud/gophercloud/pagination",
|
||||
"Rev": "8e59687aa4b27ab22a0bf3295f1e165ff7bd5f97"
|
||||
"Rev": "6da026c32e2d622cc242d32984259c77237aefe1"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/hashicorp/golang-lru",
|
||||
@ -400,215 +400,215 @@
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/fields",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/labels",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/selection",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/types",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/version",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/watch",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
|
||||
"Rev": "60e7a221fedd1b4a1e0cbf50cf3d2f259f2f9cd6"
|
||||
"Rev": "5d3b627f6c0413ebaf4d825444dbb947cf9fcac2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
|
||||
|
||||
7
vendor/github.com/gophercloud/gophercloud/params.go
generated
vendored
7
vendor/github.com/gophercloud/gophercloud/params.go
generated
vendored
@ -115,10 +115,15 @@ func BuildRequestBody(opts interface{}, parent string) (map[string]interface{},
|
||||
}
|
||||
}
|
||||
|
||||
jsonTag := f.Tag.Get("json")
|
||||
if jsonTag == "-" {
|
||||
continue
|
||||
}
|
||||
|
||||
if v.Kind() == reflect.Struct || (v.Kind() == reflect.Ptr && v.Elem().Kind() == reflect.Struct) {
|
||||
if zero {
|
||||
//fmt.Printf("value before change: %+v\n", optsValue.Field(i))
|
||||
if jsonTag := f.Tag.Get("json"); jsonTag != "" {
|
||||
if jsonTag != "" {
|
||||
jsonTagPieces := strings.Split(jsonTag, ",")
|
||||
if len(jsonTagPieces) > 1 && jsonTagPieces[1] == "omitempty" {
|
||||
if v.CanSet() {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user