Commit Graph

3335 Commits

Author SHA1 Message Date
openshift-merge-bot[bot] cdfd5c4a83
Merge pull request #6050 from openshift-cherrypick-robot/cherry-pick-6028-to-release-1.22
[release-1.22] tests/conformance/testdata/Dockerfile.add:...
2025-03-10 19:45:05 +00:00
Nalin Dahyabhai 09bc46d65c tests/conformance/testdata/Dockerfile.add:...
update some URLs

The origin repository renamed its "master" branch to "main", so we need
to update our references to items in that branch.

[NO NEW TESTS NEEDED]

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2025-03-10 19:02:07 +00:00
openshift-merge-bot[bot] 230197029b
Merge pull request #5508 from openshift-cherrypick-robot/cherry-pick-5507-to-release-1.22
[release-1.22] conformance tests: don't break on trailing zeroes in layer blobs
2024-05-02 20:12:51 +00:00
Nalin Dahyabhai 33e5ac461f conformance tests: don't break on trailing zeroes in layer blobs
When analyzing a layer blob's contents, don't break if the blob has more
zeroes padding it out even after the tar reader thinks it's hit the end
of the archive.

Add more detail to the diagnostic error we print when there's a digest
or length mismatch, too, in case it's triggered by something other than
zero padding.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2024-05-02 19:51:46 +00:00
openshift-merge-bot[bot] 70152c98d2
Merge pull request #5264 from cevich/conformance-bit-masking-1.22
[release-1.22] conformance test: ignore file type bits when comparing layers
2024-01-11 21:33:21 +00:00
Nalin Dahyabhai 3f05ea14c1
conformance test: ignore file type bits when comparing layers
When comparing layer payloads during conformance tests, mask off any
file type bits that the tar headers in the layers might have included.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Signed-off-by: Chris Evich <cevich@redhat.com>
2024-01-11 14:24:30 -05:00
OpenShift Merge Robot d3f1f33f28
Merge pull request #4853 from cevich/upstream/release-1.22_backport-fix_ci_using_docker_hub
[release-1.22] Replace registry.centos.org
2023-06-07 15:30:41 -04:00
Aditya R 31c9260dee
[release-1.22] Replace registry.centos.org
The registry.centos.org service has been decommissioned.  Update the
conformance test references to point into the static CI images under
the `quay.io/libpod` repositories.

Signed-off-by: Aditya R <arajan@redhat.com>
Signed-off-by: Ed Santiago <santiago@redhat.com>
Signed-off-by: Chris Evich <cevich@redhat.com>
2023-06-06 15:09:37 -04:00
OpenShift Merge Robot 8d0b57927a
Merge pull request #4279 from nalind/v1.22.5
[release-1.22] tag v1.22.5
2022-09-21 08:02:30 +02:00
Nalin Dahyabhai 0467f01190 tag v1.22.5
[NO NEW TESTS NEEDED]

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2022-09-20 13:05:02 -04:00
flouthoc e90f44c684
Merge pull request #4263 from nalind/additional-groups-1.22
[release-1.22] run: add container gid to additional groups
2022-09-20 00:55:38 +05:30
Aditya R 3996e9ed4b run: add container gid to additional groups
When container is created with specific uid and gid also add container
gid to supplementary/additional group.

Signed-off-by: Aditya R <arajan@redhat.com>
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2022-09-19 14:57:29 -04:00
OpenShift Merge Robot 420b281d8e
Merge pull request #4138 from cevich/1.22_latest_imgts
[release-1.22] Cirrus: Use the latest imgts container
2022-07-27 11:45:02 +02:00
Chris Evich 79114d7c84
Cirrus: Use the latest imgts container
Contains important updates re: preserving release-branch CI VM images.
Ref: https://github.com/containers/automation_images/pull/157

Signed-off-by: Chris Evich <cevich@redhat.com>
2022-07-26 13:57:25 -04:00
OpenShift Merge Robot 55522e4f0b
Merge pull request #3857 from nalind/CVE-2022-21698-1.22
[release-1.22] CVE-2022-21698: bump github.com/prometheus/client_golang to v1.11.1
2022-03-25 10:07:17 +01:00
OpenShift Merge Robot 66a6a6aab9
Merge pull request #3856 from nalind/CVE-2022-27651-1.22
[release-1.22] CVE-2022-27651: do not set the inheritable capabilities
2022-03-25 10:05:17 +01:00
Nalin Dahyabhai 0f02fe9fc6 Add a test for CVE-2022-27651
Check that the inheritable capabilities are set to 0, even when we
explicitly try to add capabilities.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2022-03-24 17:41:03 -04:00
Giuseppe Scrivano f1228fca5b do not set the inheritable capabilities
The kernel never sets the inheritable capabilities for a process, they
are only set by userspace.  Emulate the same behavior.

