Commit graph

6464 commits

Author SHA1 Message Date
Brent Baude
2ff43429f7 applehv: machine tests for stop and rm
change behaviour of stopped a stopped/exited machine to match qemu in that stopping a stopped machine is NOT an error.

add condition to machine rm where rm is not run twice due to a logic error

[NO NEW TESTS NEEDED]

Signed-off-by: Brent Baude <bbaude@redhat.com>
2023-09-26 15:30:36 -05:00
Ashley Cui
127ebe2b27 Update machine tests README
Windows now has a winmake file for easier testing, so document that.

Signed-off-by: Ashley Cui <acui@redhat.com>
2023-09-26 15:51:33 -04:00
Ashley Cui
995a6a8ac4 Add podman socket info to machine inspect
HyperV and appleHV machine inspect commands were missing podman socket
info. This also fixes machine inspect tests on hyperV

Signed-off-by: Ashley Cui <acui@redhat.com>
2023-09-26 15:50:00 -04:00
Ashley Cui
80952db0ba Fix podman machine info test for hyperV
We do not guarantee that the amount of machines that exist on the system
is 0 before running a test.

Signed-off-by: Ashley Cui <acui@redhat.com>
2023-09-26 15:49:55 -04:00
OpenShift Merge Robot
94f47d6f66
Merge pull request #20141 from baude/wslenablestop
pkg/machine/e2e: wsl stop
2023-09-26 13:37:52 -04:00
OpenShift Merge Robot
f64234969a
Merge pull request #20135 from ashley-cui/hypervroot
hyperV: Respect rootful option on machine init
2023-09-26 10:54:46 -04:00
Brent Baude
8bad842a45 pkg/machine/e2e: wsl stop
allow the machine stop test to pass.

small change to WSL stop on an already stopped machine to allow for it
to behave like hyperv and qemu

Signed-off-by: Brent Baude <bbaude@redhat.com>
2023-09-26 09:27:51 -05:00
OpenShift Merge Robot
d2d121a389
Merge pull request #20152 from baude/wslenableinspect
wsl: machine tests for inspect
2023-09-26 10:23:15 -04:00
Brent Baude
217c4d5468 wsl: machine tests for inspect
small corrections for wsl between sockets and pipe

Signed-off-by: Brent Baude <bbaude@redhat.com>
2023-09-26 07:26:44 -05:00
Brent Baude
e4bfcfc254 wsl: machine tests for ssh
a couple of small corrections for the ssh tests on WSL.  we need to
check for a different os type and windows emits a warning in stderr.

Signed-off-by: Brent Baude <bbaude@redhat.com>
2023-09-26 07:00:45 -05:00
OpenShift Merge Robot
a2434a9d37
Merge pull request #20144 from baude/wslenableset
wsl machine tests: set
2023-09-26 07:53:58 -04:00
OpenShift Merge Robot
72033cdc6a
Merge pull request #20137 from baude/applehvenablee2e
Enable machine e2e test for applehv
2023-09-26 07:22:14 -04:00
Brent Baude
a112ee8959 wsl: machine start test
the emitted message for starting a machine that is is already started
needed to be slightly altered for wsl.

[NO NEW TESTS NEEDED]

Signed-off-by: Brent Baude <bbaude@redhat.com>
2023-09-25 19:59:26 -05:00
Brent Baude
d3d5011dc4 wsl machine tests: set
wsl does not support changing the disk size, processor number, or memory
allocation.

Signed-off-by: Brent Baude <bbaude@redhat.com>
2023-09-25 19:53:35 -05:00
OpenShift Merge Robot
aebfde2408
Merge pull request #20142 from baude/wslenablerm
wsl: machine tests for machine rm
2023-09-25 19:55:41 -04:00
Brent Baude
cc4917d81d wsl: machine tests
WSL does not use ignition therefore the test for the file is invalid.

