Commit Graph

4162 Commits

Author SHA1 Message Date
Paul Holzinger 215c0a0115 vendor: update tags.cncf.io/container-device-interface to v1
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-03-18 11:59:29 +01:00
Paul Holzinger dc745a5a0b vendor: update to go.etcd.io/bbolt v1.4.0
Need to replace one deprecated error type alias.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-03-18 11:59:28 +01:00
openshift-merge-bot[bot] 9960397826 Merge pull request #2369 from containers/renovate/golangci-golangci-lint-1.x
chore(deps): update dependency golangci/golangci-lint to v1.64.8
2025-03-18 10:22:39 +00:00
renovate[bot] 890365c894 chore(deps): update dependency golangci/golangci-lint to v1.64.8
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-03-17 22:21:15 +00:00
openshift-merge-bot[bot] ba3a0fb363 Merge pull request #2343 from Luap99/network-docs
docs: update network description
2025-03-14 11:27:10 +00:00
openshift-merge-bot[bot] 9add7b8811 Merge pull request #2367 from containers/renovate/github.com-containernetworking-plugins-1.x
fix(deps): update module github.com/containernetworking/plugins to v1.6.2
2025-03-14 11:16:07 +00:00
renovate[bot] 31a21d2b71 fix(deps): update module github.com/containernetworking/plugins to v1.6.2
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-03-14 05:11:10 +00:00
openshift-merge-bot[bot] 9272c74d32 Merge pull request #2364 from containers/renovate/github.com-pkg-sftp-1.x
fix(deps): update module github.com/pkg/sftp to v1.13.8
2025-03-13 14:19:47 +00:00
renovate[bot] 44acc9eaa9 fix(deps): update module github.com/pkg/sftp to v1.13.8
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-03-13 12:49:03 +00:00
openshift-merge-bot[bot] 9247e538b4 Merge pull request #2365 from containers/renovate/go-golang.org-x-net-vulnerability
chore(deps): update module golang.org/x/net to v0.36.0 [security]
2025-03-13 12:48:00 +00:00
renovate[bot] 79f71096c8 chore(deps): update module golang.org/x/net to v0.36.0 [security]
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-03-13 12:32:35 +00:00
openshift-merge-bot[bot] d2fd690af2 Merge pull request #2345 from kolyshkin/cgr
Switch to opencontainers/cgroups
2025-03-13 12:31:28 +00:00
Kir Kolyshkin 4e99731fe5 deps: switch to opencontainers/cgroups
The new opencontainers/cgroups repo used to be part of runc.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2025-03-12 15:51:55 -07:00
Kir Kolyshkin 227f9dea40 pkg/util: fix a reference to slices pkg
This is an addition to commit 7e485a63 ("Replace golang.org/x/exp/slices
with slices from std").

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2025-03-12 15:51:55 -07:00
openshift-merge-bot[bot] 1e2f8fbe35 Merge pull request #2363 from Luap99/merge-back
Merge back v0.62.2 tag into main an dupdate c/{image,storage} to latest
2025-03-12 18:48:44 +00:00
openshift-merge-bot[bot] b9a910a103 Merge pull request #2362 from Luap99/go-1.23
Update to go 1.23
2025-03-12 16:28:48 +00:00
Paul Holzinger b5472e9ed1 Merge tag 'v0.62.2' into merge-back
Merge the tag back into main to make go modules aware that main is newer
than this tag.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-03-12 15:04:13 +01:00
Paul Holzinger 92936cefec vendor: update c/image to latest
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-03-12 15:01:26 +01:00
Paul Holzinger 13365432e3 vendor: bump github.com/onsi/ginkgo/v2 to v2.23.0
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-03-12 14:22:12 +01:00
Paul Holzinger 6d8678b6ca vendor: bump golang.org/x/crypto to v0.36.0
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-03-12 14:21:03 +01:00
Kir Kolyshkin c004fd1c1a all: switch to go 1.23, use standard maps/slices
1. Switch to Go 1.23.0 as a minimally required version.

2. Use Go 1.24.x for golangci-lint job.

3. Switch from golang.org/x/exp/maps to standard library's maps package.
   Retrospectively, it was a mistake to use x/exp/maps because the API
   changed when the package went into std (it now use iter.Seq).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-03-12 14:19:25 +01:00
Paul Holzinger ba53f74292 Makefile: make sure we never add toolchain
We don't want to force a new go version for local builds

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-03-12 14:19:11 +01:00
openshift-merge-bot[bot] 64c94ae14f Merge pull request #2361 from containers/renovate/golangci-golangci-lint-1.x
chore(deps): update dependency golangci/golangci-lint to v1.64.7
2025-03-12 10:54:08 +00:00
renovate[bot] cf4afe77c7 chore(deps): update dependency golangci/golangci-lint to v1.64.7
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-03-12 02:25:50 +00:00
openshift-merge-bot[bot] e6a3fecd0f Merge pull request #2276 from lsm5/packit-remove-rhel
[skip-ci] Packit: remove epel/rhel copr targets
2025-03-11 12:15:56 +00:00
openshift-merge-bot[bot] e69effc801 Merge pull request #2359 from lsm5/rpmlint
[skip-ci] RPM: silence rpmlint warning
2025-03-11 12:13:14 +00:00
Lokesh Mandvekar 700d9c2351 [skip-ci] RPM: silence rpmlint warning
Doesn't affect upstream

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2025-03-11 17:29:32 +05:30
Lokesh Mandvekar e12b149a13 [skip-ci] Packit: remove epel/rhel copr targets
rhel copr targets are often outdated causing failed builds and tests.
Best to only have CentOS Stream targets upstream, so we ensure
everything that enters RHEL at some point has been tested upstream.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2025-03-11 17:28:27 +05:30
tomsweeneyredhat ac1e69ce98 [v0.62] Bump to c/common v0.62.2
As the title says.  Getting ready for RHEL 9.5/10.0 ZeroDay.

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-03-10 18:52:13 -04:00
tomsweeneyredhat 1fce8df1e4 [v0.62] Bump c/storage to v1.57.2, c/image to v5.34.2
Bump c/storage to v1.57.2 and c/image to v5.34.2.
This is to ready for RHEL 9.6 and 10.0 ZeroDay branch and to provide the
fix for https://issues.redhat.com/browse/OCPBUGS-49927 there.

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-03-10 18:50:08 -04:00
openshift-merge-bot[bot] c4f20ceed9 Merge pull request #2355 from Luap99/disk-usage
libimage: rework DiskUsage() to count layers
2025-03-10 17:09:03 +00:00
Paul Holzinger e3d6a28822 libimage: rework DiskUsage() to count layers
The old implementation only counted full images when sharing content
between them. That is wrong, the store is layer based. We can have two
images with no parent image that shares layers.

As such get rid of the image tree that only is able to walk child/parent
images. Instead we actually walk all layers now and correctly notice
when they are shared.

To this this correctly, first convert all layers to map so we can look
them up by ID. And add missing size information if needed. Then we walk
all images layers and count how often each layers is used. Then walk
again but this time we know if the layer size must be shared or not so
we can actually acount things correctly.

Fixes: containers/podman#24452
Fixes: https://issues.redhat.com/browse/RHEL-29641

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-03-10 12:16:22 +01:00
openshift-merge-bot[bot] 8e47f514cd Merge pull request #2333 from mtrmac/c-image-for-docker
Update c/image to main
2025-03-06 14:29:25 +00:00
Miloslav Trmač 52f072860f Update c/image to main
... primarily to update docker/docker to v28; that broke API, so we
need to update the c/image caller as well.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-03-05 21:53:06 +01:00
Miloslav Trmač 7b2902a2dc Replace a reference to github.com/docker/docker/pkg/parsers.ParseUintList
It is deprecated in the docker repo as of v28. We are already carrying a
variant in c/storage.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-03-05 21:52:42 +01:00
openshift-merge-bot[bot] 2650c8db01 Merge pull request #2349 from kolyshkin/no-regexp
No regexp
2025-03-05 13:27:55 +00:00
Kir Kolyshkin 22a1d1c8f5 pkg/config: do not use regexp in validateUmask
Using ParseUint is faster and simpler.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2025-03-04 12:34:07 -08:00
openshift-merge-bot[bot] c92343f206 Merge pull request #2341 from Luap99/nv-ip-leak
libnetwork/netavark: dealloc ips on setup error
2025-03-04 20:12:45 +00:00
Kir Kolyshkin 97b3f8b60b pkg/secrets: replace regex with strings.ContainsAny
...which is both simpler and faster.

The change is being tested by TestAddSecretName.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2025-03-04 11:34:32 -08:00
openshift-merge-bot[bot] 2d7cb1ca7c Merge pull request #2346 from kolyshkin/golangci-lint
ci: fixups to golangci lint configuration
2025-03-04 19:31:32 +00:00
openshift-merge-bot[bot] 015b65001e Merge pull request #2348 from Luap99/merge-back
Merge back v0.62.1 into main
2025-03-04 17:31:01 +00:00
Paul Holzinger ced0f18641 Merge tag 'v0.62.1' into merge-back
Merge the tag back into main to make go modules aware that main is newer
than this tag.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-03-04 11:53:44 +01:00
openshift-merge-bot[bot] c5300bbc84 Merge pull request #2344 from kolyshkin/no-dm
Makefile,.golangci.yml: rm exclude_graphdriver_devicemapper
2025-03-04 10:39:51 +00:00
openshift-merge-bot[bot] a8a00194af Merge pull request #2342 from containers/renovate/github.com-opencontainers-image-spec-1.x
fix(deps): update module github.com/opencontainers/image-spec to v1.1.1
2025-03-04 10:28:29 +00:00
Kir Kolyshkin a487d16d0b .cirrus.yml: rm GOLANGCILINT_CACHE
It is not used since commit b63d51f3 ("cirrus-ci: rm make validate").

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2025-03-03 18:48:48 -08:00
Kir Kolyshkin ab6465985a ci: rm deprecated linters from .golangci.yml
This fixes the following warnings from golangci-lint v1.64.6:

	WARN [lintersdb] The linter "gomnd" is deprecated (step 2) and deactivated. It should be removed from the list of disabled linters. https://golangci-lint.run/product/roadmap/#linter-deprecation-cycle
	WARN [lintersdb] The linter "execinquery" is deprecated (step 2) and deactivated. It should be removed from the list of disabled linters. https://golangci-lint.run/product/roadmap/#linter-deprecation-cycle

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2025-03-03 18:39:44 -08:00
Kir Kolyshkin 9fc8f2b0aa Makefile: rm golangci-lint installation
Currently, "make validate" is not used from any CI workflows, meaning
it is there for local developer consumption only. For that case, we
can safely assume that a developer can maintain a recent golangci-lint
installation.

This also fixes the problem of golangci-lint version discrepancy between
Makefile and .github/workflows/validate.yml, introduced by commit 594e9b833
("renovate: teach it to update the lint version").

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2025-03-03 18:37:49 -08:00
Kir Kolyshkin 020e122214 Makefile,.golangci.yml: rm exclude_graphdriver_devicemapper
It is not needed since commit 34145bbe ("Bump c/image to v5.31.0,
c/storage v1.54.0"), which removes device mapper support.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2025-03-03 17:18:37 -08:00
Paul Holzinger cf53f13527 docs: update network description
The current docs are confusing and partly wrong even.

Fixes containers/podman#25377

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-03-03 18:31:37 +01:00
renovate[bot] 664a3129bf fix(deps): update module github.com/opencontainers/image-spec to v1.1.1
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-03-03 16:28:49 +00:00