github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40a60cd42e
kubernetes/vendor/github.com
History
Kubernetes Submit Queue 69a9759d90 Merge pull request #46744 from karataliu/wincri4 
Automatic merge from submit-queue

Support windows in dockershim

**What this PR does / why we need it**:
This is the 2nd part for https://github.com/kubernetes/kubernetes/issues/45927 .

The non-cri implementation dockertools was removed from kubelet v1.7 .
Part of previous work for supporting windows container lies in v1.6 dockertools, this PR is to port them to dockershim.

Main reference file in v1.6 dockertools windows support:
https://github.com/kubernetes/kubernetes/blob/v1.6.4/pkg/kubelet/dockertools/docker_manager_windows.go

**Which issue this PR fixes**
45927, for now catching up the implementation of v1.6

**Special notes for your reviewer**:
The code change includes 4 parts, put them together as we discussed in https://github.com/kubernetes/kubernetes/pull/46089

1. Update go-winio package to a newer version
  'go-winio' package is used by docker client.
  This change is to bring the support for Go v1.8, specifically included in the PR: https://github.com/Microsoft/go-winio/pull/48 
Otherwise it will produce a lot of error like in: https://github.com/fsouza/go-dockerclient/issues/648 

2. Add os dependent getSecurityOpts helper method. 
seccomp not supported on windows
  Corresponding code in v1.6: https://github.com/kubernetes/kubernetes/blob/v1.6.4/pkg/kubelet/dockertools/docker_manager_windows.go#L78

3. Add updateCreateConfig.
Allow user specified network mode setting. This is to be compatible with what kube-proxy package does on Windows. 
  Also, there is a Linux section in both sandbox config and container config： LinuxPodSandboxConfig， LinuxContainerConfig.
And that section later goes to Config and HostConfig section under docker container createConfig. Ideally hostconfig section should be dependent on host os, while config should depend on container image os.
  To simplify the case, here it assumes that windows host supports windows type container image only. It needs to be updated when kubernetes is to support windows host running linux container image or the like.
  Corresponding code in v1.6: https://github.com/kubernetes/kubernetes/blob/v1.6.4/pkg/kubelet/dockertools/docker_manager_windows.go#L57

4. Add podIpCache in dockershim. 
  For v1.6 windows implementation, it still does not use sandbox, thus only allow single container to be exposed.
  Here added a cache for saving container IP, to get adapted to the new CRI api.
Corresponding code in v1.6:
No sandbox: https://github.com/kubernetes/kubernetes/blob/v1.6.4/pkg/kubelet/dockertools/docker_manager_windows.go#L66
Use container id as pod ip: https://github.com/kubernetes/kubernetes/blob/v1.6.4/pkg/kubelet/dockertools/docker_manager.go#L2727

