13987 Commits

Author SHA1 Message Date
e4c613e420 Merge pull request #12805 from rhatdan/machine
Pretty Print output of podman machine ls --format json
2022-01-11 10:21:39 -05:00
f04465bfe6 fix host.containers.internal entry for macvlan networks
For ip/macvlan networks we cannot use the gateway as address for this
hostname. In this case the gateway is normally not on the host so we
just try to use a local ip instead.

[NO NEW TESTS NEEDED] We cannot run macvlan networks in CI.

Fixes #11351

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2022-01-11 16:10:01 +01:00
6d5ad9c110 It takes some time to start a VM
We are seeing some issues with users not understanding which VM they are
starting, and if the VM takes a long time to start, they do not know
where to look.

Moving the name to before the VM starts at least allows them to realize
they are starting the wrong VM.

[NO NEW TESTS NEEDED]

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-01-11 08:52:27 -05:00
c085fb3c97 Pretty Print output of podman machine ls --format json
Make JSON more prominent in podman machine ls --help and man page.

[NO NEW TESTS NEEDED]

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-01-11 06:36:45 -05:00
ed9ef59e7e Merge pull request #12780 from rhatdan/pod
Use the InfraImage defined in containers.conf
2022-01-11 00:25:09 +01:00
2790b5c69c Merge pull request #12793 from cevich/vmimg_update
Enable gitlab runner unit testing + Freshen VM images w/ crun-1.4-1
2022-01-10 23:13:09 +01:00
92cd152b53 Merge pull request #12792 from mheon/bump_400_rc1
Bump to v4.0.0-RC1
2022-01-10 22:15:10 +01:00
19a4759066 Use the InfraImage defined in containers.conf
Remove hard code use of the DefaultInfraImage and rely on
getting this from containers.conf.

Fixes: https://github.com/containers/podman/issues/12771

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-01-10 16:13:33 -05:00
f687f959e8 Merge pull request #12791 from edsantiago/bats
System tests: fix RHEL8 gating tests
2022-01-10 22:13:07 +01:00
799078216b Cirrus: Freshen VM images
Specifically, this brings in `crun 1.4-1` allowing removal of a
temporary workaround.  Ref:

https://github.com/containers/podman/pull/12759

Signed-off-by: Chris Evich <cevich@redhat.com>
2022-01-10 14:50:17 -05:00
0e4e5cf990 Revert "Cirrus: Temp. ignore gitlab task failures"
Ref: https://gitlab.com/gitlab-org/gitlab-runner/-/issues/28766

This reverts commit 8cb93ac1035b8966b03a87ea58366fe9f3fc7887.

Signed-off-by: Chris Evich <cevich@redhat.com>
2022-01-10 14:50:17 -05:00
a95c01e0e4 pkg: use PROXY_VARS from c/common
Signed-off-by: Aditya Rajan <arajan@redhat.com>
2022-01-11 00:46:10 +05:30
a8b02cf4bf ignition: add support from setting SSL_CERT_FILE
Podman often has to run behind an http/https proxy, often in corporate environments.
This proxy may or may not include SSL inspection capabilities, requiring a trusted SSL CA certificate to be added to a system's trust store.

Copy the file referred to by SSL_CERT_FILE on the host into the podman machine's OS trust store, overriding the built-in single-file trust store certificate.

Also set the `SSL_FILE_CERT` on remote machine

[NO NEW TESTS NEEDED]

Signed-off-by: Aditya Rajan <arajan@redhat.com>
2022-01-11 00:46:06 +05:30
5c363ff276 ignition: propogate HTTP proxy variables from host to remote
Podman often has to run behind an http/https proxy, often in corporate environments.
This proxy may or may not include SSL inspection capabilities, requiring a trusted SSL CA certificate to be added to a system's trust store.

Solve this by reading standard proxy variables (HTTP_PROXY HTTPS_PROXY NO_PROXY http_proxy https_proxy no_proxy) and injecting them into the machine at init.

[NO NEW TESTS NEEDED]

