github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
k3s/vendor/github.com
History
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
..
Azure Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
MakeNowJust/heredoc Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
Microsoft/go-winio Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
NYTimes/gziphandler Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
PuerkitoBio Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
Sirupsen/logrus Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
abbot/go-http-auth Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
appc/spec Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
armon/circbuf Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
asaskevich/govalidator Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
aws/aws-sdk-go Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
beorn7/perks Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
blang/semver Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
boltdb/bolt Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
chai2010/gettext-go Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
cloudflare/cfssl Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
clusterhq/flocker-go Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
codedellemc/goscaleio Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
codegangsta/negroni Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
containernetworking/cni Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
coreos Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
cpuguy83/go-md2man Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
davecgh/go-spew Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
daviddengcn/go-colortext Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
dgrijalva/jwt-go Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
docker Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
elazarl Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
emicklei Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
evanphx/json-patch Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
exponent-io/jsonpath Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
fatih/camelcase Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
fsnotify/fsnotify Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
garyburd/redigo Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
ghodss/yaml Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
go-ini/ini Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
go-openapi Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
godbus/dbus Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
gogo/protobuf Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
golang Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
google Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
googleapis/gnostic Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
gophercloud/gophercloud Merge pull request #49785 from FengyunPan/fix-getPortByIP 2017-08-11 18:47:19 -07:00
gorilla Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
grpc-ecosystem Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
hashicorp Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
hawkular/hawkular-client-go Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
heketi/heketi Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
howeyc/gopass Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
imdario/mergo Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
inconshreveable/mousetrap Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
influxdata/influxdb Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
jmespath/go-jmespath Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
jonboulle/clockwork Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
jteeuwen/go-bindata Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
juju/ratelimit Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
kardianos/osext Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
karlseguin/ccache Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
kr Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
libopenstorage/openstorage Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
lpabon/godbc Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
magiconair/properties Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
mailru/easyjson Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
matttproud/golang_protobuf_extensions Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
miekg Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
mistifyio/go-zfs Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
mitchellh Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
mreiferson/go-httpclient Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
mvdan/xurls Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
mxk/go-flowrate Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
onsi Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
opencontainers/runc Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
pborman/uuid Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
pelletier Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
pkg Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
pmezard/go-difflib Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
prometheus Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
quobyte/api Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
rackspace/gophercloud Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
rancher/go-rancher Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
renstrom/dedent Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
robfig/cron Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
rubiojr/go-vhd Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
russross/blackfriday Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
satori/uuid Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
seccomp/libseccomp-golang Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
shurcooL/sanitized_anchor_name Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
spf13 Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
square/go-jose Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
storageos/go-api Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
stretchr Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
syndtr/gocapability Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
ugorji/go Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
vishvananda/netlink Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
vmware Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
xanzy/go-cloudstack Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
xiang90/probing Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
xyproto/simpleredis Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00