Commit graph

2180 commits

Author SHA1 Message Date
W. Trevor King
37f136562b hooks: Remove backticks from CRI-O
These backticks landed with the rest of the hook docs in 139d0841 (Add
support for oci-hooks to libkpod, 2017-08-12, #562).  But "CRI-O" is
the project name, so it doesn't need backticks.  We would need
backticks if we used the executable filename "crio".

Signed-off-by: W. Trevor King <wking@tremily.us>
2018-02-20 10:21:53 -08:00
Mrunal Patel
0b4f49f6d7
Merge pull request #1354 from runcom/1.9.6-toml
releases: add v1.9.6.toml
2018-02-20 10:09:08 -08:00
Antonio Murdaca
d9dd4ce990
releases: add v1.9.6.toml
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2018-02-20 16:03:58 +01:00
Antonio Murdaca
6de90e046a
Merge pull request #1348 from mrunalp/debug_exit_file
Add container id to exit file missing warning
2018-02-17 01:02:58 +01:00
Mrunal Patel
d4dd6566ee Add container id to exit file missing warning
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2018-02-16 13:13:32 -08:00
Antonio Murdaca
4e6ed3d974
Merge pull request #1344 from mrunalp/1.9.5_release
release: Add v1.9.5
2018-02-16 16:28:18 +01:00
Mrunal Patel
ffe436cb9d release: Add v1.9.5
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2018-02-15 15:38:56 -08:00
Mrunal Patel
8f5e37a83c
Merge pull request #1249 from theatrus/add-container-stats
Add methods for listing and fetching container stats
2018-02-15 13:29:15 -08:00
Mrunal Patel
ea90be40c4
Merge pull request #1337 from nalind/fix-runasuser-cache
imageService: cache information about images
2018-02-15 11:22:33 -08:00
Mrunal Patel
125ec8a7bd image: Add lock around image cache access
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2018-02-15 10:27:39 -05:00
Mrunal Patel
be23a54da4
Merge pull request #1335 from wking/wont-never
oci: Copy-edits for waitContainerStop chControl comment
2018-02-14 18:01:02 -08:00
W. Trevor King
db3962cbc9 oci: Copy-edits for waitContainerStop chControl comment
The old "won't never" was a potentially-confusing double negative.
This commit rewords the comment to avoid that issue and also lands
some other minor cleanups.

Signed-off-by: W. Trevor King <wking@tremily.us>
2018-02-14 16:58:10 -08:00
Nalin Dahyabhai
c53211eacd imageService: cache information about images
Cache information about images that isn't trivially read from them, so
that ImageStatus and particularly ListImages don't have to do
potentially-expensive things for every image that they report.

The cache is an in-memory map, and we prune it after ListImages has
assembled its result set.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2018-02-14 14:41:03 -05:00
Mrunal Patel
fa8cedf981
Merge pull request #1328 from runcom/record-hostnetwork-snb
sandbox: record whether sb is using host network
2018-02-14 10:06:06 -08:00
Yann Ramin
9a86dbabc2 Add logging support for base condition in debug
Signed-off-by: Yann Ramin <atrus@stackworks.net>
2018-02-14 08:10:26 -08:00
Yann Ramin
a2fc41358a Simplify filter block
Signed-off-by: Yann Ramin <atrus@stackworks.net>
2018-02-14 08:10:26 -08:00
Yann Ramin
50c94a9335 Specifying a filter with no filtering expressions is now idempotent
Signed-off-by: Yann Ramin <atrus@stackworks.net>
2018-02-14 08:10:26 -08:00
Yann Ramin
14c1c70407 Add methods for listing and fetching container stats
This uses the previously unusued lib/stats.go code to return data
about container stats to the CRI API. Helpers have been built around
filtering based on the OCI API, and CPU stat reporting has been fixed.

No data on filesystem layer usage is returned at this time.

Fixes one-half of #1248

Signed-off-by: Yann Ramin <atrus@stackworks.net>
2018-02-14 08:10:13 -08:00
Antonio Murdaca
96fb47213e
container_create: correctly set user
We had a bug in ImageStatus where we weren't returning the default
image user if set, thus running all containers as root despite a user
being set in the image config. We weren't populating the Username field
of ImageStatus.
This patch fixes that along with the handling of multiple images based
on the registry patch for multiple images.
It also fixes ListImages to return Username as well.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2018-02-14 13:17:20 +01:00
Antonio Murdaca
4cc3d0a508
Merge pull request #1325 from wanghaoran1988/update_gitignore
Add some ide generated files to .gitignore
2018-02-13 13:17:27 +01:00
Antonio Murdaca
ab204b6641
sandbox: record whether sb is using host network
We need to record whether the sandbox is using hostnetwok because the
kubelet needs that information when computing pod changes. Without this
patch it could happen that a pod that's using host network is restarted
just because the sandbox's status isn't reporting that it's running
using host network.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2018-02-13 11:45:33 +01:00
Haoran Wang
508a202a69 Update .gitignore to add some ide generated files
Signed-off-by: Haoran Wang <haowang@redhat.com>
2018-02-13 15:53:04 +08:00
Mrunal Patel
9128ffc226
Merge pull request #1320 from runcom/hooks-from-ctr-annotations
Hooks from ctr annotations
2018-02-12 20:35:52 -08:00
Mrunal Patel
7310839369
Merge pull request #1321 from runcom/bump-runtime-tools-cap-fix
vendor: bump runtime-tools to fix caps drop handling
2018-02-12 12:15:40 -08:00
Mrunal Patel
33e2f82d61
Merge pull request #1322 from runcom/var-tmp-rw
system container: add /var/tmp as RW
2018-02-12 10:28:01 -08:00
Antonio Murdaca
6582f9dd16
system container: add /var/tmp as RW
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2018-02-12 17:11:37 +01:00
Antonio Murdaca
c718f15d47
vendor: bump runtime-tools to fix caps drop handling
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2018-02-12 15:15:25 +01:00
Antonio Murdaca
a12990d4a0
container_status: expose LogPath as requested by the CRI
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2018-02-12 11:38:27 +01:00
Antonio Murdaca
e5fc48a3ca
sandbox: restore portMappings on restart
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2018-02-12 11:32:17 +01:00
Antonio Murdaca
c3f1e7aec2
container_create: read ctr annotations for hooks first
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2018-02-12 11:32:15 +01:00
Mrunal Patel
ebb88f9a67
Merge pull request #1306 from runcom/fix-log-path-restore
sandbox: fix sandbox logPath when crio restarts
2018-02-10 11:23:14 -08:00
Mrunal Patel
fe6efe0aff
Merge pull request #1318 from runcom/release-1.9.3toml
releases: add v1.9.3
2018-02-10 11:22:53 -08:00
Antonio Murdaca
7d46b33439
releases: add v1.9.3
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2018-02-10 19:18:44 +01:00
Mrunal Patel
5b8d965d43
Merge pull request #1309 from runcom/1.9.2-release-file
releases: add v1.9.2,v1.8.5,v1.0.9 toml
2018-02-09 09:08:51 -08:00
Antonio Murdaca
a0157078ad
sandbox: fix sandbox logPath when crio restarts
We weren't setting the logPath of the sandbox when restoring sandboxes
and containers upon a crio restarts. That means that if you restart
CRI-O you get sandboxes with empty logPath. That means that when you're
starting a container in a restored sandbox you get a relative logPath
for the container:

sandboxLogPath: "/var/something"
- restore
sandboxLogPath: ""
- create container foo
containerLogPath: "foo_attempt.log"

With this patch we actually get an absolute path (which is correct):

sandboxLogPath: "/var/something"
- restore
sandboxLogPath: "/var/something"
- create container foo
containerLogPath: "/var/something/foo_attempt.log"

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2018-02-09 15:54:47 +01:00
Antonio Murdaca
38e69fdbee
releases: add v1.9.2,v1.8.5,v1.0.9 toml
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2018-02-09 11:05:33 +01:00
Mrunal Patel
28997fe4cd
Merge pull request #1304 from runcom/fix-ami-build
contrib: test: fix runc build on AMIs
2018-02-08 13:07:08 -08:00
Antonio Murdaca
0b26d6452d
Merge pull request #1307 from giuseppe/addtl-mounts
system container: add $ADDTL_MOUNTS
2018-02-08 16:31:56 +01:00
Giuseppe Scrivano
64e25b8c1b
syscontainers, rhel: add ADDTL_MOUNTS
This allows to accept additional mounts during creation.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2018-02-07 17:38:39 +01:00
Giuseppe Scrivano
332aeee1b9
syscontainers, fedora: add ADDTL_MOUNTS
This allows to accept additional mounts during creation.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2018-02-07 17:38:32 +01:00
Giuseppe Scrivano
caf5615704
syscontainers, centos: add ADDTL_MOUNTS
This allows to accept additional mounts during creation.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2018-02-07 17:38:25 +01:00
Antonio Murdaca
3c859c0d60
contrib: test: fix runc build on AMIs
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2018-02-06 21:26:47 +01:00
Mrunal Patel
eaf5b08c8f
Merge pull request #1303 from rhatdan/no-new-keyring
Fix typo in options defition
2018-02-06 06:48:04 -08:00
Daniel J Walsh
a19ab49f44 Fix typo in options defition
The options should be no-new-keyring, mistakenly written as no-new_keyring.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2018-02-06 08:14:40 -05:00
Daniel J Walsh
57637f890a
Merge pull request #1302 from rhatdan/no-new-keyring
Add no-new-keyring flag to conmon
2018-02-06 08:03:26 -05:00
Daniel J Walsh
680e62a459 Add no-new-keyring flag to conmon
We want to pass the no-new-keyring through conmon down to the OCI
Runtime.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2018-02-05 16:51:35 -05:00
Daniel J Walsh
5345c6299a
Merge pull request #1283 from lyft/imagefs-stats-1.9
Implement the stats for the image_fs_info command
2018-02-05 09:06:31 -05:00
Daniel J Walsh
0d56044bd8
Merge pull request #1299 from mrunalp/update_cmux
Update cmux to 0.1.4
2018-02-04 07:38:31 -05:00
Mrunal Patel
8e14be6441
Merge pull request #1298 from giuseppe/e2e-not-runc
e2e: allow to use runc from the system
2018-02-03 18:04:23 -08:00
Mrunal Patel
b8d2482b26
Merge pull request #1235 from rhatdan/hooks
Report an warning when no stages are defined for a hook
2018-02-03 09:51:59 -08:00