Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
ab9c5f95
Commit
ab9c5f95
authored
Jan 21, 2023
by
Brad Davidson
Committed by
Brad Davidson
Jan 26, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bump cri-dockerd
Signed-off-by:
Brad Davidson
<
brad.davidson@rancher.com
>
parent
63445904
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
35 deletions
+34
-35
go.mod
go.mod
+34
-35
go.sum
go.sum
+0
-0
No files found.
go.mod
View file @
ab9c5f95
...
@@ -4,7 +4,7 @@ go 1.19
...
@@ -4,7 +4,7 @@ go 1.19
replace (
replace (
github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.8.22
github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.8.22
github.com/Mirantis/cri-dockerd => github.com/k3s-io/cri-dockerd v0.
2.4-0.20220826195316-d6cb76f15a6a
github.com/Mirantis/cri-dockerd => github.com/k3s-io/cri-dockerd v0.
3.1-0.20230121003254-7c72ab55b87e // k3s/release-1.25
github.com/cloudnativelabs/kube-router => github.com/k3s-io/kube-router v1.5.2-0.20221026101626-e01045262706
github.com/cloudnativelabs/kube-router => github.com/k3s-io/kube-router v1.5.2-0.20221026101626-e01045262706
github.com/containerd/cgroups => github.com/containerd/cgroups v1.0.1
github.com/containerd/cgroups => github.com/containerd/cgroups v1.0.1
github.com/containerd/containerd => github.com/k3s-io/containerd v1.5.16-k3s1
github.com/containerd/containerd => github.com/k3s-io/containerd v1.5.16-k3s1
...
@@ -83,7 +83,7 @@ require (
...
@@ -83,7 +83,7 @@ require (
github.com/google/cadvisor v0.45.0
github.com/google/cadvisor v0.45.0
github.com/google/uuid v1.3.0
github.com/google/uuid v1.3.0
github.com/gorilla/mux v1.8.0
github.com/gorilla/mux v1.8.0
github.com/gorilla/websocket v1.
4.2
github.com/gorilla/websocket v1.
5.0
github.com/gruntwork-io/terratest v0.40.6
github.com/gruntwork-io/terratest v0.40.6
github.com/json-iterator/go v1.1.12
github.com/json-iterator/go v1.1.12
github.com/k3s-io/helm-controller v0.13.1
github.com/k3s-io/helm-controller v0.13.1
...
@@ -118,12 +118,12 @@ require (
...
@@ -118,12 +118,12 @@ require (
go.etcd.io/etcd/client/v3 v3.5.4
go.etcd.io/etcd/client/v3 v3.5.4
go.etcd.io/etcd/etcdutl/v3 v3.5.4
go.etcd.io/etcd/etcdutl/v3 v3.5.4
go.etcd.io/etcd/server/v3 v3.5.4
go.etcd.io/etcd/server/v3 v3.5.4
go.uber.org/zap v1.
19
.0
go.uber.org/zap v1.
24
.0
golang.org/x/crypto v0.
0.0-20220829220503-c86fa9a7ed9
0
golang.org/x/crypto v0.
5.
0
golang.org/x/net v0.
3.1-0.20221206200815-1e63c2f08a1
0
golang.org/x/net v0.
5.
0
golang.org/x/sync v0.
0.0-20220722155255-886fb9371eb4
golang.org/x/sync v0.
1.0
golang.org/x/sys v0.
3
.0
golang.org/x/sys v0.
4
.0
google.golang.org/grpc v1.5
0.1
google.golang.org/grpc v1.5
1.0
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v2 v2.4.0
inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252
inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252
k8s.io/api v0.25.6
k8s.io/api v0.25.6
...
@@ -137,7 +137,7 @@ require (
...
@@ -137,7 +137,7 @@ require (
k8s.io/klog v1.0.0
k8s.io/klog v1.0.0
k8s.io/kubectl v0.25.6
k8s.io/kubectl v0.25.6
k8s.io/kubernetes v1.25.6
k8s.io/kubernetes v1.25.6
k8s.io/utils v0.0.0-20221
011040102-427025108f67
k8s.io/utils v0.0.0-20221
107191617-1a15be271d1d
sigs.k8s.io/yaml v1.3.0
sigs.k8s.io/yaml v1.3.0
)
)
...
@@ -162,8 +162,6 @@ require (
...
@@ -162,8 +162,6 @@ require (
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/Microsoft/hcsshim v0.9.4 // indirect
github.com/Microsoft/hcsshim v0.9.4 // indirect
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/Rican7/retry v0.1.0 // indirect
github.com/Rican7/retry v0.1.0 // indirect
github.com/agext/levenshtein v1.2.3 // indirect
github.com/agext/levenshtein v1.2.3 // indirect
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed // indirect
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed // indirect
...
@@ -177,7 +175,7 @@ require (
...
@@ -177,7 +175,7 @@ require (
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/bronze1man/goStrongswanVici v0.0.0-20201105010758-936f38b697fd // indirect
github.com/bronze1man/goStrongswanVici v0.0.0-20201105010758-936f38b697fd // indirect
github.com/canonical/go-dqlite v1.5.1 // indirect
github.com/canonical/go-dqlite v1.5.1 // indirect
github.com/cespare/xxhash/v2 v2.
1.2
// indirect
github.com/cespare/xxhash/v2 v2.
2.0
// indirect
github.com/chai2010/gettext-go v1.0.2 // indirect
github.com/chai2010/gettext-go v1.0.2 // indirect
github.com/checkpoint-restore/go-criu/v5 v5.3.0 // indirect
github.com/checkpoint-restore/go-criu/v5 v5.3.0 // indirect
github.com/cilium/ebpf v0.7.0 // indirect
github.com/cilium/ebpf v0.7.0 // indirect
...
@@ -193,7 +191,7 @@ require (
...
@@ -193,7 +191,7 @@ require (
github.com/containerd/stargz-snapshotter/estargz v0.13.0 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.13.0 // indirect
github.com/containerd/ttrpc v1.1.0 // indirect
github.com/containerd/ttrpc v1.1.0 // indirect
github.com/containerd/typeurl v1.0.2 // indirect
github.com/containerd/typeurl v1.0.2 // indirect
github.com/containernetworking/cni v1.1.
1
// indirect
github.com/containernetworking/cni v1.1.
2
// indirect
github.com/containernetworking/plugins v1.1.1 // indirect
github.com/containernetworking/plugins v1.1.1 // indirect
github.com/containers/ocicrypt v1.1.3 // indirect
github.com/containers/ocicrypt v1.1.3 // indirect
github.com/coreos/go-oidc v2.1.0+incompatible // indirect
github.com/coreos/go-oidc v2.1.0+incompatible // indirect
...
@@ -209,9 +207,9 @@ require (
...
@@ -209,9 +207,9 @@ require (
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
github.com/docker/go-metrics v0.0.1 // indirect
github.com/docker/go-metrics v0.0.1 // indirect
github.com/docker/go-units v0.
4
.0 // indirect
github.com/docker/go-units v0.
5
.0 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/emicklei/go-restful v2.
9.5
+incompatible // indirect
github.com/emicklei/go-restful v2.
16.0
+incompatible // indirect
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
...
@@ -225,9 +223,9 @@ require (
...
@@ -225,9 +223,9 @@ require (
github.com/go-errors/errors v1.0.2-0.20180813162953-d98b870cc4e0 // indirect
github.com/go-errors/errors v1.0.2-0.20180813162953-d98b870cc4e0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.
19.5
// indirect
github.com/go-openapi/jsonreference v0.
20.0
// indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/godbus/dbus/v5 v5.
0.6
// indirect
github.com/godbus/dbus/v5 v5.
1.0
// indirect
github.com/gofrs/flock v0.8.1 // indirect
github.com/gofrs/flock v0.8.1 // indirect
github.com/gofrs/uuid v4.0.0+incompatible // indirect
github.com/gofrs/uuid v4.0.0+incompatible // indirect
github.com/gogo/googleapis v1.4.0 // indirect
github.com/gogo/googleapis v1.4.0 // indirect
...
@@ -236,10 +234,10 @@ require (
...
@@ -236,10 +234,10 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/btree v1.
0.1
// indirect
github.com/google/btree v1.
1.2
// indirect
github.com/google/cel-go v0.12.6 // indirect
github.com/google/cel-go v0.12.6 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/go-cmp v0.5.
8
// indirect
github.com/google/go-cmp v0.5.
9
// indirect
github.com/google/go-containerregistry v0.6.1-0.20211111182346-7a6ee45528a9 // indirect
github.com/google/go-containerregistry v0.6.1-0.20211111182346-7a6ee45528a9 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
...
@@ -260,10 +258,10 @@ require (
...
@@ -260,10 +258,10 @@ require (
github.com/hashicorp/hcl/v2 v2.9.1 // indirect
github.com/hashicorp/hcl/v2 v2.9.1 // indirect
github.com/hashicorp/terraform-json v0.13.0 // indirect
github.com/hashicorp/terraform-json v0.13.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.
0
.0 // indirect
github.com/inconshreveable/mousetrap v1.
1
.0 // indirect
github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a // indirect
github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/jonboulle/clockwork v0.
2.2
// indirect
github.com/jonboulle/clockwork v0.
3.0
// indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect
github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect
github.com/karrick/godirwalk v1.16.1 // indirect
github.com/karrick/godirwalk v1.16.1 // indirect
...
@@ -273,7 +271,7 @@ require (
...
@@ -273,7 +271,7 @@ require (
github.com/lithammer/dedent v1.1.0 // indirect
github.com/lithammer/dedent v1.1.0 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/mattn/go-zglob v0.0.2-0.20190814121620-e3c945676326 // indirect
github.com/mattn/go-zglob v0.0.2-0.20190814121620-e3c945676326 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.
2-0.20181231171920-c182affec369
// indirect
github.com/matttproud/golang_protobuf_extensions v1.0.
4
// indirect
github.com/mdlayher/genetlink v1.1.0 // indirect
github.com/mdlayher/genetlink v1.1.0 // indirect
github.com/mdlayher/netlink v1.4.2 // indirect
github.com/mdlayher/netlink v1.4.2 // indirect
github.com/mdlayher/socket v0.0.0-20211102153432-57e3fa563ecb // indirect
github.com/mdlayher/socket v0.0.0-20211102153432-57e3fa563ecb // indirect
...
@@ -314,8 +312,9 @@ require (
...
@@ -314,8 +312,9 @@ require (
github.com/pquerna/cachecontrol v0.1.0 // indirect
github.com/pquerna/cachecontrol v0.1.0 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/common v0.39.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/rs/xid v1.4.0 // indirect
github.com/rs/xid v1.4.0 // indirect
github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021 // indirect
github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021 // indirect
github.com/russross/blackfriday v1.5.2 // indirect
github.com/russross/blackfriday v1.5.2 // indirect
...
@@ -324,20 +323,20 @@ require (
...
@@ -324,20 +323,20 @@ require (
github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 // indirect
github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 // indirect
github.com/shengdoushi/base58 v1.0.0 // indirect
github.com/shengdoushi/base58 v1.0.0 // indirect
github.com/soheilhy/cmux v0.1.5 // indirect
github.com/soheilhy/cmux v0.1.5 // indirect
github.com/spf13/cobra v1.
4.0
// indirect
github.com/spf13/cobra v1.
6.1
// indirect
github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980 // indirect
github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980 // indirect
github.com/stoewer/go-strcase v1.2.0 // indirect
github.com/stoewer/go-strcase v1.2.0 // indirect
github.com/stretchr/objx v0.4.0 // indirect
github.com/stretchr/objx v0.4.0 // indirect
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
github.com/tchap/go-patricia v2.3.0+incompatible // indirect
github.com/tchap/go-patricia v2.3.0+incompatible // indirect
github.com/tmc/grpc-websocket-proxy v0.0.0-202
01229170055-e5319fda7802
// indirect
github.com/tmc/grpc-websocket-proxy v0.0.0-202
20101234140-673ab2c3ae75
// indirect
github.com/tmccombs/hcl2json v0.3.3 // indirect
github.com/tmccombs/hcl2json v0.3.3 // indirect
github.com/ulikunitz/xz v0.5.8 // indirect
github.com/ulikunitz/xz v0.5.8 // indirect
github.com/urfave/cli/v2 v2.11.2 // indirect
github.com/urfave/cli/v2 v2.11.2 // indirect
github.com/vbatts/tar-split v0.11.2 // indirect
github.com/vbatts/tar-split v0.11.2 // indirect
github.com/vishvananda/netns v0.0.
0-20211101163701-50045581ed74
// indirect
github.com/vishvananda/netns v0.0.
1
// indirect
github.com/vmware/govmomi v0.20.3 // indirect
github.com/vmware/govmomi v0.20.3 // indirect
github.com/xiang90/probing v0.0.0-20
190116061207-43a291ad63a2
// indirect
github.com/xiang90/probing v0.0.0-20
221125231312-a49e3df8f510
// indirect
github.com/xlab/treeprint v1.1.0 // indirect
github.com/xlab/treeprint v1.1.0 // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
github.com/zclconf/go-cty v1.9.1 // indirect
github.com/zclconf/go-cty v1.9.1 // indirect
...
@@ -360,13 +359,13 @@ require (
...
@@ -360,13 +359,13 @@ require (
go.opentelemetry.io/otel/trace v0.20.0 // indirect
go.opentelemetry.io/otel/trace v0.20.0 // indirect
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
go.uber.org/atomic v1.
7
.0 // indirect
go.uber.org/atomic v1.
10
.0 // indirect
go.uber.org/multierr v1.
6
.0 // indirect
go.uber.org/multierr v1.
9
.0 // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/oauth2 v0.
0.0-20220223155221-ee480838109b
// indirect
golang.org/x/oauth2 v0.
3.0
// indirect
golang.org/x/term v0.
3
.0 // indirect
golang.org/x/term v0.
4
.0 // indirect
golang.org/x/text v0.
5
.0 // indirect
golang.org/x/text v0.
6
.0 // indirect
golang.org/x/time v0.
0.0-20220210224613-90d013bbcef8
// indirect
golang.org/x/time v0.
3.0
// indirect
golang.org/x/tools v0.1.12 // indirect
golang.org/x/tools v0.1.12 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
golang.zx2c4.com/wireguard v0.0.0-20220117163742-e0b8f11489c5 // indirect
golang.zx2c4.com/wireguard v0.0.0-20220117163742-e0b8f11489c5 // indirect
...
@@ -374,7 +373,7 @@ require (
...
@@ -374,7 +373,7 @@ require (
gonum.org/v1/gonum v0.6.2 // indirect
gonum.org/v1/gonum v0.6.2 // indirect
google.golang.org/api v0.60.0 // indirect
google.golang.org/api v0.60.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-202
20502173005-c8bf987b8c21
// indirect
google.golang.org/genproto v0.0.0-202
30106154932-a12b697841d9
// indirect
google.golang.org/protobuf v1.28.1 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/gcfg.v1 v1.2.0 // indirect
gopkg.in/gcfg.v1 v1.2.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
...
...
go.sum
View file @
ab9c5f95
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment