github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
1,058 Commits 3 Branches 2 Tags 112 MiB
334f7ddf0a
Commit Graph

1058 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lantao Liu
e64d267ae8 Update Kubenretes to the right version. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-05 06:07:48 +00:00
Lantao Liu
3a5ec1cf6e Merge pull request #328 from Random-Liu/fix-container-stats-panic 
Fix container stats panic.
 2017-10-04 21:45:19 -07:00
Lantao Liu
94b68ae662 Fix container stats panic. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-05 02:18:19 +00:00
Lantao Liu
d25c632bfe Merge pull request #327 from Random-Liu/fix-image-volume 
Skip not exist image volume directory.
 2017-10-04 16:22:06 -07:00
Lantao Liu
0bcc95e4a1 Skip not exist image volume directory. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-04 22:43:24 +00:00
Lantao Liu
23b8330b44 Merge pull request #322 from miaoyq/fix-314 
Update kubernetes version to the PR#52395 and support `unconfined` apparmor
 2017-10-04 10:49:56 -07:00
Lantao Liu
cfa7acf1f6 Merge pull request #323 from Random-Liu/add-node-e2e-test-timeout 
Add node e2e test timeout.
 2017-10-03 21:40:00 -07:00
Yanqiang Miao
9f656cdda4 Support unconfined apparmor 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-10-04 09:50:27 +08:00
Lantao Liu
2f5f8be99d Add node e2e test timeout. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-04 01:12:43 +00:00
Lantao Liu
475471f8a0 Merge pull request #321 from mhamrah/patch-1 
Quick typo fix for README.md
 2017-10-03 15:05:37 -07:00
Michael Hamrah
05f35f087b Fix README.md typo 
Signed-off-by: Michael Hamrah <m@hamrah.com>
 2017-10-03 16:50:19 -04:00
Lantao Liu
aec175c9a1 Merge pull request #319 from Random-Liu/fix-update-container-resources 
Fix update container resources
 2017-10-03 13:17:35 -07:00
Yanqiang Miao
a7471d79ab Update kubernetes version to the PR#52395 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-10-03 21:46:56 +08:00
Lantao Liu
dfe615acc0 Merge pull request #318 from nikhita/fix-design-proposal-link 
Fix link after design proposals move
 2017-10-03 00:21:27 -07:00
Nikhita Raghunath
bf2f942a11 Fix link to design proposal 
Signed-off-by: Nikhita Raghunath <nikitaraghunath@gmail.com>
 2017-10-03 12:21:53 +05:30
Lantao Liu
ecd1638293 Add integration test 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-03 06:03:54 +00:00
Lantao Liu
a81a47bf9b Fix update container resources 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-03 06:03:39 +00:00
Lantao Liu
29d9a788e6 Merge pull request #313 from Random-Liu/update-ansible 
Update ansible playbook release version.
 2017-09-29 09:56:59 -07:00
Lantao Liu
60ea331f9f Update ansible playbook release version. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-29 06:21:28 +00:00
Lantao Liu
125152b944 Merge pull request #312 from Random-Liu/update-cri-tools-version 
Update critools version to v0.2.
 2017-09-28 21:03:40 -07:00
Lantao Liu
ba757745d2 Update critools version to v0.2. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-29 03:23:36 +00:00
Lantao Liu
5acb73841c Merge pull request #311 from Random-Liu/update-kubernetes 
Update Kubernetes to v1.8.0
 2017-09-28 20:22:08 -07:00
Lantao Liu
651b0185e1 Update Kubernetes to v1.8.0 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-29 02:51:46 +00:00
Lantao Liu
4d0a2338c4 Merge pull request #309 from Random-Liu/update-readme 
Update README.md
 2017-09-28 18:18:51 -07:00
Lantao Liu
fd032461fb Update README.md 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-29 00:10:18 +00:00
Lantao Liu
98c5bd80ca Merge pull request #306 from Random-Liu/update-kubernetes 
Update kubernetes to v1.8.0-rc.1
 2017-09-28 16:52:47 -07:00
