Merge pull request openshift#7942 from r4f4/bump-containerd

 OCPBUGS-27507: bump containerd for vulnerability fix

Author: openshift-merge-bot[bot]

go.mod

@@ -96,7 +96,7 @@ require (
 	golang.org/x/term v0.13.0
 	google.golang.org/api v0.130.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5
-	google.golang.org/grpc v1.58.2
+	google.golang.org/grpc v1.58.3
 	gopkg.in/ini.v1 v1.67.0
 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/api v0.29.0
@@ -171,7 +171,7 @@ require (
 	github.com/google/s2a-go v0.1.4 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
 	github.com/googleapis/gax-go/v2 v2.11.0 // indirect
-	github.com/hashicorp/errwrap v1.0.0 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-retryablehttp v0.7.4 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
@@ -308,7 +308,8 @@ replace github.com/prometheus/client_golang => github.com/prometheus/client_gola
 replace golang.org/x/net => golang.org/x/net v0.5.0
 
 // https://issues.redhat.com/browse/OCPBUGS-8119
-replace github.com/containerd/containerd => github.com/containerd/containerd v1.5.18
+// https://issues.redhat.com/browse/OCPBUGS-27507
+replace github.com/containerd/containerd => github.com/containerd/containerd v1.6.26
 
 // https://issues.redhat.com/browse/OCPBUGS-8540
 replace go.mongodb.org/mongo-driver => go.mongodb.org/mongo-driver v1.11.2

go.sum

@@ -657,7 +657,7 @@ github.com/gophercloud/utils/openstack/networking/v2/networks
 github.com/h2non/filetype/matchers
 github.com/h2non/filetype/matchers/isobmff
 github.com/h2non/filetype/types
-# github.com/hashicorp/errwrap v1.0.0
+# github.com/hashicorp/errwrap v1.1.0
 ## explicit
 github.com/hashicorp/errwrap
 # github.com/hashicorp/go-cleanhttp v0.5.2
@@ -9234,7 +9234,7 @@ google.golang.org/genproto/googleapis/api/monitoredres
 google.golang.org/genproto/googleapis/rpc/code
 google.golang.org/genproto/googleapis/rpc/errdetails
 google.golang.org/genproto/googleapis/rpc/status
-# google.golang.org/grpc v1.58.2
+# google.golang.org/grpc v1.58.3
 ## explicit; go 1.19
 google.golang.org/grpc
 google.golang.org/grpc/attributes
@@ -9816,5 +9816,5 @@ sigs.k8s.io/yaml
 # github.com/Masterminds/goutils => github.com/Masterminds/goutils v1.1.1
 # github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.17.0
 # golang.org/x/net => golang.org/x/net v0.5.0
-# github.com/containerd/containerd => github.com/containerd/containerd v1.5.18
+# github.com/containerd/containerd => github.com/containerd/containerd v1.6.26
 # go.mongodb.org/mongo-driver => go.mongodb.org/mongo-driver v1.11.2