Skip to content

Commit aa877d7

Browse files
estespestesp
authored
Merge pull request #3998 from dmcgowan/bump-cri-1.3
[release/1.3] Bump CRI 1.3 branch
2 parents 8366042 + db4c58b commit aa877d7

34 files changed

Lines changed: 516 additions & 235 deletions

File tree

‎vendor.conf‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ github.com/cpuguy83/go-md2man v1.0.10
5151
github.com/russross/blackfriday v1.5.2
5252

5353
# cri dependencies
54-
github.com/containerd/cri b1bef15fbeb6c6f0569b67322acfa74ca3597755 # release/1.3
54+
github.com/containerd/cri e120c0f9d87639b7bef007a7dbea8043f9a2ab6a # release/1.3
5555
github.com/containerd/go-cni 49fbd9b210f3c8ee3b7fd3cd797aabaf364627c1
5656
github.com/containernetworking/cni v0.7.1
5757
github.com/containernetworking/plugins v0.7.6
@@ -61,25 +61,25 @@ github.com/docker/docker 86f080cff0914e9694068ed78d503701667c4c00
6161
github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528
6262
github.com/emicklei/go-restful v2.9.5
6363
github.com/google/gofuzz v1.0.0
64-
github.com/json-iterator/go v1.1.7
64+
github.com/json-iterator/go v1.1.8
6565
github.com/modern-go/reflect2 1.0.1
6666
github.com/modern-go/concurrent 1.0.3
6767
github.com/opencontainers/selinux 5215b1806f52b1fcc2070a8826c542c9d33cd3cf
6868
github.com/seccomp/libseccomp-golang v0.9.1
6969
github.com/tchap/go-patricia v2.2.6
7070
golang.org/x/crypto 69ecbb4d6d5dab05e49161c6e77ea40a030884e1
7171
golang.org/x/oauth2 0f29369cfe4552d0e4bcddc57cc75f4d7e672a33
72-
golang.org/x/time 85acf8d2951cb2a3bde7632f9ff273ef0379bcbd
73-
gopkg.in/inf.v0 v0.9.0
74-
gopkg.in/yaml.v2 v2.2.2
75-
k8s.io/api kubernetes-1.16.0-rc.2
76-
k8s.io/apimachinery kubernetes-1.16.0-rc.2
77-
k8s.io/apiserver kubernetes-1.16.0-rc.2
78-
k8s.io/cri-api kubernetes-1.16.0-rc.2
79-
k8s.io/client-go kubernetes-1.16.0-rc.2
80-
k8s.io/klog v0.4.0
81-
k8s.io/kubernetes v1.16.0-rc.2
82-
k8s.io/utils c2654d5206da6b7b6ace12841e8f359bb89b443c
72+
golang.org/x/time 9d24e82272b4f38b78bc8cff74fa936d31ccd8ef
73+
gopkg.in/inf.v0 v0.9.1
74+
gopkg.in/yaml.v2 v2.2.4
75+
k8s.io/api kubernetes-1.16.6
76+
k8s.io/apimachinery kubernetes-1.16.6
77+
k8s.io/apiserver kubernetes-1.16.6
78+
k8s.io/cri-api kubernetes-1.16.6
79+
k8s.io/client-go kubernetes-1.16.6
80+
k8s.io/klog v1.0.0
81+
k8s.io/kubernetes v1.16.6
82+
k8s.io/utils e782cd3c129fc98ee807f3c889c0f26eb7c9daf5
8383
sigs.k8s.io/yaml v1.1.0
8484

8585
# zfs dependencies

‎vendor/github.com/containerd/cri/cri.go‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/cri/pkg/server/events.go‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/cri/pkg/server/helpers.go‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/cri/pkg/server/restart.go‎

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/cri/pkg/server/sandbox_run.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/cri/pkg/store/container/status.go‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/cri/vendor.conf‎

Lines changed: 62 additions & 57 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/json-iterator/go/iter.go‎

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/json-iterator/go/iter_array.go‎

Lines changed: 8 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)