Merge pull request #52013 from FengyunPan/autoprobing-external-network

Automatic merge from submit-queue (batch tested with PRs 52013, 56719). 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>.

Support autoprobing floating-network-id for openstack cloud provider

Currently if user doesn't specify floatingnetwork-id and loadbalancer.openstack.org/floating-network-id annotation, openstack cloud provider can't create a external LoadBalancer service.
Actually we can get  floatingnetwork-id automatically.
If we get multiple  floatingnetwork-ids, then ask user to specify one, or we use the  floatingnetwork-id to create floatingip for external LoadBalancer service.

This is a part of #50726

**Special notes for your reviewer**:
/assign @dims

**Release note**:
```release-note
Support autoprobing floating-network-id for openstack cloud provider
```

Kubernetes-commit: 36ea6de4a0fd79b97768b9b58c634140f64fc73d
This commit is contained in:
Kubernetes Publisher 2017-12-04 10:55:14 -08:00
commit 59ab1a8387
2 changed files with 718 additions and 709 deletions

178
Godeps/Godeps.json generated
View File

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

View File

@ -347,12 +347,21 @@ func BuildQueryString(opts interface{}) (*url.URL, error) {
params.Add(tags[0], v.Index(i).String())
}
}
case reflect.Map:
if v.Type().Key().Kind() == reflect.String && v.Type().Elem().Kind() == reflect.String {
var s []string
for _, k := range v.MapKeys() {
value := v.MapIndex(k).String()
s = append(s, fmt.Sprintf("'%s':'%s'", k.String(), value))
}
params.Add(tags[0], fmt.Sprintf("{%s}", strings.Join(s, ", ")))
}
}
} else {
// Otherwise, the field is not set.
if len(tags) == 2 && tags[1] == "required" {
// And the field is required. Return an error.
return nil, fmt.Errorf("Required query parameter [%s] not set.", f.Name)
return &url.URL{}, fmt.Errorf("Required query parameter [%s] not set.", f.Name)
}
}
}