Signed-off-by: Aditya Rajan <arajan@redhat.com>
2022-01-11 00:45:54 +05:30
18785450ed Bump to v4.0.0-dev
Signed-off-by: Matthew Heon <mheon@redhat.com>
2022-01-10 14:15:38 -05:00
9d26c1abb5 Bump to v4.0.0-RC1
Signed-off-by: Matthew Heon <mheon@redhat.com>
v4.0.0-rc1
2022-01-10 14:15:09 -05:00
508f9b76ea System tests: fix RHEL8 gating tests
Add a fix for RHEL8 gating tests. This resolves yet another
journald/file events/logger mismatch bug.

Also, while I'm at it, more log cleanup: a recently-added test was
missing final rm/rmi, resulting in big red scary output in test logs.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-01-10 12:14:53 -07:00
87cd4b698c Merge pull request #12772 from rhatdan/pause
Remove dead RuntimeOption functions
2022-01-10 19:31:10 +01:00
8af574fdaa Merge pull request #12757 from umohnani8/cm
Don't add env if optional and not found
2022-01-10 18:53:08 +01:00
a957e8c5e2 Merge pull request #12786 from vrothberg/vendor-common
vendor c/common
2022-01-10 18:51:08 +01:00
b7380a7c36 vendor c/common
Also update the e2e pull test to account for the changes when pulling
from the dir transport.  Images pulled via the dir transport are not
tagged anymore; the path is not a reliable source.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2022-01-10 16:25:37 +01:00
7a839f7a74 Merge pull request #12787 from rhatdan/docker
Update docker cli message for case where user creates directory
2022-01-10 16:18:52 +01:00
01ba2531b3 Remove dead RuntimeOption functions
I don't see where these With Functions are used, so removing them to
clean up code.
WithDefaultInfra* functions screwed me up and confused me.

[NO NEW TESTS NEEDED]

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-01-10 09:37:55 -05:00
0933f6c0bd Update docker cli message for case where user creates directory
Check for any existing system object in docker script to clear warning message (Resolving PR comments)

[NO NEW TESTS NEEDED]

