Commit Graph

8778 Commits

Author SHA1 Message Date
Lantao Liu
c63c357d2d
Merge pull request #694 from Random-Liu/address-comments-in-#681
Make const private.
2018-03-22 18:31:04 -07:00
Lantao Liu
55d512b98c Make const private.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-23 00:48:50 +00:00
Lantao Liu
5ae4de1cc2
Merge pull request #681 from mikebrow/tls-config
adds tls certificate to tls config
2018-03-22 17:34:04 -07:00
Derek McGowan
382b313c51
Merge pull request #2222 from ijc/ignore-sockets-in-archiver
Ignore sockets when creating a tar stream of a layer
2018-03-22 14:11:42 -07:00
Derek McGowan
43d0a5cb60
Pass in context to lease done function in client
Allows the client to choose the context to finish the lease.
This allows the client to switch contexts when the main context
used to the create the lease may have been cancelled.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-03-22 14:09:24 -07:00
Kenfe-Mickaël Laventure
07dfb0368a
Merge pull request #2220 from stevvooe/redundant-pkg-name
cmd/ctr/app: remove redundant package name
2018-03-22 13:23:50 -07:00
Derek McGowan
804249cdcf
Merge pull request #2214 from miaoyq/fixes-config-bug
Fixes a default config bug of gc scheduler
2018-03-22 13:21:33 -07:00
Derek McGowan
9b111bdc39
Add ignore socket test
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-03-22 13:17:33 -07:00
Lantao Liu
b142a225ea
Merge pull request #690 from nitkon/master
Bump pause container to multi-arch gcr.io/google-containers/pause:3.1
2018-03-22 11:47:44 -07:00
Stephen J Day
903ee88368
cmd/ctr/app: remove redundant package name
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-03-22 10:12:00 -07:00
Ian Campbell
2ec3382d2d Ignore sockets when creating a tar stream of a layer
The go-tar implementation which is used cannot handle sockets.

There's no good reason to preserve a socket, they are basically useless without
the process which made them.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2018-03-22 15:19:35 +00:00
Mike Brown
89adb74414 adds tls certificate to tls config
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-03-22 09:42:31 -05:00
Nitesh Konkar
6a542c596b Bump pause container to multi-arch gcr.io/google-containers/pause:3.1
Signed-off-by: Nitesh Konkar <niteshkonkar@in.ibm.com>
2018-03-22 05:44:12 +00:00
Akihiro Suda
9304193b8c
Merge pull request #2219 from dmcgowan/fix-lock-on-schema1-configs
content: add writer open helper to handle unavailable refs
2018-03-22 11:45:17 +09:00
Derek McGowan
5304ef294b
Add writer open helper to handle unavailable refs
Updates blob writer helper to use new open and ensure
unavailable errors are always handled.
Removes duplication of unavailable handling code.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-03-21 16:30:22 -07:00
Lantao Liu
246ffa325d
Merge pull request #689 from Random-Liu/remove-omit-empty
Remove omitempty from config json.
2018-03-21 11:41:36 -07:00
Lantao Liu
9177cb16bc Remove omitempty from config json.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-21 07:28:25 +00:00
Lantao Liu
cf156144bc
Merge pull request #657 from jcvenegas/trusted-runtime
[WIP]config: Allow to define trusted runtime
2018-03-20 19:21:04 -07:00
Lantao Liu
f3b8e72998
Merge pull request #685 from Random-Liu/update-cri-tools
Update cri-tools and build critest into release tarball again.
2018-03-20 19:08:18 -07:00
Lantao Liu
65c1cc77bb
Merge pull request #682 from Random-Liu/update-doc
Update README.d and graphs.
2018-03-20 19:08:06 -07:00
Jose Carlos Venegas Munoz
536b381362 test: Allow change containerd config
Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-03-20 18:05:40 -06:00
Jose Carlos Venegas Munoz
bdc5eee544 test: Add unit tests for privileged runtime functions
- Add unit test for privilegedSandbox

- Add unit test  for getRuntime

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-03-20 18:04:23 -06:00
Lantao Liu
36768a1920 Update cri-tools and build critest into release tarball again.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-20 21:26:05 +00:00
Lantao Liu
129d060e10 Update README.d and graphs.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-20 21:11:23 +00:00
Jose Carlos Venegas Munoz
ca16bd601a runtime: Add trusted runtime option
Some CRI compatible runtimes may not support provileged operations.
Specifically hypervisor based runtimes (like kata-containers, cc-runtime
and runv) do not support privileged operations like:

