Commit Graph

9025 Commits

Author SHA1 Message Date
zhangguanzhang
a4ffed91da fix APIv2 pods top of non-exist pod gets two response value
Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
2020-09-09 18:50:17 +08:00
OpenShift Merge Robot
3352e8b0e6 Merge pull request #7507 from containers/dependabot/go_modules/github.com/google/uuid-1.1.2
Bump github.com/google/uuid from 1.1.1 to 1.1.2
2020-08-31 09:45:26 -04:00
OpenShift Merge Robot
24a335b0ae Merge pull request #7494 from haircommander/play-kube-socket
play kube: handle Socket HostPath type
2020-08-31 09:37:35 -04:00
dependabot-preview[bot]
cf147050d4 Bump github.com/google/uuid from 1.1.1 to 1.1.2
Bumps [github.com/google/uuid](https://github.com/google/uuid) from 1.1.1 to 1.1.2.
- [Release notes](https://github.com/google/uuid/releases)
- [Commits](https://github.com/google/uuid/compare/v1.1.1...v1.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-31 05:13:54 -04:00
OpenShift Merge Robot
575b3a3d8a Merge pull request #7132 from containers/dependabot/go_modules/github.com/containers/conmon-2.0.20incompatible
Bump github.com/containers/conmon from 2.0.19+incompatible to 2.0.20+incompatible
2020-08-29 05:01:15 -04:00
Peter Hunt
83531904da play kube: handle Socket HostPath type
as well as add test cases for it and the other HostPath types we currently support

Signed-off-by: Peter Hunt <pehunt@redhat.com>
2020-08-28 17:18:03 -04:00
OpenShift Merge Robot
4e3ea01243 Merge pull request #7469 from zhangguanzhang/generate-kube-with-ExtraHosts
fix podman generate kube with HostAliases
2020-08-28 16:06:11 -04:00
OpenShift Merge Robot
97780a110b Merge pull request #7436 from rhatdan/variant
Add support for image pull overrides
2020-08-28 16:02:56 -04:00
OpenShift Merge Robot
c069e0bad9 Merge pull request #7481 from Luap99/keep-conf
Don't remove config files with podman system reset
2020-08-28 15:59:47 -04:00
OpenShift Merge Robot
1f9b854c23 Merge pull request #7431 from mheon/update_master_206
[CI:DOCS] Update Master to reflect v2.0.5 release
2020-08-28 15:03:31 -04:00
OpenShift Merge Robot
a5085b06a5 Merge pull request #7448 from baude/issue7444
fix panic when checking len on nil object
2020-08-28 14:15:49 -04:00
OpenShift Merge Robot
522a32f827 Merge pull request #7355 from rhatdan/env
Use environment from containers.conf
2020-08-28 11:24:37 -04:00
Matthew Heon
8cf23655df Small tweaks to readme scope section
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2020-08-28 11:18:10 -04:00
OpenShift Merge Robot
bd43f81c0f Merge pull request #7429 from lsm5/localunit-test-fix
delete prior /dev/shm/*
2020-08-28 11:11:41 -04:00
Matthew Heon
d981440d20 Update Master to reflect v2.0.5 release
Adds release notes and updates current version in README.

Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-08-28 11:11:17 -04:00
OpenShift Merge Robot
0640cc7921 Merge pull request #7428 from mheon/apiv2_container_pod_errors
Ensure pod REST API endpoints include ctr errors
2020-08-28 09:59:37 -04:00
Brent Baude
a6f85861df fix panic when checking len on nil object
issue #7444 describes a problem where an image does not have a manifest file and cannot be processed by our library correctly.  the origin of the panic is because we are checking the len of a nil object's attribute.  this is a temporary fix to protect from the panic in the future.  the origin of the problem is more interesting and requires more work when the code author returns from pto.

Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-08-28 08:54:22 -05:00
Daniel J Walsh
3c6603a2f8 Add support for variant when pulling images
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-28 09:36:11 -04:00
Daniel J Walsh
f49b98c610 Document override-arch and override-os
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-28 09:35:13 -04:00
OpenShift Merge Robot
e3edb7ba9d Merge pull request #7416 from Luap99/fix-swagger-doc
[CI:DOCS] fix swagger api docs
2020-08-28 09:28:51 -04:00
Lokesh Mandvekar
8a26134949 Delete prior /dev/shm/*
Currently, subsequent runs of `make localunit` fail and complain about
prior existing /dev/shm/libpod_test and /dev/shm/test1.

This commit deletes these files if existing already, prior to running
the tests.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2020-08-28 09:26:33 -04:00
Paul Holzinger
b84ddc2535 Don't remove config files with podman system reset
Check if storage.conf exists and display a message that
this file should be removed if it has not been modified.

Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
2020-08-28 15:22:03 +02:00
OpenShift Merge Robot
cf6d9fe4e6 Merge pull request #7464 from edsantiago/bats
BATS: fix corner case in --userns=keep-id test
2020-08-28 09:19:29 -04:00
OpenShift Merge Robot
b1d6ea26ff Merge pull request #7471 from containers/dependabot/go_modules/github.com/containernetworking/plugins-0.8.7
Bump github.com/containernetworking/plugins from 0.8.6 to 0.8.7
2020-08-28 08:36:12 -04:00
OpenShift Merge Robot
1369f90a05 Merge pull request #7449 from openSUSE/log-level
Fix log level case regression
2020-08-28 08:33:01 -04:00
OpenShift Merge Robot
e28a187a53 Merge pull request #7427 from mheon/update_error_messages
Fix up some error messages
2020-08-28 08:30:01 -04:00
OpenShift Merge Robot
ad80e9a10a Merge pull request #7421 from containers/dependabot/go_modules/github.com/gorilla/schema-1.2.0
Bump github.com/gorilla/schema from 1.1.0 to 1.2.0
2020-08-28 08:27:00 -04:00
OpenShift Merge Robot
74bdf52c40 Merge pull request #7472 from containers/dependabot/go_modules/k8s.io/apimachinery-0.19.0
Bump k8s.io/apimachinery from 0.18.8 to 0.19.0
2020-08-28 08:23:59 -04:00
dependabot-preview[bot]
34ae9865bb Bump github.com/containernetworking/plugins from 0.8.6 to 0.8.7
Bumps [github.com/containernetworking/plugins](https://github.com/containernetworking/plugins) from 0.8.6 to 0.8.7.
- [Release notes](https://github.com/containernetworking/plugins/releases)
- [Commits](https://github.com/containernetworking/plugins/compare/v0.8.6...v0.8.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-28 06:13:09 -04:00
Sascha Grunert
d02cb2ddc0 Fix log level case regression
With previous versions of Podman (like v1.9.2) it was always possible to
specify the log level in any case, for example `INFO`. This behavior has
silently changed, where the `--log-level` flag only accepts lower case
levels. This commit re-enables the old behavior and adds an e2e test for
it.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-08-28 12:09:08 +02:00
Daniel J Walsh
60fe96118f Use environment from containers.conf
podman needs to use the environment settings in containers.conf
when setting up the containers.

Also host environment variables should be relative to server side
not the client.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-28 06:06:08 -04:00
Daniel J Walsh
80472c0184 Bump github.com/containers/conmon
Bumps [github.com/containers/conmon](https://github.com/containers/conmon) from 2.0.19+incompatible to 2.0.20+incompatible.
- [Release notes](https://github.com/containers/conmon/releases)
- [Changelog](https://github.com/containers/conmon/blob/master/changelog.txt)
- [Commits](containers/conmon@v2.0.19...v2.0.20)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-28 06:04:09 -04:00
dependabot-preview[bot]
f5d151a234 Bump github.com/gorilla/schema from 1.1.0 to 1.2.0
Bumps [github.com/gorilla/schema](https://github.com/gorilla/schema) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/gorilla/schema/releases)
- [Commits](https://github.com/gorilla/schema/compare/v1.1.0...v1.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-28 05:56:49 -04:00
OpenShift Merge Robot
061c93f701 Merge pull request #7430 from mheon/update_cstorage_master
Update c/storage to v1.23.2
2020-08-28 05:56:24 -04:00
OpenShift Merge Robot
f763e9c2c0 Merge pull request #7455 from giuseppe/trim-init-command
abi: trim init command
2020-08-28 05:53:20 -04:00
dependabot-preview[bot]
90a86cad3a Bump k8s.io/apimachinery from 0.18.8 to 0.19.0
Bumps [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) from 0.18.8 to 0.19.0.
- [Release notes](https://github.com/kubernetes/apimachinery/releases)
- [Commits](https://github.com/kubernetes/apimachinery/compare/v0.18.8...v0.19.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-28 05:45:35 -04:00
OpenShift Merge Robot
d6b13d8a09 Merge pull request #7480 from openSUSE/containers-common
Switch to containers/common for seccomp
2020-08-28 05:37:44 -04:00
OpenShift Merge Robot
a38e77bbb5 Merge pull request #7482 from Luap99/libpod-podman
[CI:DOCS] Switch more references from libpod to podman
2020-08-28 05:31:42 -04:00
Giuseppe Scrivano
f32eec6ba6 abi: trim init command
without it the systemd detection fails.

Closes: https://github.com/containers/podman/issues/7441

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-08-28 10:11:27 +02:00
Paul Holzinger
116300f968 [CI:DOCS] Switch more references from libpod to podman
Switch the libpod references to podman in the CONTRIBUTING.md.
Update the cirrus-ci link so we can get a green build again :)

Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
2020-08-27 22:36:35 +02:00
Sascha Grunert
98ead36531 Switch to containers/common for seccomp
The seccomp/containers-golang library is not maintained any more and we
should stick to containers/common.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-08-27 21:14:59 +02:00
Matthew Heon
2ac37f10b4 Fix up some error messages
We have a lot of 'cannot stat %s' errors in our codebase. These
are terrible and confusing and utterly useless without context.
Add some context to a few of them so we actually know what part
of the code is failing.

Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-08-27 15:05:12 -04:00
Matthew Heon
580c39fea8 Ensure pod REST API endpoints include ctr errors
The APIv2 pod endpoints that operate on multiple containers, such
as Start, Kill, Pause, Unpause, do not report errors encountered
by individual containers, because they incorrectly assume that
any error is fatal. The documentation for the Libpod API calls
notes, however, that ErrPodPartialFail will *always* be returned
if any container failed; so we need to ignore that error and
continue to collating and returning container errors.

Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-08-27 15:04:22 -04:00
Matthew Heon
1a30bcde30 Update c/storage to v1.23.2
Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-08-27 15:03:01 -04:00
Ed Santiago
4060b77157 BATS: fix corner case in --userns=keep-id test
The test that does 'adduser' in a keep-id container had a
really dumb bug: if the user running the test has UID 1000,
then podman itself (via keep-id) will add the "1000" passwd
entry, and the in-container "adduser" will allocate 1001,
making our test fail. This triggered in f31/f32 podman gating
tests, but (?!?) never in rawhide gating tests.

Solution: explicitly feed a UID to adduser. Make sure that
it's not the same as the UID of the current user.

Also (unrelated): fix a ridiculous "run mkdir || die". At
the time I wrote that I probably had no idea how BATS works.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2020-08-27 12:58:13 -06:00
Ed Santiago
72c5b35ea5 Merge pull request #7458 from Luap99/fix-remote-docs
[CI:DOCS] Update podman-remote docs
2020-08-27 12:57:51 -06:00
Ed Santiago
b13af4537f Merge pull request #7451 from mheon/fix_7195
Send HTTP Hijack headers after successful attach
2020-08-27 12:57:33 -06:00
Paul Holzinger
7dce7a64ca [CI:DOCS] Update podman-remote docs
Add support for multi level subcommands.
e.g. podman system connection.

Update the flags and add note for containers.conf.

Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
2020-08-27 20:03:06 +02:00
Matthew Heon
2ea9dac5e1 Send HTTP Hijack headers after successful attach
Our previous flow was to perform a hijack before passing a
connection into Libpod, and then Libpod would attach to the
container's attach socket and begin forwarding traffic.

A problem emerges: we write the attach header as soon as the
attach complete. As soon as we write the header, the client
assumes that all is ready, and sends a Start request. This Start
may be processed *before* we successfully finish attaching,
causing us to lose output.

The solution is to handle hijacking inside Libpod. Unfortunately,
this requires a downright extensive refactor of the Attach and
HTTP Exec StartAndAttach code. I think the result is an
improvement in some places (a lot more errors will be handled
with a proper HTTP error code, before the hijack occurs) but
other parts, like the relocation of printing container logs, are
just *bad*. Still, we need this fixed now to get CI back into
good shape...

Fixes #7195

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2020-08-27 12:50:22 -04:00
Daniel J Walsh
7d3cadcc54 Merge pull request #7457 from ashley-cui/macdocs
[CI:DOCS] Making docs build on mac
2020-08-27 08:11:33 -04:00