summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Add test for generate kube with volumesPeter Hunt2019-07-02
| | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
* Deduplicate volumesPeter Hunt2019-07-02
| | | | | | for containers that share volumes, so the pod section doesn't list copies Signed-off-by: Peter Hunt <pehunt@redhat.com>
* Pass along volumes to pod yamlPeter Hunt2019-07-01
| | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
* Configure container volumes for generate kubePeter Hunt2019-07-01
| | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
* Merge pull request #3324 from marcov/detach-keys-configurableOpenShift Merge Robot2019-07-01
|\ | | | | libpod: specify a detach keys sequence in libpod.conf
| * libpod: fix hang on container start and attachMarco Vedovati2019-06-26
| | | | | | | | | | | | | | | | | | | | When a container is attached upon start, the WaitGroup counter may never be decremented if an error is raised before start, causing the caller to hang. Synchronize with the start & attach goroutine using a channel, to be able to detect failures before start. Signed-off-by: Marco Vedovati <mvedovati@suse.com>
| * podman: clarify the format of --detach-keys argumentMarco Vedovati2019-06-26
| | | | | | | | Signed-off-by: Marco Vedovati <mvedovati@suse.com>
| * libpod: specify a detach keys sequence in libpod.confMarco Vedovati2019-06-26
| | | | | | | | | | | | Add the ability of specifying a detach keys sequence in libpod.conf Signed-off-by: Marco Vedovati <mvedovati@suse.com>
* | Merge pull request #3422 from nalind/no-layer-imagesOpenShift Merge Robot2019-06-28
|\ \ | | | | | | Handle images which contain no layers
| * | Handle images which contain no layersNalin Dahyabhai2019-06-26
| | | | | | | | | | | | | | | | | | | | | This fixes some of our handling of images which have no layers, i.e., those whose TopLayer is set to an empty value. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
| * | Add tests that we don't hit errors with layerless imagesNalin Dahyabhai2019-06-26
| | | | | | | | | | | | Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
* | | Merge pull request #3451 from ashley-cui/unmountOpenShift Merge Robot2019-06-28
|\ \ \ | | | | | | | | Remove umount command from remote client.
| * | | Remove umount command from remote client.Ashley Cui2019-06-27
| | | | | | | | | | | | | | | | | | | | | | | | Since there is no mount command, it does not make sense to have umount. Signed-off-by: Ashley Cui <ashleycui16@gmail.com>
* | | | Merge pull request #3397 from giuseppe/fix-rebootOpenShift Merge Robot2019-06-28
|\ \ \ \ | | | | | | | | | | rootless: enable linger if /run/user/UID not exists
| * | | | rootless: enable linger if /run/user/UID not existsGiuseppe Scrivano2019-06-27
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | at least on Fedora 30 it creates the /run/user/UID directory for the user logged in via ssh. This needs to be done very early so that every other check when we create the default configuration file will point to the correct location. Closes: https://github.com/containers/libpod/issues/3410 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #3448 from vrothberg/turnoffmodOpenShift Merge Robot2019-06-28
|\ \ \ \ | | | | | | | | | | Makefile: set GO111MODULE=off
| * | | | Makefile: set GO111MODULE=offValentin Rothberg2019-06-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turn of go modules to avoid breaking build environments to accidentally try pulling the dependencies instead of using the ./vendor directory. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | Merge pull request #3452 from QazerLab/bugfix/pause-sigtermOpenShift Merge Robot2019-06-28
|\ \ \ \ \ | |_|/ / / |/| | | | Exclude SIGTERM from blocked signals for pause process.
| * | | | Exclude SIGTERM from blocked signals for pause process.Danila Kiver2019-06-28
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently pause process blocks all signals which may cause its termination, including SIGTERM. This behavior hangs init(1) during system shutdown, until pause process gets SIGKILLed after some grace period. To avoid this hanging, SIGTERM is excluded from list of blocked signals. Fixes #3440 Signed-off-by: Danila Kiver <danila.kiver@mail.ru>
* | | | Merge pull request #3442 from baude/removelibpodfrommainphase2OpenShift Merge Robot2019-06-27
|\ \ \ \ | | | | | | | | | | libpod removal from main (phase 2)
| * | | | libpod removal from main (phase 2)baude2019-06-27
| | |/ / | |/| | | | | | | | | | | | | | | | | | this is phase 2 for the removal of libpod from main. Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #3446 from giuseppe/fix-rootless-confOpenShift Merge Robot2019-06-27
|\ \ \ \ | |_|/ / |/| | | rootless: use the correct conf file
| * | | runtime: do not attempt to use global conf fileGiuseppe Scrivano2019-06-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we had a regression where the rootless user tried to use the global configuration file. We should not try to use the global configuration when running in rootless but only cherry-pick some settings from there when creating the file for the first time. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | runtime: use GetRootlessUID() to get rootless uidGiuseppe Scrivano2019-06-27
|/ / / | | | | | | | | | | | | | | | otherwise it won't work in a user namespace. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #3193 from cevich/check_imageOpenShift Merge Robot2019-06-27
|\ \ \ | | | | | | | | Cirrus: More tests to verify cache_images
| * | | Cirrus: More tests to verify cache_imagesChris Evich2019-06-25
| | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | Merge pull request #3429 from cevich/strip_crio_conmonOpenShift Merge Robot2019-06-27
|\ \ \ \ | | | | | | | | | | Remove refs to crio/conmon
| * | | | Remove refs to crio/conmonChris Evich2019-06-26
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conmon has moved out of cri-o and into it's own dedicated repository. This commit updates configuration and definitions which referenced the old cri-o based paths. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | Merge pull request #3420 from ashley-cui/remoteconfOpenShift Merge Robot2019-06-26
|\ \ \ \ | |_|/ / |/| | | Fix crash for when remote host IP or Username is not set in conf file…
| * | | Fix crash for when remote host IP or Username is not set in conf file & conf ↵Ashley Cui2019-06-25
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | file exists. When Host IP is not set in podman-remote.conf, error is printed out. When Username is not set in podman-remote.conf, default username is used. Signed-off-by: Ashley Cui <ashleycui16@gmail.com>
* | | Merge pull request #3374 from giuseppe/cgroupsOpenShift Merge Robot2019-06-26
|\ \ \ | | | | | | | | cgroups: add initial support for cgroups v2
| * | | stats: fix cgroup path for rootless containersGiuseppe Scrivano2019-06-26
| | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | pkg, cgroups: add initial support for cgroup v2Giuseppe Scrivano2019-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an initial implementation of cgroup v2 support for pkg/cgroups. It currently works with crun, with this patch: https://github.com/giuseppe/crun/pull/49). It adds the pieces for: - set PID limit to 1 - retrieve stats so that "podman stats" work. the only missing part is the support for reading per CPU stats (that is cpuacct.usage_percpu on cgroup v1), so for now it always returns an empty result. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | util: drop IsCgroup2UnifiedMode and use it from cgroupsGiuseppe Scrivano2019-06-26
| | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | vendor: drop github.com/containerd/cgroupsGiuseppe Scrivano2019-06-26
| | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | libpod: use pkg/cgroups instead of containerd/cgroupsGiuseppe Scrivano2019-06-26
| | | | | | | | | | | | | | | | | | | | | | | | use the new implementation for dealing with cgroups. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | pkg: new package cgroupsGiuseppe Scrivano2019-06-26
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | provide a package for managing cgroups. This is not supposed to be a complete implementation with all the features supported by cgroups, but it is a minimal implementation designed around what libpod needs and it is currently using. For example, it is currently possible to Apply only the pids limit, as it is used by libpod for stopping containers, any other Apply will just fail. The main goal here is to have a minimal library where we have full control, so we can start playing with cgroup v2. When the need arises, we can add more features. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #3435 from mheon/fix_tmpfs_optionsOpenShift Merge Robot2019-06-26
|\ \ \ | | | | | | | | Fix parsing of the --tmpfs option
| * | | Fix parsing of the --tmpfs optionMatthew Heon2019-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With StringSlice, we're seeing individual options added and parsed separately, so `tmpfs:nosuid,nodev` turns into three tmpfs mounts passed into pkg/sec (tmpfs:, nosuid, nodev). Swap to StringArray to tell cobra this can't be split on commas. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | Merge pull request #3438 from openSUSE/moduleOpenShift Merge Robot2019-06-26
|\ \ \ \ | |_|/ / |/| | | Remove unnecessary blackfriday dependency
| * | | Remove unnecessary blackfriday dependencySascha Grunert2019-06-26
|/ / / | | | | | | | | | | | | | | | | | | | | | The version of blackfriday is causing that we cannot build go-md2man any more within CRI-O. This commit removes the dependency since is not needed at all. Signed-off-by: Sascha Grunert <sgrunert@suse.com>
* | | Merge pull request #3419 from baude/removelibpodfrommainphase1OpenShift Merge Robot2019-06-26
|\ \ \ | | | | | | | | remove libpod from main
| * | | remove libpod from mainbaude2019-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the compilation demands of having libpod in main is a burden for the remote client compilations. to combat this, we should move the use of libpod structs, vars, constants, and functions into the adapter code where it will only be compiled by the local client. this should result in cleaner code organization and smaller binaries. it should also help if we ever need to compile the remote client on non-Linux operating systems natively (not cross-compiled). Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #3430 from mheon/bump-1.4.3OpenShift Merge Robot2019-06-26
|\ \ \ \ | |_|/ / |/| | | Bump to v1.4.3
| * | | Bump gitvalidation epochMatthew Heon2019-06-25
| | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | | Bump to v1.4.4-devMatthew Heon2019-06-25
| | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | | Bump to v1.4.3v1.4.3Matthew Heon2019-06-25
| | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | Merge pull request #3428 from mheon/release_notes_1.4.3OpenShift Merge Robot2019-06-25
|\ \ \ \ | |/ / / |/| | | Update release notes for 1.4.3 release
| * | | Update release notes for 1.4.3 releaseMatthew Heon2019-06-25
| | |/ | |/| | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | Merge pull request #3418 from vrothberg/go-modulesOpenShift Merge Robot2019-06-25
|\ \ \ | | | | | | | | update dependencies