- Provide access to the host namespaces
- Create fully privileged containers with access to host devices

Hypervisor based runtimes create container workloads within virtual machines.
When a running host privileged containers using them,
they wont provide support to requested the privileged opertations.

This commits add the new options to define two runtimes:

Trusted runtime : Used when a privileged container is requested.
Default runtime : for non-privileged workloads.

A container that belongs to a privileged pod will inherent this property
an will be created with the trusted runtime.

- Add options to define trusted runtime
- Add logic to decide if a sanbox is trusted
- Export annotation containers below to a trusted sandbox

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-03-20 13:56:49 -06:00
Lantao Liu
7f959b6dd5
Merge pull request #684 from Random-Liu/fix-kube-up-and-docs
Fix for kube-up.sh and update several documments.
2018-03-20 10:18:14 -07:00
Yanqiang Miao
d465f858a0 Fixes a default config bug of gc scheduler
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2018-03-20 19:29:40 +08:00
Lantao Liu
904938fa9d Fix for kube-up.sh and update several documments.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-20 09:24:15 +00:00
Lantao Liu
013ab03a53
Merge pull request #683 from Random-Liu/rename-variables
Rename all variables to remove "cricontainerd".
2018-03-19 15:45:45 -07:00
Lantao Liu
387da59ee5 Rename all variables to remove "cricontainerd".
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-19 21:59:32 +00:00
Kenfe-Mickaël Laventure
4c8bbb55b7
Merge pull request #2216 from crosbymichael/task-id
Add task.ID() API
2018-03-19 14:01:54 -07:00
Lantao Liu
9afdd1956b
Merge pull request #680 from Random-Liu/fix-containerd-test
Only set deploy dir.
2018-03-19 11:41:50 -07:00
Michael Crosby
9b9a0ac8ad Add task.ID() API
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-03-19 13:44:49 -04:00
Lantao Liu
bce3310d5b Only set deploy path.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-19 17:32:13 +00:00
Lantao Liu
a612c3f107
Merge pull request #677 from Random-Liu/all-metadata-to-file
Write all instance metadata to files.
2018-03-17 04:50:40 -07:00
Lantao Liu
83da5a17fa
Merge pull request #678 from Random-Liu/use-pkg-errors
Use `github.com/pkg/errors`
2018-03-17 04:50:03 -07:00
Lantao Liu
e1fe1abff0 Use github.com/pkg/errors
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-17 02:24:38 +00:00
Lantao Liu
1cf018f39f Write all instance metadata to files.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-17 01:49:04 +00:00
Lantao Liu
916e99d0ad
Merge pull request #675 from Random-Liu/fix-containerd-repo-test
Fix containerd repo test.
2018-03-16 16:43:53 -07:00
Lantao Liu
948d3132c9
Merge pull request #674 from abhi/master
Removing DAD config and updating plugins to v0.7.0
2018-03-16 16:32:01 -07:00
Lantao Liu
47855119ab
Merge pull request #667 from mikebrow/doc-updates-cri-move
docs update for cri-containerd to cri move
2018-03-16 16:24:40 -07:00
Lantao Liu
524177e3ef Fix containerd repo test.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-16 23:06:25 +00:00
abhi
2bdf428eb7 Removing DAD config and updating plugins to v0.7.0
Signed-off-by: abhi <abhi@docker.com>
2018-03-16 14:46:46 -07:00
Mike Brown
0ee7614785 docs update for cri-containerd to cri move
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-03-16 15:33:17 -05:00
Lantao Liu
65b5240b29
Merge pull request #673 from Random-Liu/test-containerd-repo
Test containerd repo
2018-03-16 13:04:41 -07:00
Lantao Liu
a69f3555da Add build-containerd.sh to build containerd from existing repo
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-16 17:51:29 +00:00
Phil Estes
f5d7bfb56e
Merge pull request #2213 from crosbymichael/runc
Bump runc to 69663f0bd4b60df09991c08812a60108003fa
2018-03-16 12:54:54 +02:00
Lantao Liu
0b8e9060d7 Sync vendors with containerd
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-16 06:39:01 +00:00
Lantao Liu
1dcbf4f742
Merge pull request #663 from abhi/cni
Moving to use go-cni library from containerd
2018-03-15 17:53:50 -07:00
Lantao Liu
5e5a5f50d1
Merge pull request #671 from Random-Liu/ctrcri-to-ctr-cri
Ctrcri to ctr cri
2018-03-15 17:14:59 -07:00