Merge pull request #51795 from dims/bug-fix-51755

Automatic merge from submit-queue (batch tested with PRs 51984, 51351, 51873, 51795, 51634)

Bug Fix - Adding an allowed address pair wipes port security groups

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

Fix for cloud routes enabled instances will have their security groups
removed when the allowed address pair is added to the instance's port.

Upstream bug report is in:
https://github.com/gophercloud/gophercloud/issues/509

Upstream bug fix is in:
https://github.com/gophercloud/gophercloud/pull/510

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

Fixes #51755

**Special notes for your reviewer**:

Just an fix in vendored code. minimal changes needed in OpenStack cloud provider

**Release note**:

```release-note
NONE
```

Kubernetes-commit: 9a8cb435b77085fa7d518c4428a02eae316b1003
This commit is contained in:
Kubernetes Publisher
2017-09-05 18:40:31 -07:00
152 changed files with 5362 additions and 20200 deletions

72
Godeps/Godeps.json generated
View File

@@ -176,31 +176,31 @@
},
{
"ImportPath": "github.com/gophercloud/gophercloud",
"Rev": "c0406a133c4a74a838baf0ddff3c2fab21155fba"
"Rev": "2bf16b94fdd9b01557c4d076e567fe5cbbe5a961"
},
{
"ImportPath": "github.com/gophercloud/gophercloud/openstack",
"Rev": "c0406a133c4a74a838baf0ddff3c2fab21155fba"
"Rev": "2bf16b94fdd9b01557c4d076e567fe5cbbe5a961"
},
{
"ImportPath": "github.com/gophercloud/gophercloud/openstack/identity/v2/tenants",
"Rev": "c0406a133c4a74a838baf0ddff3c2fab21155fba"
"Rev": "2bf16b94fdd9b01557c4d076e567fe5cbbe5a961"
},
{
"ImportPath": "github.com/gophercloud/gophercloud/openstack/identity/v2/tokens",
"Rev": "c0406a133c4a74a838baf0ddff3c2fab21155fba"
"Rev": "2bf16b94fdd9b01557c4d076e567fe5cbbe5a961"
},
{
"ImportPath": "github.com/gophercloud/gophercloud/openstack/identity/v3/tokens",
"Rev": "c0406a133c4a74a838baf0ddff3c2fab21155fba"
"Rev": "2bf16b94fdd9b01557c4d076e567fe5cbbe5a961"
},
{
"ImportPath": "github.com/gophercloud/gophercloud/openstack/utils",
"Rev": "c0406a133c4a74a838baf0ddff3c2fab21155fba"
"Rev": "2bf16b94fdd9b01557c4d076e567fe5cbbe5a961"
},
{
"ImportPath": "github.com/gophercloud/gophercloud/pagination",
"Rev": "c0406a133c4a74a838baf0ddff3c2fab21155fba"
"Rev": "2bf16b94fdd9b01557c4d076e567fe5cbbe5a961"
},
{
"ImportPath": "github.com/gregjones/httpcache",
@@ -268,7 +268,7 @@
},
{
"ImportPath": "golang.org/x/crypto/ssh/terminal",
"Rev": "81e90905daefcd6fd217b62423c0908922eadb30"
"Rev": "d172538b2cfce0c13cee31e647d0367aa8cd2486"
},
{
"ImportPath": "golang.org/x/net/context",
@@ -316,11 +316,7 @@
},
{
"ImportPath": "golang.org/x/sys/unix",
"Rev": "7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce"
},
{
"ImportPath": "golang.org/x/sys/windows",
"Rev": "7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce"
"Rev": "7a4fde3fda8ef580a89dbae8138c26041be14299"
},
{
"ImportPath": "golang.org/x/text/cases",
@@ -376,103 +372,103 @@
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
"Rev": "5d7eaafc89ac66da6bfbbcc4bc6a14fecd813084"
"Rev": "6215021b8ed92d69abfaf135ee5f2fb04bacab11"
},
{
"ImportPath": "k8s.io/api/apps/v1beta1",
"Rev": "5d7eaafc89ac66da6bfbbcc4bc6a14fecd813084"
"Rev": "6215021b8ed92d69abfaf135ee5f2fb04bacab11"
},
{
"ImportPath": "k8s.io/api/apps/v1beta2",
"Rev": "5d7eaafc89ac66da6bfbbcc4bc6a14fecd813084"
"Rev": "6215021b8ed92d69abfaf135ee5f2fb04bacab11"
},
{
"ImportPath": "k8s.io/api/authentication/v1",
"Rev": "5d7eaafc89ac66da6bfbbcc4bc6a14fecd813084"
"Rev": "6215021b8ed92d69abfaf135ee5f2fb04bacab11"
},
{
"ImportPath": "k8s.io/api/authentication/v1beta1",
"Rev": "5d7eaafc89ac66da6bfbbcc4bc6a14fecd813084"
"Rev": "6215021b8ed92d69abfaf135ee5f2fb04bacab11"
},
{
"ImportPath": "k8s.io/api/authorization/v1",
"Rev": "5d7eaafc89ac66da6bfbbcc4bc6a14fecd813084"
"Rev": "6215021b8ed92d69abfaf135ee5f2fb04bacab11"
},
{
"ImportPath": "k8s.io/api/authorization/v1beta1",
"Rev": "5d7eaafc89ac66da6bfbbcc4bc6a14fecd813084"
"Rev": "6215021b8ed92d69abfaf135ee5f2fb04bacab11"
},
{
"ImportPath": "k8s.io/api/autoscaling/v1",
"Rev": "5d7eaafc89ac66da6bfbbcc4bc6a14fecd813084"
"Rev": "6215021b8ed92d69abfaf135ee5f2fb04bacab11"
},
{
"ImportPath": "k8s.io/api/autoscaling/v2alpha1",
"Rev": "5d7eaafc89ac66da6bfbbcc4bc6a14fecd813084"
"Rev": "6215021b8ed92d69abfaf135ee5f2fb04bacab11"
},
{
"ImportPath": "k8s.io/api/batch/v1",
"Rev": "5d7eaafc89ac66da6bfbbcc4bc6a14fecd813084"
"Rev": "6215021b8ed92d69abfaf135ee5f2fb04bacab11"
},
{
"ImportPath": "k8s.io/api/batch/v1beta1",
"Rev": "5d7eaafc89ac66da6bfbbcc4bc6a14fecd813084"
"Rev": "6215021b8ed92d69abfaf135ee5f2fb04bacab11"
},
{
"ImportPath": "k8s.io/api/batch/v2alpha1",
"Rev": "5d7eaafc89ac66da6bfbbcc4bc6a14fecd813084"
"Rev": "6215021b8ed92d69abfaf135ee5f2fb04bacab11"
},
{
"ImportPath": "k8s.io/api/certificates/v1beta1",
"Rev": "5d7eaafc89ac66da6bfbbcc4bc6a14fecd813084"
"Rev": "6215021b8ed92d69abfaf135ee5f2fb04bacab11"
},
{
"ImportPath": "k8s.io/api/core/v1",
"Rev": "5d7eaafc89ac66da6bfbbcc4bc6a14fecd813084"
"Rev": "6215021b8ed92d69abfaf135ee5f2fb04bacab11"
},
{
"ImportPath": "k8s.io/api/extensions/v1beta1",
"Rev": "5d7eaafc89ac66da6bfbbcc4bc6a14fecd813084"
"Rev": "6215021b8ed92d69abfaf135ee5f2fb04bacab11"
},
{
"ImportPath": "k8s.io/api/imagepolicy/v1alpha1",
"Rev": "5d7eaafc89ac66da6bfbbcc4bc6a14fecd813084"
"Rev": "6215021b8ed92d69abfaf135ee5f2fb04bacab11"
},
{
"ImportPath": "k8s.io/api/networking/v1",
"Rev": "5d7eaafc89ac66da6bfbbcc4bc6a14fecd813084"
"Rev": "6215021b8ed92d69abfaf135ee5f2fb04bacab11"
},
{
"ImportPath": "k8s.io/api/policy/v1beta1",
"Rev": "5d7eaafc89ac66da6bfbbcc4bc6a14fecd813084"
"Rev": "6215021b8ed92d69abfaf135ee5f2fb04bacab11"
},
{
"ImportPath": "k8s.io/api/rbac/v1",
"Rev": "5d7eaafc89ac66da6bfbbcc4bc6a14fecd813084"
"Rev": "6215021b8ed92d69abfaf135ee5f2fb04bacab11"
},
{
"ImportPath": "k8s.io/api/rbac/v1alpha1",
"Rev": "5d7eaafc89ac66da6bfbbcc4bc6a14fecd813084"
"Rev": "6215021b8ed92d69abfaf135ee5f2fb04bacab11"
},
{
"ImportPath": "k8s.io/api/rbac/v1beta1",
"Rev": "5d7eaafc89ac66da6bfbbcc4bc6a14fecd813084"
"Rev": "6215021b8ed92d69abfaf135ee5f2fb04bacab11"
},
{
"ImportPath": "k8s.io/api/scheduling/v1alpha1",
"Rev": "5d7eaafc89ac66da6bfbbcc4bc6a14fecd813084"
"Rev": "6215021b8ed92d69abfaf135ee5f2fb04bacab11"
},
{
"ImportPath": "k8s.io/api/settings/v1alpha1",
"Rev": "5d7eaafc89ac66da6bfbbcc4bc6a14fecd813084"
"Rev": "6215021b8ed92d69abfaf135ee5f2fb04bacab11"
},
{
"ImportPath": "k8s.io/api/storage/v1",
"Rev": "5d7eaafc89ac66da6bfbbcc4bc6a14fecd813084"
"Rev": "6215021b8ed92d69abfaf135ee5f2fb04bacab11"
},
{
"ImportPath": "k8s.io/api/storage/v1beta1",
"Rev": "5d7eaafc89ac66da6bfbbcc4bc6a14fecd813084"
"Rev": "6215021b8ed92d69abfaf135ee5f2fb04bacab11"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",