Kubernetes Publisher 521652b00c 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 ``` Kubernetes-commit: a7ce691311f5462cf71d79a1f9431605198803af		2017-08-29 13:16:10 +00:00
..
bitbucket.org/ww/goautoneg	sync: resync vendor folder	2017-02-23 11:13:21 -05:00
github.com	Merge pull request #49785 from FengyunPan/fix-getPortByIP	2017-08-29 13:16:10 +00:00
golang.org/x	Merge pull request #49300 from tklauser/syscall-to-x-sys-unix	2017-08-29 13:13:50 +00:00
google.golang.org/grpc	sync: resync vendor folder	2017-04-12 20:36:01 +00:00
gopkg.in	sync: resync vendor folder	2017-02-23 11:13:21 -05:00