**Release note**:
2017-06-07 20:03:19 -07:00
..
abbot/go-http-auth autogenerated 2017-04-14 10:40:57 -07:00
appc/spec autogenerated 2017-04-14 10:40:57 -07:00
armon/circbuf autogenerated 2017-04-14 10:40:57 -07:00
asaskevich/govalidator autogenerated 2017-04-14 10:40:57 -07:00
aws/aws-sdk-go bump rules_go and go version for bazel builds 2017-04-25 11:23:33 -07:00
Azure autogenerated 2017-04-14 10:40:57 -07:00
beorn7/perks autogenerated 2017-04-14 10:40:57 -07:00
blang/semver Update semver to 3.5.0 2017-05-30 17:44:35 -07:00
boltdb/bolt autogenerated 2017-04-14 10:40:57 -07:00
chai2010/gettext-go autogenerated 2017-04-14 10:40:57 -07:00
cloudflare/cfssl autogenerated 2017-04-14 10:40:57 -07:00
clusterhq/flocker-go autogenerated 2017-04-14 10:40:57 -07:00
codedellemc/goscaleio autogenerated 2017-04-14 10:40:57 -07:00
codegangsta/negroni autogenerated 2017-04-14 10:40:57 -07:00
containernetworking/cni kubelet/networking: add support for cni ConfigLists, pass hostport parameters 2017-04-18 14:23:57 +02:00
coreos autogenerated 2017-04-14 10:40:57 -07:00
cpuguy83/go-md2man autogenerated 2017-04-14 10:40:57 -07:00
davecgh/go-spew autogenerated 2017-04-14 10:40:57 -07:00
daviddengcn/go-colortext autogenerated 2017-04-14 10:40:57 -07:00
dgrijalva/jwt-go autogenerated 2017-04-14 10:40:57 -07:00
docker autogenerated 2017-04-14 10:40:57 -07:00
elazarl Merge pull request #44113 from mikkeloscar/update-goproxy 2017-04-16 10:26:55 -07:00
emicklei Update godeps for juju ratelimit 2017-05-24 20:33:15 -07:00
evanphx/json-patch autogenerated 2017-04-14 10:40:57 -07:00
exponent-io/jsonpath autogenerated 2017-04-14 10:40:57 -07:00
fatih/camelcase Adds github.com/fatih/camelcase dependency 2017-04-17 15:42:42 -03:00
fsnotify/fsnotify autogenerated 2017-04-14 10:40:57 -07:00
garyburd/redigo autogenerated 2017-04-14 10:40:57 -07:00
ghodss/yaml autogenerated 2017-04-14 10:40:57 -07:00
go-ini/ini autogenerated 2017-04-14 10:40:57 -07:00
go-openapi autogenerated 2017-04-14 10:40:57 -07:00
godbus/dbus autogenerated 2017-04-14 10:40:57 -07:00
gogo/protobuf autogenerated 2017-04-14 10:40:57 -07:00
golang Update bazel 2017-05-19 15:39:08 -07:00
google update cadvisor godeps 2017-06-04 15:00:23 -07:00
googleapis/gnostic Update bazel 2017-05-19 15:39:08 -07:00
gophercloud/gophercloud update gophercloud that fixed code format 2017-04-25 03:16:03 +00:00
gorilla autogenerated 2017-04-14 10:40:57 -07:00
grpc-ecosystem autogenerated 2017-04-14 10:40:57 -07:00
hashicorp autogenerated 2017-04-14 10:40:57 -07:00
hawkular/hawkular-client-go autogenerated 2017-04-14 10:40:57 -07:00
heketi/heketi adding support for gpus in node e2e 2017-05-13 16:35:54 -07:00
howeyc/gopass update gopass to fix format error 2017-05-11 09:16:53 +08:00
imdario/mergo autogenerated 2017-04-14 10:40:57 -07:00
inconshreveable/mousetrap autogenerated 2017-04-14 10:40:57 -07:00
influxdata/influxdb autogenerated 2017-04-14 10:40:57 -07:00
jmespath/go-jmespath autogenerated 2017-04-14 10:40:57 -07:00
jonboulle/clockwork autogenerated 2017-04-14 10:40:57 -07:00
jteeuwen/go-bindata autogenerated 2017-04-14 10:40:57 -07:00
juju/ratelimit Update godeps for juju ratelimit 2017-05-24 20:33:15 -07:00
kardianos/osext autogenerated 2017-04-14 10:40:57 -07:00
karlseguin/ccache autogenerated 2017-04-14 10:40:57 -07:00
kr autogenerated 2017-04-14 10:40:57 -07:00
libopenstorage/openstorage autogenerated 2017-04-14 10:40:57 -07:00
lpabon/godbc autogenerated 2017-04-14 10:40:57 -07:00
magiconair/properties autogenerated 2017-04-14 10:40:57 -07:00
mailru/easyjson autogenerated 2017-04-14 10:40:57 -07:00
MakeNowJust/heredoc autogenerated 2017-04-14 10:40:57 -07:00
matttproud/golang_protobuf_extensions autogenerated 2017-04-14 10:40:57 -07:00
mesos/mesos-go autogenerated 2017-04-14 10:40:57 -07:00
Microsoft/go-winio Upgrade go-winio package to v0.4.2, supporting go v1.8 . 2017-06-02 05:59:20 -05:00
miekg autogenerated 2017-04-14 10:40:57 -07:00
mistifyio/go-zfs autogenerated 2017-04-14 10:40:57 -07:00
mitchellh Merge pull request #44255 from zlabjp/bump-mapstructure 2017-06-05 01:56:24 -07:00
mreiferson/go-httpclient autogenerated 2017-04-14 10:40:57 -07:00
mvdan/xurls autogenerated 2017-04-14 10:40:57 -07:00
mxk/go-flowrate autogenerated 2017-04-14 10:40:57 -07:00
onsi autogenerated 2017-04-14 10:40:57 -07:00
opencontainers/runc bump runc to d223e2a 2017-04-26 13:26:41 -05:00
pborman/uuid autogenerated 2017-04-14 10:40:57 -07:00
pelletier autogenerated 2017-04-14 10:40:57 -07:00
pkg autogenerated 2017-04-14 10:40:57 -07:00
pmezard/go-difflib autogenerated 2017-04-14 10:40:57 -07:00
prometheus update cadvisor godeps 2017-06-04 15:00:23 -07:00
PuerkitoBio autogenerated 2017-04-14 10:40:57 -07:00
quobyte/api autogenerated 2017-04-14 10:40:57 -07:00
rackspace/gophercloud autogenerated 2017-04-14 10:40:57 -07:00
rancher/go-rancher autogenerated 2017-04-14 10:40:57 -07:00
renstrom/dedent autogenerated 2017-04-14 10:40:57 -07:00
robfig/cron autogenerated 2017-04-14 10:40:57 -07:00
rubiojr/go-vhd autogenerated 2017-04-14 10:40:57 -07:00
russross/blackfriday autogenerated 2017-04-14 10:40:57 -07:00
samuel/go-zookeeper autogenerated 2017-04-14 10:40:57 -07:00
seccomp/libseccomp-golang autogenerated 2017-04-14 10:40:57 -07:00
shurcooL/sanitized_anchor_name autogenerated 2017-04-14 10:40:57 -07:00
Sirupsen/logrus autogenerated 2017-04-14 10:40:57 -07:00
spf13 autogenerated 2017-04-14 10:40:57 -07:00
square/go-jose autogenerated 2017-04-14 10:40:57 -07:00
stretchr autogenerated 2017-04-14 10:40:57 -07:00
syndtr/gocapability autogenerated 2017-04-14 10:40:57 -07:00
ugorji/go autogenerated 2017-04-14 10:40:57 -07:00
vishvananda/netlink autogenerated 2017-04-14 10:40:57 -07:00
vmware PBM govmomi dependencies 2017-05-22 19:43:10 -07:00
xanzy/go-cloudstack autogenerated 2017-04-14 10:40:57 -07:00
xiang90/probing autogenerated 2017-04-14 10:40:57 -07:00
xyproto/simpleredis autogenerated 2017-04-14 10:40:57 -07:00