Closes: CVE-2022-27651

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2022-03-24 17:41:03 -04:00
Nalin Dahyabhai 76527fcfc9 Bump github.com/prometheus/client_golang to v1.11.1
Resolves: CVE-2022-21698

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2022-03-24 17:22:33 -04:00
OpenShift Merge Robot 6888e1caef
Merge pull request #3742 from nalind/v1.22.4
[release-1.22] bump(github.com/containerd/containerd), bump us to v1.22.4
2022-01-25 08:11:44 -05:00
Nalin Dahyabhai 74a9cf80e5 Bump to v1.22.4
[NO NEW TESTS NEEDED]

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2022-01-24 15:57:45 -05:00
Lokesh Mandvekar d6b3164063 Bump containerd to v1.5.7
Fixes: GHSA-c2h3-6mxw-7mvq
Vulnerable versions: >= 1.5.0, < 1.5.7
Patched version: 1.5.7

`Impact`
A bug was found in containerd where container root directories and
some plugins had insufficiently restricted permissions, allowing
otherwise unprivileged Linux users to traverse directory contents
and execute programs. When containers included executable programs
with extended permission bits (such as setuid), unprivileged Linux
users could discover and execute those programs. When the UID of
an unprivileged Linux user on the host collided with the file
owner or group inside a container, the unprivileged Linux user on
the host could discover, read, and modify those files.

`Patches`
This vulnerability has been fixed in containerd 1.4.11 and
containerd 1.5.7. Users should update to these version when they
are released and may restart containers or update directory
permissions to mitigate the vulnerability.

`Workarounds`
Limit access to the host to trusted users. Update directory
permission on container bundles directories.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-01-24 15:57:44 -05:00
OpenShift Merge Robot fc375a747c
Merge pull request #3739 from nalind/is-not-a-directory-1.22
[release-1.22] copier.Put: check for is-not-a-directory using lstat, not stat; RemoveAll possibly-directories
2022-01-24 14:26:45 -05:00
Nalin Dahyabhai 8b63ee5005 copier: RemoveAll possibly-directories
When we attempt to remove a directory to make way for a non-directory as
part of extracting content, use RemoveAll() instead of Remove().

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2022-01-24 14:00:10 -05:00
Nalin Dahyabhai 0822118a4b copier.Put: check for is-not-a-directory using lstat, not stat
When checking if something that we want to overwrite with a directory is
already a directory or not, use lstat instead of stat.  If it's a
symbolic link, it's not a directory.

This is a subtle behavior change, but it's in line with docker build.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2022-01-24 13:59:57 -05:00
OpenShift Merge Robot 46b4577587
Merge pull request #3627 from cevich/1.22_fix_install
[1.22] Cirrus: Backport PR #3562 + reduce testing tasks
2021-11-19 17:55:15 +01:00
Chris Evich b82df763a3
Cirrus: Reduce CI tasks to releive maint. burden
This follows a long-standing practice here and across other containers
projects.  Over time, it's simply not worth developer/maintainer time to
debug old tests that may fail due to new/changing inputs.  Reduce down
to the bare minimum of tasks to keep CI on life-support while the need
for backports remains possible but unlikely.

Signed-off-by: Chris Evich <cevich@redhat.com>
2021-11-19 10:45:33 -05:00
Chris Evich e4e12cad12
Cirrus: Backport PR #3562
Same package metadata problem found to affect older release branch
'conformance' testing.

Signed-off-by: Chris Evich <cevich@redhat.com>
2021-11-15 15:00:29 -05:00
OpenShift Merge Robot 4d20222786
Merge pull request #3468 from TomSweeneyRedHat/dev/tsweeney/v1.22.3
[release-1.22] Bump to v1.22.3
2021-08-20 09:28:59 -04:00
TomSweeneyRedHat f88ebfd17e [release-1.22] Bump to v1.22.4-dev
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2021-08-20 07:49:35 -04:00
TomSweeneyRedHat 852ca9ff7f [release-1.22] Bump to v1.22.3
Bumping to v1.22.3.  The v1.22.2 tag/release that was created was
created badly and is messing up go modules.  Per @vrothberg, the
only fix is to bump the version and create a new release.