Signed-off-by: Stephen Person <stephen.person.12@cnu.edu>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-01-10 08:51:26 -05:00
b5b932f7ab Merge pull request #12783 from n1hility/wxs-fix
[NO TESTS NEEDED] Fix type-o in podman.wxs
2022-01-10 14:46:51 +01:00
4dc5a5b15d Don't add env if optional and not found
If the pod yaml has env from secret and condifg map but they are optional
and the secret cannot be found, don't add the env key as well
as the env value will not be found. Matches behavior with k8s.

Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
2022-01-10 05:51:19 -05:00
a8a3e8bc99 Fix type-o in podman.wxs
Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
2022-01-09 21:00:02 -06:00
6ed2c639ac Merge pull request #12773 from mhrivnak/fix-example-indentation
[CI:DOCS] fixes indentation of example pod yaml
2022-01-08 12:04:50 +01:00
37c0b27b6f [CI:DOCS] fixes indentation of example pod yaml
The example as previously shown would result in "Error: multi doc yaml
could not be split". The change here has been tested to work, and it
matches the example in the [kubernetes
docs](https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/#configure-all-key-value-pairs-in-a-configmap-as-container-environment-variables).

Signed-off-by: Michael Hrivnak <mhrivnak@hrivnak.org>
2022-01-07 19:54:25 -05:00
41934acc51 Merge pull request #12733 from rhatdan/copy
Set volume NeedsCopyUp to false iff data was copied up
2022-01-07 20:38:59 +01:00
0464011a8e Merge pull request #12767 from riyad/fix-storage-opt-double-decode
Prevent double decoding of storage options
2022-01-07 16:16:59 +01:00
7dada6d492 Prevent double decoding of storage options
[NO NEW TESTS NEEDED] see #11991

Signed-off-by: Riyad Preukschas <riyad@informatik.uni-bremen.de>
2022-01-07 14:48:29 +01:00
7dd7b983b6 Merge pull request #12764 from edsantiago/bats
Emergency system-test fixes
2022-01-07 13:19:51 +01:00
67dab9e360 Merge pull request #12726 from hikhvar/remove-superflous-pod-rename
Don't rename pod if container has the same name
2022-01-07 13:11:50 +01:00
f688908151 Emergency system-test fixes
Emergency fix to image-scp tests. DO NOT CREATE A USER!
These tests are run in all sorts of environments. We
do not have the right to vandalize a production system.

Also remove some misleading unneeded tests; and refactor a
little; and add a bunch of FIXMEs which will need to be
addressed later.

Also, super-low priority, add 'crun: ' to expected error
message in a run test (minor followup to #12758).

Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-01-06 15:54:01 -07:00
8a22384406 Merge pull request #12758 from rhatdan/runtime
add OCI Runtime name to errors
2022-01-06 23:42:09 +01:00
3ac1219cbc Merge pull request #12614 from baude/bz2028408
fix healthcheck timeouts and ut8 coercion
2022-01-06 23:36:09 +01:00
1941d45e32 add OCI Runtime name to errors
It would be easier to diagnose OCI runtime errors if the error actually
had the name of the OCI runtime that produced the error.

[NO NEW TESTS NEEDED]

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-01-06 16:21:02 -05:00
d627528192 Merge pull request #11454 from afbjorklund/virtfs-volumes
Implement virtfs volumes for podman machine
2022-01-06 21:04:12 +01:00
2a524fcaec fix healthcheck timeouts and ut8 coercion
this commit fixes two bugs and adds regression tests.

when getting healthcheck values from an image, if the image does not
have a timeout defined, this resulted in a 0 value for timeout.  The
default as described in the man pages is 30s.

when inspecting a container with a healthcheck command, a customer
observed that the &, <, and > characters were being converted into a
unicode escape value.  It turns out json marshalling will by default
coerce string values to ut8.

Fixes: bz2028408

Signed-off-by: Brent Baude <bbaude@redhat.com>
2022-01-06 13:56:54 -06:00
2fd6c2ee89 Merge pull request #11538 from mtrmac/http-credentials
Fix HTTP credentials passing
2022-01-06 16:50:12 +01:00
4191616cc5 Don't rename pod if container has the same name
We enforce the naming scheme "<podname>-<containername>" here [1].
Therefore we must not rename the pod in case of a naming conflict
between pod name and container name. Not renaming the pod increases the
usability for the user and easies scripting based on the name. Otherwise
a user must set some label to reliable find a pod after creation. Or
have to implement the renaming logic in the script.

[1] https://github.com/containers/podman/blob/main/pkg/specgen/generate/kube/kube.go#L140

Fixes #12722

Signed-off-by: Christoph Petrausch <chrobbert@gmail.com>
2022-01-06 16:48:20 +01:00
13f3fd2555 Set volume NeedsCopyUp to false iff data was copied up
Currently Docker copies up the first volume on a mountpoint with
data.

Fixes: https://github.com/containers/podman/issues/12714

Also added NeedsCopyUP, NeedsChown and MountCount to the podman volume
inspect code.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-01-06 10:42:34 -05:00
c0b3df8059 Merge pull request #12759 from rhatdan/ci
Fix CI
2022-01-06 16:41:11 +01:00
7a24be6ad9 Fix CI
crun should be available in f35.

[ NO NEW TESTS NEEDED]

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-01-06 09:21:28 -05:00
755b7aa521 Merge pull request #12687 from rhatdan/volume
Support volume bind mounts for rootless containers
2022-01-06 15:16:13 +01:00
8d5d0e7c6d Merge pull request #12754 from dwmarshall/fix-typos
[CI:DOCS] correct typo words in docs
2022-01-06 12:20:37 +01:00
6809237436 correct typo words in docs
"for creating a container" appears for networks and volumes

Signed-off-by: David Marshall <dmarshall@gmail.com>
2022-01-05 15:23:07 -08:00
d67f178563 Merge pull request #12750 from rhatdan/error
Change Tests to ignore missing containers when removing --all
2022-01-05 18:10:37 +01:00
50e156b605 Merge pull request #12208 from cdoern/podSecurityOpt
Pod Security Option support and Infra Inheritance changes
2022-01-05 17:56:36 +01:00