Commit graph

1538 commits

Author SHA1 Message Date
Antonio Murdaca
49bdd59406
*: initial wire in of crictl from cri-tools
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-08-22 20:14:49 +02:00
Antonio Murdaca
8088d7a1e2
*: fix lint issues
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-08-22 17:32:18 +02:00
Antonio Murdaca
d56bf090ce
*: update kube vendor to v1.7.4
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-08-22 17:32:14 +02:00
Daniel J Walsh
c67859731f Merge pull request #778 from nalind/kpod-shutdown
kpod: shut down the storage library at exit
2017-08-22 07:02:36 -04:00
Nalin Dahyabhai
6f27dddf93 kpod images: output multiple image names
Output multiple image names, if we have more than one.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-08-21 11:27:45 -04:00
Nalin Dahyabhai
178c1e9ccb kpod.bats: correct syntax errors
Correct some syntax errors in kpod.bats, ensure that it always checks
the exit status of "kpod rmi" commands, correct the order of options
when calling "kpod inspect", and test for string equality correctly.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-08-21 11:27:45 -04:00
Nalin Dahyabhai
ef8df00e6a kpod: shut down the storage library before exiting
Before exiting, have kpod shut down the storage library if it can.  This
should keep us from leaving mountpoints for the root (for non-vfs cases)
and run directory (with newer containers/storage) busy when testing kpod.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-08-21 11:27:44 -04:00
Mrunal Patel
3a2518ce33 Merge pull request #782 from rhatdan/readme
Update web site documentation for latest kpod
2017-08-20 09:32:45 -07:00
Daniel J Walsh
33201aff56 Update web site documentation for latest kpod
Add missing commands to transfer page and add
links for demos to README.md page.

Fixup bash completions for new commands.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2017-08-20 06:56:27 -04:00
Daniel J Walsh
c0f3e02bae Merge pull request #765 from baude/format
Format
2017-08-19 04:10:40 -04:00
baude
78c6151519 Modify kpod diff --json to --format json
We want all kpod subcommands to use the formats code to output
formats like json.  Altering kpod diff --json to kpod diff --format json
like the kpod images command.

Signed-off-by: baude <bbaude@redhat.com>
2017-08-18 21:05:58 -05:00
Mrunal Patel
c9d27ad111 Merge pull request #779 from nalind/kpod-debug-flag
kpod: make --debug work
2017-08-18 16:23:32 -07:00
Mrunal Patel
4e9be043a8 Merge pull request #757 from mheon/libpod
Add skeleton of new libpod API
2017-08-18 15:32:50 -07:00
Mrunal Patel
959aab4fd5 Merge pull request #766 from mrunalp/ctr_status_fixes
Container status fixes
2017-08-18 07:39:56 -07:00
Mrunal Patel
701e7ff63f container_status: Get latest container status if exit code is -1
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2017-08-17 21:13:39 -07:00
Mrunal Patel
37edc50c1d oci: Check if process exists before trying to kill it
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2017-08-17 19:42:50 -07:00
Mrunal Patel
908b3fcbbc Add container/sandbox id to response debugs
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2017-08-17 19:42:43 -07:00
Nalin Dahyabhai
05985ff2f7 kpod: make --debug work
The --debug flag is a global CLI flag, so parse it like one.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-08-17 15:27:04 -04:00
Mrunal Patel
cab0860257 sandbox_remove: Don't stop containers if sandbox is stopped already
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2017-08-17 11:28:18 -07:00
Mrunal Patel
f82fe5691a Merge pull request #706 from 14rcole/kpod-stats
Kpod stats
2017-08-17 11:24:38 -07:00
Mrunal Patel
a5591d34b7 Merge pull request #772 from 14rcole/kpod-rename
implement kpod rename
2017-08-17 10:04:16 -07:00
Mrunal Patel
8d58f227cd sandbox_stop: Store stopped status
This allows us to respond to kubelet quickly if the
pod was already stopped successfully earlier.

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-08-17 09:01:07 -07:00
Mrunal Patel
ce17c5214d sandbox: Reduce number of calls to UpdateStatus
Also, we distinguish between container and a pod infra
container in the exit monitor as pod infra containers
aren't stored in the main container index.

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-08-17 09:01:07 -07:00
Mrunal Patel
ea4b6fa55d container: Reduce number of calls to UpdateStatus
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-08-17 09:01:07 -07:00
Mrunal Patel
3f1b42ee9e Return container mounts in status from stored list
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-08-17 09:01:07 -07:00
Mrunal Patel
fa317b41fd Add volumes to container object at container create time
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-08-17 09:01:07 -07:00
Mrunal Patel
5ab6ec3046 oci: Add volumes field to Container
We add a ContainerVolume struct and store a list of volumes
in the Container object for quick retrieval.

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-08-17 09:01:07 -07:00
Mrunal Patel
bfcebcdb00 Store imageName and imageRef for containers
We calculate these values at container creation time and store
them in the container object as they are requested during container
status. This avoids re-calculation and speeds up container status.

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-08-17 09:01:07 -07:00
Mrunal Patel
1cf5f8ee3b container: Don't call OCI runtime status
We get notified of container exits by inotify so we already
have updated status of the container in memory state.

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-08-17 09:01:07 -07:00
Matthew Heon
d6eb943075 Move some image functions around
Signed-off-by: Matthew Heon <mheon@redhat.com>
2017-08-17 11:47:10 -04:00
Ryan Cole
ceeed6c32e add kpod stats function
Signed-off-by: Ryan Cole <rcyoalne@gmail.com>
2017-08-17 11:34:10 -04:00
Ryan Cole
dda5511a2b Add libcontainer dependencies to vendor.conf
Signed-off-by: Ryan Cole <rcyoalne@gmail.com>
2017-08-17 11:33:51 -04:00
Ryan Cole
65eec38754 Vendor in files for runc/libcontainer
vndr was previously removing .go files in runc/libcontainer since they weren't used anywhere
in cri-o, but kpod stats will use them