[NO TESTS NEEDED]
[NO NEW TESTS NEEDED]

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2021-08-20 07:43:09 -04:00
OpenShift Merge Robot dfab841236
Merge pull request #3466 from TomSweeneyRedHat/dev/tsweeney/v1.22.2
[release-1.22] Bump to v1.22.2
2021-08-19 17:46:20 -04:00
TomSweeneyRedHat 283ec4e907 [release-1.22] Bump to v1.22.3-dev
As the title says

[NO TESTS NEEDED]
[NO NEW TESTS NEEDED]

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2021-08-19 16:07:06 -04:00
TomSweeneyRedHat 4f8fbfc868 [release-1.22] Bump to v1.22.2
As the title says.

[NO TESTS NEEDED]
[NO NEW TESTS NEEDED]

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2021-08-19 16:03:49 -04:00
OpenShift Merge Robot 4d775253ed
Merge pull request #3465 from TomSweeneyRedHat/dev/tsweeney/bumpcimage5.15.2
[release-1.22] bump c/image to v5.15.2
2021-08-19 12:53:47 -04:00
TomSweeneyRedHat 679ba8fb92 [release-1.22] bump c/image to v5.15.2
Bump c/image to v5.15.2 in readiness for Podman v3.3 version dance.

[NO TESTS NEEDED]
[NO NEW TESTS NEEDED]

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2021-08-19 09:33:03 -04:00
openshift-ci[bot] ca33417c65
Merge pull request #3460 from TomSweeneyRedHat/dev/tsweeney/v1.22.1
[release-1.22] Bump to v1.22.1
2021-08-17 19:13:24 +00:00
TomSweeneyRedHat 91c5541140 [release-1.22] Bump to v1.22.1
Bump the release to v1.22.1
[NO TESTS NEEDED]
[NO NEW TESTS NEEDED]

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2021-08-17 11:40:11 -04:00
openshift-ci[bot] 848ffd47b7
Merge pull request #3450 from TomSweeneyRedHat/dev/tsweeney/vndrplz
[release-1.22] Bump c/storage to v1.34.0
2021-08-17 10:01:42 +00:00
TomSweeneyRedHat 97bbf40d74 [release-1.22] Bump c/storage to v1.34.1
Bump c/storage to v1.34.1 for the release-1.22 branch
Also bump go to 1.16 in Makefile and .cirrus.yml

[NO TESTS NEEDED]
[NO NEW TESTS NEEDED]

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2021-08-16 18:01:32 -04:00
Daniel J Walsh 98960f2029
Merge pull request #3447 from nalind/release-1.22-post
[release-1.22] post-branch commit
2021-08-12 16:43:36 -04:00
Nalin Dahyabhai 357ccceeea Post-branch commit
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2021-08-12 16:32:25 -04:00
openshift-ci[bot] 71b8003a35
Merge pull request #3421 from TomSweeneyRedHat/dev/tsweeney/pick2
[release-1.22] Accept repositories on login/logout
2021-08-03 17:53:45 +00:00
TomSweeneyRedHat 2d1b0f84f0 [release-1.22] Accept repositories on login/logout
Cherry pick #3412 from @saschagrunert
[NO NEW TESTS NEEDED]

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2021-08-03 10:35:28 -04:00
openshift-ci[bot] db98fd1fc0
Merge pull request #3419 from TomSweeneyRedHat/dev/tsweeney/fixoldchanger
[CI:DOCS][release-1.22] Fix CHANGELOG.md
2021-08-03 13:48:14 +00:00
TomSweeneyRedHat 42684a5fd8 [CI:DOCS][release-1.22] Fix CHANGELOG.md
Fix the CHANGELOG.md in the release-1.22 branch
as it had duplicate  entries for the past few
releases within it.

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2021-08-02 20:31:22 -04:00
TomSweeneyRedHat e6ea308d6d Bump to v1.22.0 [NO TESTS NEEDED]
[NO TESTS NEEDED]

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2021-08-02 14:17:56 -04:00
openshift-ci[bot] ed68d3d1b5
Merge pull request #3416 from vrothberg/dev/tsweeney/vndrdance
c/image, c/storage, c/common vendor before Podman 3.3 release
2021-08-02 15:53:40 +00:00
TomSweeneyRedHat a80feebe87 c/image, c/storage, c/common vendor before Podman 3.3 release
In preparation for Podman v3.3.0, start the vendor dance

c/common  - v0.42.0
c/image   - v5.15.0
c/storage - v1.33.0

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2021-08-02 16:09:24 +02:00
OpenShift Merge Robot 56ff12f093
Merge pull request #3228 from edsantiago/bats_assert
tests: new assert()
2021-07-30 07:46:12 -04:00