Skip to content

Commit 9557cf3

Browse files
Merge pull request #2277 from rh-roman/switch-container-deps
NO-JIRA: Switch container dependencies to Podman monorepo
2 parents a052bd4 + b3d656c commit 9557cf3

479 files changed

Lines changed: 31172 additions & 43043 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

go.mod

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/openshift/oc
22

3-
go 1.25.0
3+
go 1.25.6
44

55
require (
66
al.essio.dev/pkg/shellescape v1.6.0
@@ -16,8 +16,6 @@ require (
1616
github.com/aws/aws-sdk-go-v2/service/s3 v1.96.4
1717
github.com/aws/smithy-go v1.24.2
1818
github.com/blang/semver v3.5.1+incompatible
19-
github.com/containers/image/v5 v5.36.2
20-
github.com/containers/storage v1.59.1
2119
github.com/coreos/go-oidc/v3 v3.18.0
2220
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
2321
github.com/distribution/distribution/v3 v3.0.0-20230519140516-983358f8e250
@@ -51,12 +49,14 @@ require (
5149
github.com/spf13/cobra v1.10.2
5250
github.com/spf13/pflag v1.0.10
5351
github.com/vincent-petithory/dataurl v1.0.0
54-
golang.org/x/crypto v0.49.0
55-
golang.org/x/net v0.52.0
52+
go.podman.io/image/v5 v5.40.0
53+
go.podman.io/storage v1.63.0
54+
golang.org/x/crypto v0.51.0
55+
golang.org/x/net v0.54.0
5656
golang.org/x/oauth2 v0.36.0
5757
golang.org/x/sync v0.20.0
58-
golang.org/x/sys v0.42.0
59-
golang.org/x/term v0.41.0
58+
golang.org/x/sys v0.44.0
59+
golang.org/x/term v0.43.0
6060
k8s.io/api v0.35.2
6161
k8s.io/apiextensions-apiserver v0.35.2
6262
k8s.io/apimachinery v0.35.2
@@ -73,10 +73,10 @@ require (
7373

7474
require (
7575
cel.dev/expr v0.24.0 // indirect
76-
cyphar.com/go-pathrs v0.2.1 // indirect
76+
cyphar.com/go-pathrs v0.2.4 // indirect
7777
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
7878
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
79-
github.com/BurntSushi/toml v1.5.0 // indirect
79+
github.com/BurntSushi/toml v1.6.0 // indirect
8080
github.com/Microsoft/go-winio v0.6.2 // indirect
8181
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
8282
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.6 // indirect
@@ -101,12 +101,12 @@ require (
101101
github.com/containerd/log v0.1.0 // indirect
102102
github.com/containerd/typeurl/v2 v2.2.3 // indirect
103103
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
104-
github.com/containers/ocicrypt v1.2.1 // indirect
104+
github.com/containers/ocicrypt v1.3.0 // indirect
105105
github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 // indirect
106-
github.com/cyphar/filepath-securejoin v0.6.0 // indirect
106+
github.com/cyphar/filepath-securejoin v0.6.1 // indirect
107107
github.com/distribution/reference v0.6.0 // indirect
108-
github.com/docker/docker-credential-helpers v0.9.3 // indirect
109-
github.com/docker/go-connections v0.5.0 // indirect
108+
github.com/docker/docker-credential-helpers v0.9.7 // indirect
109+
github.com/docker/go-connections v0.7.0 // indirect
110110
github.com/docker/go-metrics v0.0.1 // indirect
111111
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
112112
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
@@ -135,7 +135,7 @@ require (
135135
github.com/google/btree v1.1.3 // indirect
136136
github.com/google/cel-go v0.26.0 // indirect
137137
github.com/google/gnostic-models v0.7.0 // indirect
138-
github.com/google/go-containerregistry v0.20.3 // indirect
138+
github.com/google/go-containerregistry v0.21.1 // indirect
139139
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
140140
github.com/google/uuid v1.6.0 // indirect
141141
github.com/gorilla/mux v1.8.1 // indirect
@@ -148,14 +148,14 @@ require (
148148
github.com/jonboulle/clockwork v0.5.0 // indirect
149149
github.com/josharian/intern v1.0.0 // indirect
150150
github.com/json-iterator/go v1.1.12 // indirect
151-
github.com/klauspost/compress v1.18.0 // indirect
152-
github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec // indirect
151+
github.com/klauspost/compress v1.18.6 // indirect
153152
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
154153
github.com/lithammer/dedent v1.1.0 // indirect
155154
github.com/mailru/easyjson v0.7.7 // indirect
156155
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
157156
github.com/moby/docker-image-spec v1.3.1 // indirect
158157
github.com/moby/go-archive v0.1.0 // indirect
158+
github.com/moby/moby/client v0.4.1 // indirect
159159
github.com/moby/patternmatcher v0.6.0 // indirect
160160
github.com/moby/spdystream v0.5.0 // indirect
161161
github.com/moby/sys/atomicwriter v0.1.0 // indirect
@@ -169,39 +169,38 @@ require (
169169
github.com/morikuni/aec v1.0.0 // indirect
170170
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
171171
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
172-
github.com/opencontainers/runtime-spec v1.2.1 // indirect
173-
github.com/opencontainers/selinux v1.13.0 // indirect
172+
github.com/opencontainers/runtime-spec v1.3.0 // indirect
173+
github.com/opencontainers/selinux v1.14.1 // indirect
174174
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
175175
github.com/pkg/errors v0.9.1 // indirect
176176
github.com/pkg/profile v1.7.0 // indirect
177177
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
178-
github.com/proglottis/gpgme v0.1.4 // indirect
178+
github.com/proglottis/gpgme v0.1.6 // indirect
179179
github.com/prometheus/client_model v0.6.2 // indirect
180-
github.com/prometheus/common v0.66.1 // indirect
180+
github.com/prometheus/common v0.67.5 // indirect
181181
github.com/prometheus/procfs v0.16.1 // indirect
182182
github.com/robfig/cron v1.2.0 // indirect
183183
github.com/russross/blackfriday/v2 v2.1.0 // indirect
184-
github.com/secure-systems-lab/go-securesystemslib v0.9.0 // indirect
185-
github.com/sigstore/fulcio v1.6.6 // indirect
186-
github.com/sigstore/protobuf-specs v0.4.1 // indirect
187-
github.com/sigstore/sigstore v1.9.5 // indirect
188-
github.com/sirupsen/logrus v1.9.3 // indirect
184+
github.com/secure-systems-lab/go-securesystemslib v0.11.0 // indirect
185+
github.com/sigstore/fulcio v1.8.5 // indirect
186+
github.com/sigstore/protobuf-specs v0.5.0 // indirect
187+
github.com/sigstore/sigstore v1.10.6 // indirect
188+
github.com/sirupsen/logrus v1.9.4 // indirect
189189
github.com/stoewer/go-strcase v1.3.0 // indirect
190190
github.com/stretchr/testify v1.11.1 // indirect
191-
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
192191
github.com/x448/float16 v0.8.4 // indirect
193192
github.com/xlab/treeprint v1.2.0 // indirect
194-
go.opentelemetry.io/otel v1.36.0 // indirect
195-
go.opentelemetry.io/otel/trace v1.36.0 // indirect
193+
go.opentelemetry.io/otel v1.43.0 // indirect
194+
go.opentelemetry.io/otel/trace v1.43.0 // indirect
196195
go.yaml.in/yaml/v2 v2.4.3 // indirect
197196
go.yaml.in/yaml/v3 v3.0.4 // indirect
198197
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
199-
golang.org/x/text v0.35.0 // indirect
200-
golang.org/x/time v0.11.0 // indirect
201-
golang.org/x/tools v0.42.0 // indirect
202-
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
203-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
204-
google.golang.org/protobuf v1.36.8 // indirect
198+
golang.org/x/text v0.37.0 // indirect
199+
golang.org/x/time v0.14.0 // indirect
200+
golang.org/x/tools v0.44.0 // indirect
201+
google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 // indirect
202+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect
203+
google.golang.org/protobuf v1.36.11 // indirect
205204
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
206205
gopkg.in/inf.v0 v0.9.1 // indirect
207206
gopkg.in/warnings.v0 v0.1.2 // indirect

0 commit comments

Comments
 (0)