UPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies

Author: camilamacedo86

openshift/default-catalog-consistency/DEPENDENCY_UPDATES.md

@@ -0,0 +1,94 @@
+# Dependency Updates Summary
+## Comparison: main branch vs current branch
+
+### Go Version
+- go 1.24.3 -> go 1.24.6
+
+## Direct Dependencies Updated
+
+| Package | From | To |
+|---------|------|-----|
+| github.com/containerd/containerd | v1.7.27 | v1.7.29 |
+| github.com/containers/image/v5 | v5.35.0 | v5.36.2 |
+| github.com/onsi/ginkgo/v2 | v2.23.4 | v2.27.2 |
+| github.com/onsi/gomega | v1.37.0 | v1.38.2 |
+| github.com/operator-framework/operator-controller | v1.3.0 | v1.6.0 |
+| github.com/operator-framework/operator-registry | v1.55.0 | v1.61.0 |
+| k8s.io/apimachinery | v0.33.2 | v0.34.1 |
+
+## Indirect Dependencies Updated
+
+| Package | From | To |
+|---------|------|-----|
+| github.com/containers/storage | v1.58.0 | v1.59.1 |
+| github.com/docker/docker | v28.3.0+incompatible | v28.5.1+incompatible |
+| github.com/docker/docker-credential-helpers | v0.9.3 | v0.9.4 |
+| github.com/docker/go-connections | v0.5.0 | v0.6.0 |
+| github.com/fxamacker/cbor/v2 | v2.8.0 | v2.9.0 |
+| github.com/go-jose/go-jose/v4 | v4.1.1 | v4.1.3 |
+| github.com/go-openapi/jsonpointer | v0.21.1 | v0.22.0 |
+| github.com/go-openapi/jsonreference | v0.21.0 | v0.21.1 |
+| github.com/go-openapi/swag | v0.23.1 | v0.24.1 |
+| github.com/google/pprof | v0.0.0-20250423184734-337e5dd93bb4 | v0.0.0-20251007162407-5df77e3f7d1d |
+| github.com/klauspost/compress | v1.18.0 | v1.18.1 |
+| github.com/letsencrypt/boulder | v0.20250701.0 | v0.0.0-20250624003606-5ddd5acf990d |
+| github.com/mattn/go-sqlite3 | v1.14.28 | v1.14.32 |
+| github.com/modern-go/reflect2 | v1.0.2 | v1.0.3-0.20250322232337-35a7c28c31ee |
+| github.com/operator-framework/api | v0.32.0 | v0.36.0 |
+| github.com/proglottis/gpgme | v0.1.4 | v0.1.5 |
+| github.com/secure-systems-lab/go-securesystemslib | v0.9.0 | v0.9.1 |
+| github.com/ulikunitz/xz | v0.5.12 | v0.5.15 |
+| go.yaml.in/yaml/v2 | v2.4.2 | v2.4.3 |
+| golang.org/x/crypto | v0.39.0 | v0.43.0 |
+| golang.org/x/net | v0.41.0 | v0.46.0 |
+| golang.org/x/oauth2 | v0.30.0 | v0.32.0 |
+| golang.org/x/sync | v0.15.0 | v0.18.0 |
+| golang.org/x/sys | v0.33.0 | v0.38.0 |
+| golang.org/x/term | v0.32.0 | v0.36.0 |
+| golang.org/x/text | v0.26.0 | v0.30.0 |
+| golang.org/x/time | v0.12.0 | v0.13.0 |
+| golang.org/x/tools | v0.34.0 | v0.38.0 |
+| google.golang.org/genproto/googleapis/api | v0.0.0-20250603155806-513f23925822 | v0.0.0-20250804133106-a7a43d27e69b |
+| google.golang.org/genproto/googleapis/rpc | v0.0.0-20250603155806-513f23925822 | v0.0.0-20251110190251-83f479183930 |
+| google.golang.org/grpc | v1.73.0 | v1.76.0 |
+| google.golang.org/protobuf | v1.36.6 | v1.36.10 |
+| k8s.io/api | v0.33.2 | v0.34.1 |
+| k8s.io/client-go | v0.33.2 | v0.34.1 |
+| k8s.io/kube-openapi | v0.0.0-20250701173324-9bd5c66d9911 | v0.0.0-20250710124328-f3f2b991d03b |
+| sigs.k8s.io/controller-runtime | v0.21.0 | v0.22.4 |
+| sigs.k8s.io/yaml | v1.5.0 | v1.6.0 |
+
+## New Dependencies Added
+
+- github.com/Masterminds/semver/v3 v3.4.0
+- golang.org/x/mod v0.29.0
+- k8s.io/apiextensions-apiserver v0.34.1
+- sigs.k8s.io/structured-merge-diff/v6 v6.3.0
+- github.com/go-openapi/swag/cmdutils v0.24.0
+- github.com/go-openapi/swag/conv v0.24.0
+- github.com/go-openapi/swag/fileutils v0.24.0
+- github.com/go-openapi/swag/jsonname v0.24.0
+- github.com/go-openapi/swag/jsonutils v0.24.0
+- github.com/go-openapi/swag/loading v0.24.0
+- github.com/go-openapi/swag/mangling v0.24.0
+- github.com/go-openapi/swag/netutils v0.24.0
+- github.com/go-openapi/swag/stringutils v0.24.0
+- github.com/go-openapi/swag/typeutils v0.24.0
+- github.com/go-openapi/swag/yamlutils v0.24.0
+
+## Removed Dependencies
+
+- github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
+- github.com/go-openapi/analysis v0.23.0
+- github.com/go-openapi/errors v0.22.1
+- github.com/go-openapi/loads v0.22.0
+- github.com/go-openapi/runtime v0.28.0
+- github.com/go-openapi/spec v0.21.0
+- github.com/go-openapi/strfmt v0.23.0
+- github.com/go-openapi/validate v0.24.0
+- github.com/mitchellh/mapstructure v1.5.0
+- github.com/oklog/ulid v1.3.1
+- github.com/sigstore/rekor v1.3.10
+- go.mongodb.org/mongo-driver v1.17.4
+- go.uber.org/automaxprocs v1.6.0
+- sigs.k8s.io/structured-merge-diff/v4 v4.7.0