Signed-off-by: Brent Baude <bbaude@redhat.com>
2023-09-25 16:22:37 -05:00
Ashley Cui
ec68a74892 Skip proxy test for hyperV
Currently proxys are not supported on hyperV, skip the test and
document it for now.

Opened https://github.com/containers/podman/issues/20129 to track the
issue.

Signed-off-by: Ashley Cui <acui@redhat.com>
2023-09-25 16:48:35 -04:00
Brent Baude
33a92aa006 Enable machine e2e test for applehv
This PR allows you to run the pkg/machine/e2e tests for the applehv PROVIDER.  This does not mean they pass, only that they can run.  There also appears to be leftover gvproxy processes at the conclusion of a single test.  This will need to be corrected.

[NO NEW TESTS NEEDED]

Signed-off-by: Brent Baude <bbaude@redhat.com>
2023-09-25 15:45:26 -05:00
Ashley Cui
65ce034863 hyperV: Respect rootful option on machine init
Fixed a bug where the rootful option to the podman machine init command
would not be written to to the machine config, and the rootful docker
sock would not be set.

Signed-off-by: Ashley Cui <acui@redhat.com>
2023-09-25 16:13:55 -04:00
OpenShift Merge Robot
7133f5d388
Merge pull request #20117 from baude/hypervsettest
hyperv: machine e2e tests for set command
2023-09-25 13:54:18 -04:00
Brent Baude
41e51f4738 hyperv: machine e2e tests for set command
The usermode networking scenario is only for WSL.  Hyperv cannot run it.

Signed-off-by: Brent Baude <bbaude@redhat.com>
2023-09-25 09:54:38 -05:00
Valentin Rothberg
6293ec2e2d fix handling of static/volume dir
The processing and setting of the static and volume directories was
scattered across the code base (including c/common) leading to subtle
errors that surfaced in #19938.

There were multiple issues that I try to summarize below:

 - c/common loaded the graphroot from c/storage to set the defaults for
   static and volume dir.  That ignored Podman's --root flag and
   surfaced in #19938 and other bugs.  c/common does not set the
   defaults anymore which gives Podman the ability to detect when the
   user/admin configured a custom directory (not empty value).

 - When parsing the CLI, Podman (ab)uses containers.conf structures to
   set the defaults but also to override them in case the user specified
   a flag.  The --root flag overrode the static dir which is wrong and
   broke a couple of use cases.  Now there is a dedicated field for in
   the "PodmanConfig" which also includes a containers.conf struct.

 - The defaults for static and volume dir and now being set correctly
   and adhere to --root.

 - The CONTAINERS_CONF_OVERRIDE env variable has not been passed to the
   cleanup process.  I believe that _all_ env variables should be passed
   to conmon to avoid such subtle bugs.

Overall I find that the code and logic is scattered and hard to
understand and follow.  I refrained from larger refactorings as I really
just want to get #19938 fixed and then go back to other priorities.

https://github.com/containers/common/pull/1659 broke three pkg/machine
tests.  Those have been commented out until getting fixed.

Fixes: #19938
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2023-09-25 14:14:30 +02:00
OpenShift Merge Robot
9ba0022905
Merge pull request #20115 from baude/hypervstarting
hyperv: set more realistic starting state
2023-09-24 19:24:50 -04:00
OpenShift Merge Robot
7359a2df19
Merge pull request #20116 from baude/hypervremoveforce
hyperv: use StopWithForce with remove
2023-09-24 19:13:03 -04:00
OpenShift Merge Robot
3d5b9e80c6
Merge pull request #20114 from baude/hypervtzfix
Fix setting timezone on HyperV
2023-09-24 17:00:20 -04:00
Brent Baude
08936db354 hyperv: set more realistic starting state
the window for hyperv's "Starting" state is very narrow; so to more
mimic qemu, we follow suit.  starting bools are set when the vm boots
and when it communicates back on the read socket.

