Skip to content

Commit 809661c

Browse files
sayan-biswassayan-biswas
committed
Update core dependencies (CVE fixes)
Changes: - Update go version - Update docker dependency - Adjust code for deprecated docker APIs
1 parent f68cc16 commit 809661c

File tree

905 files changed

+41476
-51691
lines changed

Some content is hidden

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

905 files changed

+41476
-51691
lines changed

‎.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: release
33
namespace: openshift
4-
tag: rhel-9-release-golang-1.20-openshift-4.15
4+
tag: rhel-8-golang-1.21-openshift-4.16

‎go.mod

Lines changed: 44 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,85 @@
11
module github.com/openshift/source-to-image
22

3-
go 1.20
3+
go 1.21.0
44

55
require (
6-
github.com/containers/image/v5 v5.29.0
7-
github.com/distribution/reference v0.5.0
8-
github.com/docker/docker v26.1.3+incompatible
9-
github.com/docker/go-connections v0.4.0
6+
github.com/containers/image/v5 v5.31.1
7+
github.com/distribution/reference v0.6.0
8+
github.com/docker/docker v27.3.1+incompatible
9+
github.com/docker/go-connections v0.5.0
1010
github.com/go-imports-organizer/goio v1.3.3
11-
github.com/moby/buildkit v0.12.4
12-
github.com/opencontainers/image-spec v1.1.0-rc5
13-
github.com/spf13/cobra v1.8.0
11+
github.com/moby/buildkit v0.16.0
12+
github.com/opencontainers/image-spec v1.1.0
13+
github.com/spf13/cobra v1.8.1
1414
github.com/spf13/pflag v1.0.5
15-
golang.org/x/net v0.19.0
16-
k8s.io/klog/v2 v2.110.1
15+
golang.org/x/net v0.29.0
16+
k8s.io/klog/v2 v2.130.1
1717
)
1818