Lantao Liu
4127e0e295 Merge pull request #307 from Random-Liu/rename-getting-started 
Rename getting-started.md to README.md.
 2017-09-28 16:17:21 -07:00
Lantao Liu
8c7ddee69d Rename getting-started.md to README.md. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-28 23:11:00 +00:00
Lantao Liu
6063b580a4 Merge pull request #308 from mikebrow/quick-readme-update 
minor update to the readme
 2017-09-28 15:29:12 -07:00
Mike Brown
39ec8fa9ae minor update to the readme 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-09-28 17:19:40 -05:00
Lantao Liu
126c0a0e80 Update kubernetes to v1.8.0-rc.1 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-28 21:28:27 +00:00
Lantao Liu
f586073b1c Merge pull request #294 from Random-Liu/cleanup-flags 
Cleanup flag default value
 2017-09-28 13:13:14 -07:00
Lantao Liu
a7b78d7622 Merge pull request #297 from ijc/use-stat-for-device-uuid-comparison 
Use stat_t.st_rdev to compare block devices
 2017-09-28 11:30:34 -07:00
Lantao Liu
dc947114bb Cleanup flag default value 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-28 18:24:40 +00:00
Abhinandan Prativadi
1784b073bc Merge pull request #301 from Random-Liu/fix-container-stats 
Fix container stats.
 2017-09-28 06:02:42 -07:00
Lantao Liu
de6287d626 Fix container stats. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-28 05:49:44 +00:00
Lantao Liu
d6e04d871e Merge pull request #300 from Random-Liu/improve-some-error-message 
Better format several errors
 2017-09-27 22:47:15 -07:00
Lantao Liu
517f697f62 Better format several errors 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-28 01:15:06 +00:00
Lantao Liu
e723a5018b Merge pull request #293 from Random-Liu/cleanup-container-metrics 
Fix and cleanup container metrics
 2017-09-27 17:17:46 -07:00
Lantao Liu
97b6e82d98 Fix and cleanup container metrics 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-27 23:43:00 +00:00
Abhinandan Prativadi
cc5d3ef96a Merge pull request #296 from abhinandanpb/stats_time 
Setting the cpu and memory stats of containers in nanoseconds
 2017-09-27 09:22:56 -07:00
Ian Campbell
11714fb6a3 Use stat_t.st_rdev to compare block devices 
I implemented /dev/disk/by-uuid on my platform but using absolute links (where
udev typically uses relative) which broke the code in `os.DeviceUUID`.

Rather than just patch that up directly instead stat both the target and
candidate devices and pick one with matching major:minor in st_rdev. This saves
manually building paths to resolve symlinks and I think should be more robust
overall.

I also removed the initial stat of /dev/disk/by-uuid, I believe
`ioutil.Readdir` will correctly return an error if the path does not exist.

Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-09-27 16:17:57 +01:00
Abhinandan Prativadi
66693196ac Setting timestamp for cpu and memory stats in nano seconds 
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
 2017-09-27 07:06:25 -07:00
Lantao Liu
0e6e593481 Merge pull request #275 from mikebrow/config-for-containerd 
Adds support for configuring the containerd runtime engine
 2017-09-26 20:04:13 -07:00
Mike Brown
d8a3c6b018 adds support for configuring the containerd runtime engine 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-09-26 20:22:51 -05:00
Lantao Liu
e7a5001c3e Merge pull request #265 from abhinandanpb/metrics 
Adding container metrics support
 2017-09-26 13:57:17 -07:00
Lantao Liu
78190d6228 Merge pull request #284 from abhinandanpb/master 
Ansible Cleanup: Combining few tasks into one
 2017-09-26 13:23:17 -07:00
Abhinandan Prativadi
0ee33fda03 Combining few tasks into one 
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
 2017-09-26 12:12:00 -07:00
Abhinandan Prativadi
853804bd8e Adding integration test for container stats 
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
 2017-09-26 12:03:15 -07:00
Abhinandan Prativadi
d0298944eb Adding container metrics 
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
 2017-09-26 12:03:08 -07:00