this allows pkg/machine/init_test.go to pass

[NO NEW TESTS NEEDED]

Signed-off-by: Brent Baude <bbaude@redhat.com>
2023-09-24 10:13:43 -05:00
Brent Baude
2bef573f34 hyperv: use StopWithForce with remove
When doing a machine rm -f (force removal of a machine) or a machine
reset (force removal of all machines), there is no need to use a
"polite/soft" stop.

this will also speed up pkg/machine/e2e tests.

[NO NEW TESTS NEEDED]

Signed-off-by: Brent Baude <bbaude@redhat.com>
2023-09-24 09:49:40 -05:00
Peter Werner
f52b02f406 Fix all ports exposed by kube play
Container ports defined with containerPort were exposed by default
even though kubernetes interprets them as mostly informative.
Closes #17028

Signed-off-by: Peter Werner <wpw.peter@gmail.com>
2023-09-23 19:53:46 +02:00
Brent Baude
cd4f611810 Fix setting timezone on HyperV
the timezone was being set with the wrong path separator for hyperv
because it was being generated on Windows.

Fixes: coreos/fedora-coreos-tracker#1580

Signed-off-by: Brent Baude <bbaude@redhat.com>
2023-09-23 11:04:45 -05:00
Ashley Cui
d8e3057165 Adjust machine CPU tests
Machine cpu default has changed to cpus/2, so adjust the tests to reflect that.

Signed-off-by: Ashley Cui <acui@redhat.com>
2023-09-22 13:11:12 -04:00
OpenShift Merge Robot
5a3a9ce9c7
Merge pull request #20093 from baude/hypervinit
fixes for pkg/machine/e2e on hyperv
2023-09-22 06:49:43 -04:00
OpenShift Merge Robot
da6ebeb511
Merge pull request #20086 from giuseppe/fix-mount-cgroupfs-without-netns
specgen, rootless: fix mount of cgroup without a netns
2023-09-22 05:08:12 -04:00
Brent Baude
c66aa3b7bb fixes for pkg/machine/e2e on hyperv
some problems were found in machine tests on hyperv.

in the case of rootful, it is currently not implemented.  an issue #20092 has been
created for that problem.

there also seems to be a timezone issue between ignition and fcos right
now.  inquiries are in for that but no issue generated for that.  this
problem is not exclusive to hyperv by any means.

both of the above have been skipped or commented out.

otherwise, this fixes machine state reporting for consistency.

Signed-off-by: Brent Baude <bbaude@redhat.com>
2023-09-21 16:14:57 -05:00
OpenShift Merge Robot
935a6d1569
Merge pull request #20074 from baude/hypervmachinee2epass1
Various updates for hyperv and machine e2e tests
2023-09-21 11:59:32 -04:00
OpenShift Merge Robot
aa286a5325
Merge pull request #19964 from baude/resizeDisk
Enable disk resizing for applehv
2023-09-21 11:56:27 -04:00
Brent Baude
92f4dcb093 Enable disk resizing for applehv
previous attempts to us os.truncate to resize raw disks did not work because the unit was wrong.  the unit must be in bytes.

[NO NEW TESTS NEEDED]

Signed-off-by: Brent Baude <bbaude@redhat.com>
2023-09-21 09:05:37 -05:00
Brent Baude
5b3801776b Various updates for hyperv and machine e2e tests
This PR is a mishmash of updates needed so that the hyperv provider can
begin to passd the machine e2e tests.

Summary as follows:
* Added custom error handling for machine errors so that all providers
  can generate the same formatted error messages.  The ones implemented
  thus far are needed for the basic and init tests.  More will come as
  they are identified.
* Vendored new libhvee for better memory inspection.  The memory type
  changed from uint32 to uint64.
* Some machine e2e tests used linux-specific utilities to check various
  error conditions and messages (like pgrep).  Those were made into
  functions and implemented on an operating system level.