1919
require (
2020
dario.cat/mergo v1.0.0 // indirect
21-
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
22-
github.com/BurntSushi/toml v1.3.2 // indirect
23-
github.com/Microsoft/go-winio v0.6.1 // indirect
24-
github.com/Microsoft/hcsshim v0.12.0-rc.1 // indirect
25-
github.com/containerd/cgroups/v3 v3.0.2 // indirect
26-
github.com/containerd/containerd v1.7.11 // indirect
21+
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
22+
github.com/BurntSushi/toml v1.4.0 // indirect
23+
github.com/Microsoft/go-winio v0.6.2 // indirect
24+
github.com/Microsoft/hcsshim v0.12.7 // indirect
25+
github.com/containerd/cgroups/v3 v3.0.3 // indirect
26+
github.com/containerd/errdefs v0.2.0 // indirect
2727
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
28-
github.com/containerd/typeurl/v2 v2.1.1 // indirect
28+
github.com/containerd/typeurl/v2 v2.2.0 // indirect
2929
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
30-
github.com/containers/ocicrypt v1.1.9 // indirect
31-
github.com/containers/storage v1.51.0 // indirect
32-
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
30+
github.com/containers/ocicrypt v1.2.0 // indirect
31+
github.com/containers/storage v1.54.0 // indirect
32+
github.com/cyphar/filepath-securejoin v0.3.1 // indirect
3333
github.com/docker/distribution v2.8.3+incompatible // indirect
34-
github.com/docker/docker-credential-helpers v0.8.0 // indirect
34+
github.com/docker/docker-credential-helpers v0.8.2 // indirect
3535
github.com/docker/go-units v0.5.0 // indirect
36-
github.com/felixge/httpsnoop v1.0.3 // indirect
37-
github.com/go-logr/logr v1.3.0 // indirect
36+
github.com/felixge/httpsnoop v1.0.4 // indirect
37+
github.com/go-logr/logr v1.4.2 // indirect
3838
github.com/go-logr/stdr v1.2.2 // indirect
3939
github.com/gogo/protobuf v1.3.2 // indirect
4040
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
41-
github.com/golang/protobuf v1.5.3 // indirect
42-
github.com/google/go-containerregistry v0.16.1 // indirect
41+
github.com/google/go-containerregistry v0.20.1 // indirect
4342
github.com/google/go-intervals v0.0.2 // indirect
44-
github.com/google/uuid v1.3.1 // indirect
45-
github.com/gorilla/mux v1.8.0 // indirect
43+
github.com/google/uuid v1.6.0 // indirect
44+
github.com/gorilla/mux v1.8.1 // indirect
4645
github.com/hashicorp/errwrap v1.1.0 // indirect
4746
github.com/hashicorp/go-multierror v1.1.1 // indirect
4847
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4948
github.com/json-iterator/go v1.1.12 // indirect
50-
github.com/klauspost/compress v1.17.3 // indirect
49+
github.com/klauspost/compress v1.17.10 // indirect
5150
github.com/klauspost/pgzip v1.2.6 // indirect
5251
github.com/kr/text v0.2.0 // indirect
53-
github.com/mattn/go-shellwords v1.0.12 // indirect
5452
github.com/mistifyio/go-zfs/v3 v3.0.1 // indirect
5553
github.com/moby/docker-image-spec v1.3.1 // indirect
56-
github.com/moby/sys/mountinfo v0.7.1 // indirect
54+
github.com/moby/sys/mountinfo v0.7.2 // indirect
55+
github.com/moby/sys/user v0.3.0 // indirect
5756
github.com/moby/term v0.5.0 // indirect
5857
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5958
github.com/modern-go/reflect2 v1.0.2 // indirect
6059
github.com/morikuni/aec v1.0.0 // indirect
6160
github.com/opencontainers/go-digest v1.0.0 // indirect
62-
github.com/opencontainers/runc v1.1.10 // indirect
63-
github.com/opencontainers/runtime-spec v1.1.0 // indirect
61+
github.com/opencontainers/runtime-spec v1.2.0 // indirect
6462
github.com/opencontainers/selinux v1.11.0 // indirect
6563
github.com/ostreedev/ostree-go v0.0.0-20210805093236-719684c64e4f // indirect
6664
github.com/pkg/errors v0.9.1 // indirect
6765
github.com/rogpeppe/go-internal v1.11.0 // indirect
6866
github.com/sirupsen/logrus v1.9.3 // indirect
69-
github.com/sylabs/sif/v2 v2.15.0 // indirect
67+
github.com/sylabs/sif/v2 v2.18.0 // indirect
7068
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
7169
github.com/tchap/go-patricia/v2 v2.3.1 // indirect
72-
github.com/ulikunitz/xz v0.5.11 // indirect
73-
github.com/vbatts/tar-split v0.11.5 // indirect
70+
github.com/ulikunitz/xz v0.5.12 // indirect
71+
github.com/vbatts/tar-split v0.11.6 // indirect
7472
go.opencensus.io v0.24.0 // indirect
75-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
76-
go.opentelemetry.io/otel v1.19.0 // indirect
77-
go.opentelemetry.io/otel/metric v1.19.0 // indirect
78-
go.opentelemetry.io/otel/trace v1.19.0 // indirect
79-
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
80-
golang.org/x/mod v0.13.0 // indirect
81-
golang.org/x/sync v0.5.0 // indirect
82-
golang.org/x/sys v0.15.0 // indirect
83-
golang.org/x/tools v0.14.0 // indirect
84-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect
85-
google.golang.org/grpc v1.58.3 // indirect
86-
google.golang.org/protobuf v1.31.0 // indirect
73+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
74+
go.opentelemetry.io/otel v1.28.0 // indirect
75+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
76+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
77+
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
78+
golang.org/x/mod v0.18.0 // indirect
79+
golang.org/x/sync v0.8.0 // indirect
80+
golang.org/x/sys v0.25.0 // indirect
81+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240930140551-af27646dc61f // indirect
82+
google.golang.org/grpc v1.67.0 // indirect
83+
google.golang.org/protobuf v1.34.2 // indirect
8784
gopkg.in/yaml.v3 v3.0.1 // indirect
8885
)

0 commit comments

Comments
 (0)