Merge pull request #476 from openshift-bot/synchronize-upstream

NO-ISSUE: Synchronize From Upstream Repositories

Author: openshift-merge-bot[bot]

cmd/catalogd/main.go

@@ -28,8 +28,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containers/image/v5/types"
 	"github.com/spf13/cobra"
+	"go.podman.io/image/v5/types"
 	"k8s.io/apimachinery/pkg/runtime"
 	k8stypes "k8s.io/apimachinery/pkg/types"
 	apimachineryrand "k8s.io/apimachinery/pkg/util/rand"

cmd/operator-controller/main.go

@@ -28,8 +28,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containers/image/v5/types"
 	"github.com/spf13/cobra"
+	"go.podman.io/image/v5/types"
 	rbacv1 "k8s.io/api/rbac/v1"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	apiextensionsv1client "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1"

commitchecker.yaml

@@ -1,4 +1,4 @@
-expectedMergeBase: 4867f92ba1bda49f4861627fb078177d2553f438
+expectedMergeBase: 27b05e75acd012f98e92adefe374303d13d5218d
 upstreamBranch: main
 upstreamOrg: operator-framework
 upstreamRepo: operator-controller

go.mod

@@ -8,7 +8,6 @@ require (
 	github.com/blang/semver/v4 v4.0.0
 	github.com/cert-manager/cert-manager v1.18.2
 	github.com/containerd/containerd v1.7.28
-	github.com/containers/image/v5 v5.36.2
 	github.com/fsnotify/fsnotify v1.9.0
 	github.com/go-logr/logr v1.4.3
 	github.com/golang-jwt/jwt/v5 v5.3.0
@@ -21,11 +20,12 @@ require (
 	github.com/opencontainers/image-spec v1.1.1
 	github.com/operator-framework/api v0.34.0
 	github.com/operator-framework/helm-operator-plugins v0.8.0
-	github.com/operator-framework/operator-registry v1.58.0
+	github.com/operator-framework/operator-registry v1.59.0
 	github.com/prometheus/client_golang v1.23.2
 	github.com/prometheus/common v0.66.1
 	github.com/spf13/cobra v1.10.1
 	github.com/stretchr/testify v1.11.1
+	go.podman.io/image/v5 v5.37.0
 	golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b
 	golang.org/x/mod v0.28.0
 	golang.org/x/sync v0.17.0
@@ -35,11 +35,11 @@ require (
 	k8s.io/apiextensions-apiserver v0.33.4
 	k8s.io/apimachinery v0.33.4
 	k8s.io/apiserver v0.33.4
-	k8s.io/cli-runtime v0.33.3
+	k8s.io/cli-runtime v0.33.4
 	k8s.io/client-go v0.33.4
 	k8s.io/component-base v0.33.4
 	k8s.io/klog/v2 v2.130.1
-	k8s.io/kubernetes v1.33.2
+	k8s.io/kubernetes v1.33.4
 	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
 	pkg.package-operator.run/boxcutter v0.7.0
 	sigs.k8s.io/controller-runtime v0.21.0
@@ -49,7 +49,7 @@ require (
 )
 
 require (
-	k8s.io/component-helpers v0.33.2 // indirect
+	k8s.io/component-helpers v0.33.4 // indirect
 	k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a // indirect
 )
 
@@ -79,13 +79,11 @@ require (
 	github.com/containerd/errdefs/pkg v0.3.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/containerd/platforms v0.2.1 // indirect
-	github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
+	github.com/containerd/stargz-snapshotter/estargz v0.17.0 // indirect
 	github.com/containerd/ttrpc v1.2.7 // indirect
 	github.com/containerd/typeurl/v2 v2.2.3 // indirect
-	github.com/containers/common v0.64.2 // indirect
 	github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
 	github.com/containers/ocicrypt v1.2.1 // indirect
-	github.com/containers/storage v1.59.1 // indirect
 	github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 // indirect
 	github.com/cyphar/filepath-securejoin v0.4.1 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
@@ -94,7 +92,7 @@ require (
 	github.com/docker/distribution v2.8.3+incompatible // indirect
 	github.com/docker/docker v28.3.3+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.9.3 // indirect
-	github.com/docker/go-connections v0.5.0 // indirect
+	github.com/docker/go-connections v0.6.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/emicklei/go-restful/v3 v3.13.0 // indirect
 	github.com/evanphx/json-patch v5.9.11+incompatible // indirect
@@ -187,14 +185,14 @@ require (
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/proglottis/gpgme v0.1.4 // indirect
+	github.com/proglottis/gpgme v0.1.5 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
 	github.com/prometheus/procfs v0.17.0 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/rubenv/sql-migrate v1.8.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
-	github.com/secure-systems-lab/go-securesystemslib v0.9.0 // indirect
+	github.com/secure-systems-lab/go-securesystemslib v0.9.1 // indirect
 	github.com/shopspring/decimal v1.4.0 // indirect
 	github.com/sigstore/fulcio v1.7.1 // indirect
 	github.com/sigstore/protobuf-specs v0.4.3 // indirect
@@ -223,6 +221,8 @@ require (
 	go.opentelemetry.io/otel/sdk v1.37.0 // indirect
 	go.opentelemetry.io/otel/trace v1.37.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.7.0 // indirect
+	go.podman.io/common v0.65.0 // indirect
+	go.podman.io/storage v1.60.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.2 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/crypto v0.42.0 // indirect
@@ -258,62 +258,62 @@ require (
 
 retract v1.5.0 // contains filename with ':' which causes failure creating module zip file
 
-replace k8s.io/api => k8s.io/api v0.33.2
+replace k8s.io/api => k8s.io/api v0.33.4
 
-replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.2
+replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.4
 
-replace k8s.io/apimachinery => k8s.io/apimachinery v0.33.2
+replace k8s.io/apimachinery => k8s.io/apimachinery v0.33.4
 
-replace k8s.io/apiserver => k8s.io/apiserver v0.33.2
+replace k8s.io/apiserver => k8s.io/apiserver v0.33.4
 
-replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.2
+replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.4
 
-replace k8s.io/client-go => k8s.io/client-go v0.33.2
+replace k8s.io/client-go => k8s.io/client-go v0.33.4
 
-replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.33.2
+replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.33.4
 
-replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.33.2
+replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.33.4
 
-replace k8s.io/code-generator => k8s.io/code-generator v0.33.2
+replace k8s.io/code-generator => k8s.io/code-generator v0.33.4
 
-replace k8s.io/component-base => k8s.io/component-base v0.33.2
+replace k8s.io/component-base => k8s.io/component-base v0.33.4
 
-replace k8s.io/component-helpers => k8s.io/component-helpers v0.33.2
+replace k8s.io/component-helpers => k8s.io/component-helpers v0.33.4
 
-replace k8s.io/controller-manager => k8s.io/controller-manager v0.33.2
+replace k8s.io/controller-manager => k8s.io/controller-manager v0.33.4
 
-replace k8s.io/cri-api => k8s.io/cri-api v0.33.2
+replace k8s.io/cri-api => k8s.io/cri-api v0.33.4
 
-replace k8s.io/cri-client => k8s.io/cri-client v0.33.2
+replace k8s.io/cri-client => k8s.io/cri-client v0.33.4
 
-replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.33.2
+replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.33.4
 
-replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.33.2
+replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.33.4
 
-replace k8s.io/endpointslice => k8s.io/endpointslice v0.33.2
+replace k8s.io/endpointslice => k8s.io/endpointslice v0.33.4
 
-replace k8s.io/externaljwt => k8s.io/externaljwt v0.33.2
+replace k8s.io/externaljwt => k8s.io/externaljwt v0.33.4
 
-replace k8s.io/kms => k8s.io/kms v0.33.2
+replace k8s.io/kms => k8s.io/kms v0.33.4
 
-replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.33.2
+replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.33.4
 
-replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.33.2
+replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.33.4
 
-replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.33.2
+replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.33.4
 
-replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.33.2
+replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.33.4
 
-replace k8s.io/kubectl => k8s.io/kubectl v0.33.2
+replace k8s.io/kubectl => k8s.io/kubectl v0.33.4
 
-replace k8s.io/kubelet => k8s.io/kubelet v0.33.2
+replace k8s.io/kubelet => k8s.io/kubelet v0.33.4
 
-replace k8s.io/kubernetes => k8s.io/kubernetes v1.33.2
+replace k8s.io/kubernetes => k8s.io/kubernetes v1.33.4
 
-replace k8s.io/metrics => k8s.io/metrics v0.33.2
+replace k8s.io/metrics => k8s.io/metrics v0.33.4
 
-replace k8s.io/mount-utils => k8s.io/mount-utils v0.33.2
+replace k8s.io/mount-utils => k8s.io/mount-utils v0.33.4
 
-replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.33.2
+replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.33.4
 
-replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.33.2
+replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.33.4