Commit Graph

21936 Commits

Author SHA1 Message Date
Ashley Cui
ee923358c3 Vendor c/common
@main

Signed-off-by: Ashley Cui <acui@redhat.com>
2024-02-05 09:46:40 -05:00
Paul Holzinger
249474a84e drop support for "pasta" as a network name
The pasta network mode has been added in podman v4.4 and this causes a
conflict with named networks that could also be called "pasta". To not
break anything we had special logic to prefer the named network over the
network mode. Now with 5.0 we can break this and remove this awkward
special handling from the code.

Containers created with 4.X that use a named network pasta will also
continue to work fine, this chnage will only effect the creation of new
containers with a named network pasta and instead always used the
network mode pasta. We now also block the creation of networks with the
name "pasta".

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-02-05 13:57:24 +01:00
Vikas Goel
a098899104 Use semi-colon as the field separator for internal volumes-from inspect annotation
The current field separator comma of the inspect annotation conflicts with the mount options of --volumes-from as the mount options itself can be comma separated.

Signed-off-by: Vikas Goel <vikas.goel@gmail.com>
2024-02-05 00:16:53 -08:00
openshift-merge-bot[bot]
daf7a2c069 Merge pull request #21372 from cevich/win_mac_lint
Run lint for mac builds
2024-02-03 13:19:30 +00:00
renovate[bot]
d217de6424 [skip-ci] Update github/issue-labeler action to v3.4
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-02 23:24:07 +00:00
renovate[bot]
9e3d61a9d5 fix(deps): update module github.com/docker/docker to v25.0.2+incompatible
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-02 22:02:19 +00:00
openshift-merge-bot[bot]
2431fb3f0b Merge pull request #21472 from mheon/vendor_runc_main
Update to runc main, removing pin to an older version
2024-02-02 22:01:02 +00:00
Chris Evich
39f22c3821 Include machine-tests in cirrus-cron jobs
Irrespective of reason/cause, a commit was merged into main that broke
podman-machine, and went unnoticed for several days.  Improve the
situation by including podman-machine testing in the daily cirrus-cron
builds.  These are monitored by e-mail when `Total Success` reports a
failure.

Also: Add a comment for Windows & Mac build tasks, documenting the
reason they don't execute on RHEL release branches.

Signed-off-by: Chris Evich <cevich@redhat.com>
2024-02-02 14:46:54 -05:00
Matt Heon
7de64b47f2 Vendor c/storage main
This picks up a further removal of the runc users package that
was breaking the build on Windows.

Signed-off-by: Matt Heon <mheon@redhat.com>
2024-02-02 13:30:07 -05:00
openshift-merge-bot[bot]
11c37d5c95 Merge pull request #21272 from rhatdan/VENDOR
Add tests to make sure mounts.conf does not warn on missing content
2024-02-02 16:03:39 +00:00
Matt Heon
9fb57d346f Cease using deprecated runc userlookup
Instead switch to github.com/moby/sys/user, which we already had
as an indirect dependency.

Signed-off-by: Matt Heon <mheon@redhat.com>
2024-02-02 11:02:43 -05:00
Matt Heon
91b8f208a2 Bump to runc main
By using main instead of the v1.1 branch, we drop an unnecessary
dependency on cilium/ebpf, saving ~1mb of binary size.

Signed-off-by: Matt Heon <mheon@redhat.com>
2024-02-02 10:06:20 -05:00
Matt Heon
6a727fdbee Fix updated runc dep breaking pod devices cgroup
The update to runc broke creation of devices for containers in
the pod cgroup. We don't support the device cgroup for pods at
present, so just disable it for now, resolving the issue.

Thanks to Giuseppe for finding this one!

[NO NEW TESTS NEEDED] This is a fix for broken tests

Signed-off-by: Matt Heon <mheon@redhat.com>
2024-02-02 09:15:35 -05:00
Matt Heon
2818abf849 Update to runc main, removing pin to an older version
We were pinned to a specific commit to ensure that tests kept
passing. Hopefully they pass now, as we need to grab latest runc
for CVE fixes.

Also grab Buildah main to fix a build issue on FreeBSD. After a
botched manual vendor, I used Ed's treadmill script and squashed
it into this commit to make Git happy. Thanks bunches Ed.

Signed-off-by: Matt Heon <mheon@redhat.com>
2024-02-02 08:11:17 -05:00
openshift-merge-bot[bot]
5e64d4f021 Merge pull request #21068 from alexlarsson/quadlet-templates
Support templates in quadlet
2024-02-02 10:36:18 +00:00
Daniel J Walsh
0da4054534 Verify the empty mounts.conf does not generate warnings.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2024-02-01 20:12:08 -05:00
openshift-merge-bot[bot]
7cb0c2ef09 Merge pull request #21000 from rhatdan/machine
Strip key/values of external quotes
2024-02-02 00:59:03 +00:00
openshift-merge-bot[bot]
a59a32dc87 Merge pull request #21464 from containers/renovate/go-github.com/opencontainers/runc-vulnerability
fix(deps): update module github.com/opencontainers/runc to v1.1.12 [security]
2024-02-01 19:48:30 +00:00
openshift-merge-bot[bot]
d8c58936a4 Merge pull request #21414 from umohnani8/farm-reg
Farm build should read server registries.conf
2024-02-01 19:37:17 +00:00
openshift-merge-bot[bot]
c3a32b170d Merge pull request #21366 from edsantiago/new-vms
Test new CI VMs
2024-02-01 19:01:32 +00:00
Ed Santiago
1ab55defbb Test new CI VMs
From https://github.com/containers/automation_images/pull/325