openshift/default-catalog-consistency/go.mod

@@ -8,9 +8,15 @@ require (
 	github.com/onsi/ginkgo/v2 v2.27.2
 	github.com/onsi/gomega v1.38.2
 	github.com/opencontainers/image-spec v1.1.1
+<<<<<<< HEAD
 	github.com/operator-framework/operator-controller v1.5.1
 	github.com/operator-framework/operator-registry v1.57.0
 	k8s.io/apimachinery v0.33.4
+=======
+	github.com/operator-framework/operator-controller v1.6.0
+	github.com/operator-framework/operator-registry v1.61.0
+	k8s.io/apimachinery v0.34.1
+>>>>>>> 71fae0444 (UPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies)
 	oras.land/oras-go/v2 v2.6.0
 )
 
@@ -35,27 +41,54 @@ require (
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/distribution/reference v0.6.0 // indirect
 	github.com/docker/distribution v2.8.3+incompatible // indirect
+<<<<<<< HEAD
 	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/docker v28.5.1+incompatible // indirect
+	github.com/docker/docker-credential-helpers v0.9.4 // indirect
+	github.com/docker/go-connections v0.6.0 // indirect
+>>>>>>> 71fae0444 (UPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies)
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/go-git/go-billy/v5 v5.6.2 // indirect
 	github.com/go-git/go-git/v5 v5.16.2 // indirect
-	github.com/go-jose/go-jose/v4 v4.1.1 // indirect
+	github.com/go-jose/go-jose/v4 v4.1.3 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
+<<<<<<< HEAD
 	github.com/go-openapi/jsonpointer v0.21.1 // indirect
 	github.com/go-openapi/jsonreference v0.21.0 // indirect
 	github.com/go-openapi/swag v0.23.1 // indirect
+=======
+	github.com/go-openapi/jsonpointer v0.22.0 // indirect
+	github.com/go-openapi/jsonreference v0.21.1 // indirect
+	github.com/go-openapi/swag v0.24.1 // indirect
+	github.com/go-openapi/swag/cmdutils v0.24.0 // indirect
+	github.com/go-openapi/swag/conv v0.24.0 // indirect
+	github.com/go-openapi/swag/fileutils v0.24.0 // indirect
+	github.com/go-openapi/swag/jsonname v0.24.0 // indirect
+	github.com/go-openapi/swag/jsonutils v0.24.0 // indirect
+	github.com/go-openapi/swag/loading v0.24.0 // indirect
+	github.com/go-openapi/swag/mangling v0.24.0 // indirect
+	github.com/go-openapi/swag/netutils v0.24.0 // indirect
+	github.com/go-openapi/swag/stringutils v0.24.0 // indirect
+	github.com/go-openapi/swag/typeutils v0.24.0 // indirect
+	github.com/go-openapi/swag/yamlutils v0.24.0 // indirect
+>>>>>>> 71fae0444 (UPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies)
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gnostic-models v0.7.0 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/go-containerregistry v0.20.6 // indirect
+<<<<<<< HEAD
 	github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6 // indirect
+=======
+	github.com/google/pprof v0.0.0-20251007162407-5df77e3f7d1d // indirect
+>>>>>>> 71fae0444 (UPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies)
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
 	github.com/h2non/filetype v1.1.3 // indirect
@@ -64,7 +97,7 @@ require (
 	github.com/joelanford/ignore v0.1.1 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.18.0 // indirect
+	github.com/klauspost/compress v1.18.1 // indirect
 	github.com/klauspost/pgzip v1.2.6 // indirect
 	github.com/letsencrypt/boulder v0.0.0-20250624003606-5ddd5acf990d // indirect
 	github.com/mailru/easyjson v0.9.0 // indirect
@@ -81,23 +114,32 @@ require (
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/runtime-spec v1.2.1 // indirect
+<<<<<<< HEAD
 	github.com/operator-framework/api v0.34.0 // indirect
+=======
+	github.com/operator-framework/api v0.36.0 // indirect
+>>>>>>> 71fae0444 (UPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies)
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/proglottis/gpgme v0.1.4 // indirect
+	github.com/proglottis/gpgme v0.1.5 // indirect
 	github.com/rivo/uniseg v0.4.7 // 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/sigstore/fulcio v1.7.1 // indirect
 	github.com/sigstore/protobuf-specs v0.4.3 // indirect
 	github.com/sigstore/sigstore v1.9.5 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/smallstep/pkcs7 v0.2.1 // indirect
 	github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect
 	github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
+<<<<<<< HEAD
 	github.com/ulikunitz/xz v0.5.14 // indirect
+=======
+	github.com/ulikunitz/xz v0.5.15 // indirect
+>>>>>>> 71fae0444 (UPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies)
 	github.com/vbatts/tar-split v0.12.1 // indirect
 	github.com/vbauerster/mpb/v8 v8.10.2 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	go.opencensus.io v0.24.0 // indirect
+<<<<<<< HEAD
 	go.yaml.in/yaml/v2 v2.4.2 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/crypto v0.41.0 // indirect
@@ -121,13 +163,41 @@ require (
 	k8s.io/api v0.33.4 // indirect
 	k8s.io/apiextensions-apiserver v0.33.4 // indirect
 	k8s.io/client-go v0.33.4 // indirect
+=======
+	go.yaml.in/yaml/v2 v2.4.3 // indirect
+	go.yaml.in/yaml/v3 v3.0.4 // indirect
+	golang.org/x/crypto v0.43.0 // indirect
+	golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
+	golang.org/x/mod v0.29.0 // indirect
+	golang.org/x/net v0.46.0 // indirect
+	golang.org/x/oauth2 v0.32.0 // indirect
+	golang.org/x/sync v0.18.0 // indirect
+	golang.org/x/sys v0.38.0 // indirect
+	golang.org/x/term v0.36.0 // indirect
+	golang.org/x/text v0.30.0 // indirect
+	golang.org/x/time v0.13.0 // indirect
+	golang.org/x/tools v0.38.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20251110190251-83f479183930 // indirect
+	google.golang.org/grpc v1.76.0 // indirect
+	google.golang.org/protobuf v1.36.10 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/warnings.v0 v0.1.2 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/api v0.34.1 // indirect
+	k8s.io/apiextensions-apiserver v0.34.1 // indirect
+	k8s.io/client-go v0.34.1 // indirect
+>>>>>>> 71fae0444 (UPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies)
 	k8s.io/klog/v2 v2.130.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
 	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
-	sigs.k8s.io/controller-runtime v0.21.0 // indirect
+	sigs.k8s.io/controller-runtime v0.22.4 // indirect
 	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
+<<<<<<< HEAD
 	sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
+=======
+>>>>>>> 71fae0444 (UPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and dependencies)
 	sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
 	sigs.k8s.io/yaml v1.6.0 // indirect
 )