k3s/vendor
Kubernetes Submit Queue a7ce691311 Merge pull request #49785 from FengyunPan/fix-getPortByIP
Automatic merge from submit-queue (batch tested with PRs 47724, 49984, 49785, 49803, 49618)

Fix conflict about getPortByIp

**What this PR does / why we need it**:
Currently getPortByIp() get port of instance only based on IP.
If there are two instances in diffent network and the CIDR of
their subnet are same, getPortByIp() will be conflict.
My PR gets port based on IP and Name of instance.

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

**Special notes for your reviewer**:

**Release note**:
```release-note
NONE
```
2017-08-11 18:47:19 -07:00
..
bitbucket.org Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
cloud.google.com/go Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
github.com Merge pull request #49785 from FengyunPan/fix-getPortByIP 2017-08-11 18:47:19 -07:00
go.pedge.io/pb Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
go4.org Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
golang.org/x Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
google.golang.org Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
gopkg.in Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
k8s.io Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
vbom.ml/util Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
BUILD Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00