Major change: netavark and aardvark are now included in prior-fedora,
so CNI can be fully eliminated from CI (#21410)

FIXME FIXME FIXME: skip two e2e tests, waiting for new netavark

Signed-off-by: Ed Santiago <santiago@redhat.com>
2024-02-01 09:50:41 -07:00
Chris Evich
c5c0799329 Scan-secrets: Fix PR forcepush detection condition
I have no idea why the `event_name` != `github.event.action`, but in
this case it doesn't.  For consistency with other related condition
checks, use the later over the former.

Signed-off-by: Chris Evich <cevich@redhat.com>
2024-02-01 11:28:49 -05:00
Chris Evich
0a4beea6db Scanning-secrets: Support new-branch/renovate link
Signed-off-by: Chris Evich <cevich@redhat.com>
2024-02-01 11:26:39 -05:00
Chris Evich
0e9b07a029 Secret-scanning: Fix newly-opened PR conditional
Signed-off-by: Chris Evich <cevich@redhat.com>
2024-02-01 10:25:12 -05:00
Chris Evich
3f3d1e4de7 Temporarily ignore mac-linting failures
As of this commit, there are several pages worth of lint findings for
the mac.  Once they're all addressed, this commit may be reverted to
enable continuous checking.

Signed-off-by: Chris Evich <cevich@redhat.com>
2024-02-01 09:49:53 -05:00
Chris Evich
d9ad7cbc94 Run lint for mac builds
There are darwin-specific code paths which were not being linted prior
to this commit.  Fix this with a new, darwin-specific section of the lint
runner script.

Signed-off-by: Chris Evich <cevich@redhat.com>
2024-02-01 09:49:53 -05:00
renovate[bot]
90d6e92f2f fix(deps): update module github.com/opencontainers/runc to v1.1.12 [security]
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-01 00:24:04 +00:00
openshift-merge-bot[bot]
4fde98f380 Merge pull request #21459 from cevich/simpler_to_read
[skip-ci] Make leak-detection readable by humans
2024-01-31 21:09:41 +00:00
openshift-merge-bot[bot]
f7afaf9652 Merge pull request #21455 from vrothberg/resolve-endpoint
add new libpod/images/$name/resolve endpoint
2024-01-31 21:06:57 +00:00
Urvashi Mohnani
a06685a548 Farm build should read server registries.conf
Fix the way we set skipTLSVerify on the client side
to ensure that the push stage in farm build takes into
account the configuration in the farm node's registries.conf
when the user hasn't set it on the client side.

Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
2024-01-31 15:41:27 -05:00
openshift-merge-bot[bot]
1a8cb15aa6 Merge pull request #21384 from Luap99/connections
rework system connection and farm storage
2024-01-31 19:29:44 +00:00
Chris Evich
28856b6c15 Make leak-detection readable by humans
Previously when a leak was detected under any circumstance, the workflow
would splat out a giant wall of gray, unreadable git-log text.  This often
enormous text might contain, somewhere, possibly, maybe, a little tiny
snippet of code that leaks a secret.

Improve the situation greatly by providing easy-to-use URLs that covers
the relevant changes based on the triggering context (new pr, force-push,
or merge).  Store the former (often) giant git-log output into a file
and stuff it into the artifacts in case it's ever useful.

Signed-off-by: Chris Evich <cevich@redhat.com>
2024-01-31 13:53:11 -05:00
Valentin Rothberg
b028f6aa75 add new libpod/images/$name/resolve endpoint
Podman Desktop [1] is looking into improving the user experience which
requires to know the source of an image.  Consider the user triggers an
image pull and Podman Desktop wants to figure out whether the image name
refers to a Red Hat registry, for instance, to prompt installing the RH
auth extension.

Since the input values of images may be a short name [2], Podman Desktop
has no means to figure out the (potential) source of the image.  Hence,
add a new `/resolve` endpoint to allow external callers to figure out
the (potential) fully-qualified image name of a given value.

With the new endpoint, Podman Desktop can ask Podman directly to resolve
the image name and then make an informed decision whether to prompt the
user to perform certain tasks or not.  This for sure can also be used
for any other registry (e.g., Quay, Docker Hub).

[1] https://github.com/containers/podman-desktop/issues/5771
[2] https://www.redhat.com/sysadmin/container-image-short-names

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2024-01-31 16:20:16 +01:00
renovate[bot]
f3ab6268a3 fix(deps): update module github.com/mattn/go-sqlite3 to v1.14.21
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-31 14:45:03 +00:00
openshift-merge-bot[bot]
4370932a71 Merge pull request #21450 from containers/renovate/dawidd6-action-send-mail-3.x
[skip-ci] Update dawidd6/action-send-mail action to v3.11.0
2024-01-31 14:44:00 +00:00
Paul Holzinger
74454bf59c rework system connection and farm storage
We now no longer write containers.conf, instead system connections and
farms are written to a new file called podman-connections.conf.

This is a major rework and I had to change a lot of things to get this
to compile again with my c/common changes.

It is a breaking change for users as connections/farms added before this
commit can now no longer be removed or modified directly. However because
the logic keeps reading from containers.conf the old connections can
still be used to connect to a remote host.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-01-31 15:08:41 +01:00
openshift-merge-bot[bot]
1698fa0ad8 Merge pull request #21388 from ashley-cui/healthcheck
Return nil health when inspecting containers without healthchecks
2024-01-31 13:48:36 +00:00
Ashley Cui
a1c47f0299 Return nil health when inspecting containers without healthchecks
When inspecting a container that does not define any health check, the health field should return nil. This matches docker behavior.

Signed-off-by: Ashley Cui <acui@redhat.com>
2024-01-30 23:09:13 -05:00
openshift-merge-bot[bot]
0655bf3d34 Merge pull request #21445 from anjannath/update-qemu
pkginstaller: bump Qemu version to 8.2.1
2024-01-31 03:29:32 +00:00
renovate[bot]
6eca2f6519 [skip-ci] Update dawidd6/action-send-mail action to v3.11.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-31 00:51:23 +00:00
openshift-merge-bot[bot]
2632edc871 Merge pull request #21408 from cevich/re-enable_pm_win
Revert "Enable win podman-machine test failure"
2024-01-30 20:59:10 +00:00
Anjan Nath
76791a21c6 pkginstaller: bump Qemu version to 8.2.1
this updates the Makefile qemu version to use the qemu
8.2.1 build released at:
https://github.com/containers/podman-machine-qemu/releases/tag/v8.2.1-1

[NO NEW TESTS NEEDED]

Signed-off-by: Anjan Nath <kaludios@gmail.com>
2024-01-31 01:34:47 +05:30
openshift-merge-bot[bot]
dabbcb8386 Merge pull request #21339 from mheon/specgen_to_pointer_v2
Convert SpecGen values to be nullable where possible
2024-01-30 19:06:14 +00:00
openshift-merge-bot[bot]
a6be5b030c Merge pull request #21421 from gordonmessmer/ssh-hostname
Fix SSH Host argument in tag command during scp.
2024-01-30 17:13:31 +00:00
Matthew Heon
d202acd861 Bump containers/common to latest main
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2024-01-30 10:42:24 -05:00
Matt Heon
174631f726 Convert SpecGen values to be nullable where possible
SpecGen is our primary container creation abstraction, and is
used to connect our CLI to the Libpod container creation backend.
Because container creation has a million options (I exaggerate
only slightly), the struct is composed of several other structs,
many of which are quite large.

The core problem is that SpecGen is also an API type - it's used
in remote Podman. There, we have a client and a server, and we
want to respect the server's containers.conf. But how do we tell
what parts of SpecGen were set by the client explicitly, and what
parts were not? If we're not using nullable values, an explicit
empty string and a value never being set are identical - and we
can't tell if it's safe to grab a default from the server's
containers.conf.

Fortunately, we only really need to do this for booleans. An
empty string is sufficient to tell us that a string was unset
(even if the user explicitly gave us an empty string for an
option, filling in a default from the config file is acceptable).
This makes things a lot simpler. My initial attempt at this
changed everything, including strings, and it was far larger and
more painful.

Also, begin the first steps of removing all uses of
containers.conf defaults from client-side. Two are gone entirely,
the rest are marked as remove-when-possible.

[NO NEW TESTS NEEDED] This is just a refactor.

Signed-off-by: Matt Heon <mheon@redhat.com>
2024-01-30 10:42:24 -05:00
openshift-merge-bot[bot]
c41c30bedd Merge pull request #21180 from rhatdan/nvidia
Make --gpus work with nvidia gpus
2024-01-30 14:59:02 +00:00
Gordon Messmer
f8e1ea4140 Fix SSH Host argument in tag command during scp.
[NO NEW TESTS NEEDED]

Signed-off-by: Gordon Messmer <gordon.messmer@gmail.com>
2024-01-29 16:30:39 -08:00
openshift-merge-bot[bot]
7ed4478c08 Merge pull request #21412 from umohnani8/farm-engine
Don't require engine connection for farm
2024-01-30 00:06:53 +00:00
openshift-merge-bot[bot]
d418d164a9 Merge pull request #21377 from yyzxw/chore/code-clean
chore: extract duplicate codes
2024-01-29 17:17:17 +00:00