Commit Graph

447 Commits

Author SHA1 Message Date
Lantao Liu
d41c23e31d Update code to make it build
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-22 05:38:51 +00:00
Lantao Liu
39f4ca648b Update Kubernetes to 493ee8b28560c118cebd2165ba9ef0959cfa2bc3
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-22 05:38:51 +00:00
Lantao Liu
50b01812ce Merge pull request #147 from miaoyq/group-all-privileged-logic
Group all privileged logic together
2017-08-21 18:43:06 -07:00
Yanqiang Miao
8adad23015 Group all privileged logic together
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-08-22 09:16:37 +08:00
Lantao Liu
010a562057 Merge pull request #145 from Random-Liu/add-node-e2e-ci
Add node e2e test CI.
2017-08-21 14:41:08 -07:00
Lantao Liu
c05a7e74ee Add node e2e test CI.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-21 21:21:41 +00:00
Lantao Liu
dcc3cb2a05 Merge pull request #137 from Random-Liu/cleanup-with-new-client
Some cleanup after switching to new client.
2017-08-18 15:04:24 -07:00
Lantao Liu
ed640d3972 Some cleanup after switching to new client.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-18 21:04:38 +00:00
Lantao Liu
418a5cd8bf Merge pull request #143 from miaoyq/update-containerd-ver-to-f79981
Update containerd version to f79981c
2017-08-18 10:28:56 -07:00
Yanqiang Miao
fa5c4ab2a7 Update containerd version to f79981c
fixes #140
ref containerd/containerd#1386

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-08-18 15:04:02 +08:00
Lantao Liu
8e9a251f72 Merge pull request #135 from yanxuean/myfeature
The parameters of InitCNI should be filled in reverse order
2017-08-16 19:50:22 -07:00
yanxuean
8cc0347b0a The parameters of InitCNI should be filled in reverse order.
fix  #131

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-08-17 10:18:40 +08:00
Lantao Liu
860dac233f Merge pull request #130 from Random-Liu/add-port-forward
Add portforward support.
2017-08-16 17:47:34 -07:00
Lantao Liu
f555bb1242 Add portforward support.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-17 00:13:31 +00:00
Lantao Liu
1ae4ee8325 Merge pull request #113 from abhinandanpb/client
Replacing containerd GRPC API with client
2017-08-16 16:45:04 -07:00
Abhinandan Prativadi
32e0313418 Containerd client integration
This commit:
1) Replaces the usage of containerd GRPC APIs with the containerd client for all operations related to containerd.
2) Updated containerd to v1.0alpha4+
3) Updated runc to v1.0.0

Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-08-16 14:43:22 -07:00
Lantao Liu
76652ef49a Merge pull request #134 from mikebrow/goversionupdate
Putting in the go versions we want to test against
2017-08-15 22:38:23 -07:00
Mike Brown
f3c12edf3b parallel script execution for each go version within stage
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-08-16 00:20:43 -05:00
Mike Brown
7d1b3a5af8 adding stages to test the right go versions
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-08-15 10:52:11 -05:00
Mike Brown
f2a228b6f8 Merge pull request #129 from mbssaiakhil/patch-1
Fix Typo in Events Code of Conduct
2017-08-15 09:36:30 -05:00
Malepati Bala Siva Sai Akhil
5ce5868bf1 Fix Typo in Events Code of Conduct
Signed-off-by: Malepati Bala Siva Sai Akhil <malepatib.akhil@huawei.com>
2017-08-15 19:37:07 +05:30
Lantao Liu
7ba0679e14 Merge pull request #132 from asifdxtreme/patch-1
Split the travis Build in different Build and Test Stage
2017-08-14 21:07:56 -07:00
asifdxtreme
b927292327 Update stage as per suggestion
Signed-off-by: asifdxtreme <mohammad.asif.siddiqui1@huawei.com>
2017-08-15 10:02:20 +08:00
Mohammad Asif Siddiqui
b55e75b55e Split Travis Build in Stages
Signed-off-by: asifdxtreme <mohammad.asif.siddiqui1@huawei.com>
2017-08-15 09:32:42 +08:00
Lantao Liu
83a20c9fd1 Merge pull request #127 from Random-Liu/containerd-spec-tty
Use containerd spec generator to set tty.
2017-08-11 14:49:17 -07:00
Lantao Liu
2427d332f0 Add TERM=xterm when tty=true.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-11 16:53:40 +00:00
Lantao Liu
86a0f6a59b Merge pull request #126 from miaoyq/change-defaut-spec
Replace the original default spec with containerd default spec
2017-08-10 14:25:23 -07:00
Lantao Liu
8d0c896794 Merge pull request #114 from ijc/build-flags
Allow setting of compiler options
2017-08-10 10:28:09 -07:00
Yanqiang Miao
9cc93886ea Replace the original default spec with containerd default spec
The original default spec contain `seccomp` configuration,
but some OS do not support this feature, such as ubuntu14.04,
and `make test-cri` always fail. The containerd default spec dosen't
contain `seccomp`, so I think we could replace the default spec
with containerd default spec.

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-08-10 20:31:03 +08:00
Lantao Liu
b961e28d33 Merge pull request #119 from mikebrow/add-sysctls
Sets sysctls from pod config annotations
2017-08-09 18:23:15 -07:00
Lantao Liu
64c31116dd Merge pull request #123 from Random-Liu/update-crio-and-docker
Update docker and cri-o to include the sirupsen fix.
2017-08-09 16:50:05 -07:00
Mike Brown
8d37d97d01 sets sysctls from pod config annotations
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-08-09 18:42:04 -05:00
Lantao Liu
8f6558aee6 Update docker and cri-o to include the sirupsen fix.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-09 23:29:19 +00:00
Ian Campbell
7008be890f Add static-binaries target
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-08-08 10:31:36 +01:00
Lantao Liu
69251dd7ec Merge pull request #116 from Random-Liu/fix-devices
Handle device symlink.
2017-08-07 19:11:11 -07:00
Lantao Liu
4c5cea9258 Handle device symlink.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-08 00:53:15 +00:00
Lantao Liu
be54e9a6c0 Merge pull request #115 from Random-Liu/support-container-streaming
Add container Exec support.
2017-08-07 17:04:01 -07:00
Lantao Liu
75731c8feb Start running container Exec cri validation test.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-07 22:49:06 +00:00
Lantao Liu
54286313ce Add container Exec support.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-07 22:49:06 +00:00
Lantao Liu
8b56c91ec5 Extract execInContainer
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-07 22:35:50 +00:00
Lantao Liu
53a8cdf14f Vendor kubernetes streaming server
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-07 19:05:16 +00:00
Lantao Liu
6c2d1ba8db Merge pull request #112 from Random-Liu/Sirupsen-to-sirupsen
Add script to rewrite `Sirupsen` to `sirupsen` in vendor.
2017-08-07 09:40:01 -07:00
Lantao Liu
ac4c5e8989 Add script to rewrite Sirupsen to sirupsen in vendor.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-05 00:37:19 +00:00
Lantao Liu
9add0139c0 Merge pull request #111 from Random-Liu/use-client-for-execsync
Use containerd client for container execsync
2017-08-04 13:43:12 -07:00
Lantao Liu
bf270fae1c Use containerd client for container execsync.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-04 18:32:39 +00:00
Lantao Liu
f0e6fe3251 Merge pull request #110 from Random-Liu/use-vndr
Use vndr instead of godep.
2017-08-04 08:35:51 -07:00
Ian Campbell
7709115afe Allow setting of compiler options
To allow e.g. building a static binary with:

    make binaries GO_GCFLAGS="--ldflags '-extldflags \"-fno-PIC -static\"'"

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-08-04 13:05:43 +01:00
Lantao Liu
20860f2ecb Use vndr instead of godep.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-04 02:41:26 +00:00
Lantao Liu
230f03a47d Merge pull request #108 from mikebrow/wait-for-containerd
loop waiting for containerd server to respond to client connection
2017-08-03 10:33:19 -07:00
Mike Brown
6a9152e83f loop waiting for containerd server to respond
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-08-03 07:53:55 -05:00