Signed-off-by: Ryan Cole <rcyoalne@gmail.com>
2017-08-17 11:33:51 -04:00
Mrunal Patel
efc29e3dd2 Merge pull request #774 from rhatdan/rbind
CRI-O default bind mounts to "rbind, rprivate" to match docker
2017-08-17 08:30:25 -07:00
Matthew Heon
6be525b9f0 Modify container exec and attach, add image import/export
Signed-off-by: Matthew Heon <mheon@redhat.com>
2017-08-17 10:43:24 -04:00
Matthew Heon
bdddb3d36b Add preliminary libpod image API
Signed-off-by: Matthew Heon <mheon@redhat.com>
2017-08-17 10:43:24 -04:00
Matthew Heon
9d56fd8443 Add skeleton of new libpod API
Signed-off-by: Matthew Heon <mheon@redhat.com>
2017-08-17 10:43:24 -04:00
Mrunal Patel
8c496a101a Merge pull request #773 from 14rcole/kpod-format-table
Kpod format
2017-08-17 07:41:09 -07:00
Ryan Cole
1eb21f8e15 implement kpod rename
rename a container

Signed-off-by: Ryan Cole <rcyoalne@gmail.com>
2017-08-17 09:00:41 -04:00
Ryan Cole
ba07bfb932 Make kpod images use text/template by default
Signed-off-by: Ryan Cole <rcyoalne@gmail.com>
2017-08-17 08:32:38 -04:00
Ryan Cole
08c3d241a4 Add format functions
Add functions to go templates such as truncating a field.  Also add
the table keyword, which, if placed at the beginning of a format string,
adds headers to the output

Signed-off-by: Ryan Cole <rcyoalne@gmail.com>
2017-08-16 15:45:13 -04:00
Mrunal Patel
6ca462a3b6 Merge pull request #718 from 14rcole/kpod-logs
Kpod logs
2017-08-16 11:47:34 -07:00
Mrunal Patel
96735dac2f Merge pull request #775 from TomSweeneyRedHat/dev/tsweeney/docfix1
Number of minor touch ups to Code of Conduct
2017-08-16 11:14:22 -07:00
TomSweeneyRedHat
85f4f09e52 Number of minor touch ups to Code of Conduct
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2017-08-16 11:34:58 -04:00
Daniel J Walsh
50ad19148d CRI-O default bind mounts to "rbind, rprivate" to match docker
Containers running in kubernetes currently do not specify options
for mount propagation and whether to bind or rbind the mount point.
Since docker defaults to bind and rbind, we should match their
behavious, since this is what admins expect

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2017-08-16 11:16:39 -04:00
Ryan Cole
07572e85f5 Add kpod logs command
Signed-off-by: Ryan Cole <rcyoalne@gmail.com>
2017-08-16 08:55:23 -04:00
Mrunal Patel
85b4aedacb Merge pull request #770 from umohnani8/kpod_load
Fix 'kpod load' nil issue raised by QE
2017-08-15 19:04:15 -07:00
umohnani8
9f349528dc Fix 'kpod load' nil issue raised by QE
When an image is saved using the digest, the repotag saved is null causing load to break
Using the hex form of the image digest to save the image when the repotag is null
This saves the image in containers-storage without a name or tag as "<none>"

Signed-off-by: umohnani8 <umohnani@redhat.com>
2017-08-15 14:23:11 -04:00
Mrunal Patel
a69631c1bd Merge pull request #769 from rhatdan/debug
More cleanups of main man page kpod-1.md and README.md
2017-08-15 10:42:56 -07:00
Mrunal Patel
24476e9afb Merge pull request #761 from mbssaiakhil/patch-3
Fix Typo in cri-o Tutorial
2017-08-15 09:52:24 -07:00