[NO NEW TESTS NEEDED]

Signed-off-by: Brent Baude <bbaude@redhat.com>
2023-09-21 08:52:02 -05:00
Giuseppe Scrivano
8d3010d06b
specgen, rootless: fix mount of cgroup without a netns
commit cf364703fc changed the way
/sys/fs/cgroup is mounted when there is not a netns and it now honors
the ro flag.  The mount was created using a bind mount that is a
problem when using a cgroup namespace, fix that by mounting a fresh
cgroup file system.

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

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2023-09-21 13:20:09 +02:00
Daniel J Walsh
39ba5ff24b
Automatically remove anonymous volumes when removing a container
If you are running a quadlet with anonymous volumes, then the volume
will leak ever time you restart the service.  This change will
cause the volume to be removed.

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

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-09-21 07:08:08 -04:00
OpenShift Merge Robot
53e6a4435f
Merge pull request #20031 from ashley-cui/winmake
Makefile equiv Powershell script
2023-09-20 22:57:59 -04:00
Brent Baude
f3e9a6369c windows cannot "do" extra files
if you use the extra files function on exec commands, windows loses it's
mind.

[NO NEW TESTS NEEDED]

Signed-off-by: Brent Baude <bbaude@redhat.com>
2023-09-20 15:14:08 -05:00
OpenShift Merge Robot
8b498b74f8
Merge pull request #20063 from baude/strongunits
introduce pkg/strongunits
2023-09-20 14:22:38 -04:00
Brent Baude
eb9283c6fd introduce pkg/strongunits
podman could benefit from stronger typing with some of our methods and
functions where uint64s, for example, are used because the unit of
measurement is unknown.  Also, the need to convert between storage units
is critical in podman and this package supports easy conversion as
needed.

to start, we implement the storage units (bytes, KiB, MiB, and GiB)
only.

Signed-off-by: Brent Baude <bbaude@redhat.com>
2023-09-20 11:19:41 -05:00
OpenShift Merge Robot
639eb52c89
Merge pull request #20062 from vrothberg/syslog-fix
pass --syslog to the cleanup process
2023-09-20 11:57:33 -04:00
OpenShift Merge Robot
c5be3aecde
Merge pull request #20056 from Luap99/fast-net-ls
compat API: speed up network list
2023-09-20 16:43:00 +02:00
OpenShift Merge Robot
93623fe0ca
Merge pull request #20058 from rhatdan/VENDOR
vendor of containers/common
2023-09-20 16:31:21 +02:00
Valentin Rothberg
4652a2623f pass --syslog to the cleanup process
The --syslog flag has not been passed to the cleanup process (i.e.,
conmon's exit args) complicating debugging quite a bit.

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2023-09-20 15:37:07 +02:00
OpenShift Merge Robot
8f17ac5c17
Merge pull request #19997 from cgiradkar/Issue_15588
Change priority for cli flags for remotely operating Podman
2023-09-20 14:53:35 +02:00
Daniel J Walsh
73dc72f80d
vendor of containers/common
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-09-20 08:39:49 -04:00
Paul Holzinger
8e5adde0b3
compat API: speed up network list
The network list compat API requires us to include all containers with
their ip addresses for the selected networks. Because we have no network
-> container mapping in the db we have to go through all containers
every time. However the old code did it in the most ineffective way
possible, it quered the containers from the db for each individual
network. The of course is extremely expensive. Now the other expensive
call is calling Inspect() on the container each time. Inspect does for
more than we need.

To fix this we fist query containers only once for the API call, then
replace the inspect call with directly accessing the network status.
This will speed things up a lot!
The reported scenario includes 100 containers and 25 networks,
previously it took 1.5s for the API call not it takes 24ms, that is a
more than a 62x improvement. (tested with curl)

[NO NEW TESTS NEEDED] We have no timing tests.

Fixes #20035

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2023-09-20 13:08:42 +02:00