From 41f184f15b1395f12982546df029a93d99e7b521 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Fri, 19 Jun 2020 16:17:00 -0400 Subject: [PATCH] Update vendor.conf to kubernetes 1.19.0-beta.2 update streaming import path switch remote package path Signed-off-by: Davanum Srinivas --- cri.go | 2 +- integration/main_test.go | 2 +- pkg/config/config_unix.go | 2 +- pkg/config/config_windows.go | 2 +- pkg/server/service.go | 2 +- pkg/server/streaming.go | 2 +- vendor.conf | 34 ++++++++++++++++++---------------- 7 files changed, 24 insertions(+), 22 deletions(-) diff --git a/cri.go b/cri.go index 0e7de77be..7d9cc5fc7 100644 --- a/cri.go +++ b/cri.go @@ -37,7 +37,7 @@ import ( imagespec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" "github.com/sirupsen/logrus" - "k8s.io/klog" + "k8s.io/klog/v2" criconfig "github.com/containerd/cri/pkg/config" "github.com/containerd/cri/pkg/constants" diff --git a/integration/main_test.go b/integration/main_test.go index a376aeb3f..d31583a12 100644 --- a/integration/main_test.go +++ b/integration/main_test.go @@ -36,7 +36,7 @@ import ( "google.golang.org/grpc" "k8s.io/cri-api/pkg/apis" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "k8s.io/kubernetes/pkg/kubelet/remote" + "k8s.io/kubernetes/pkg/kubelet/cri/remote" kubeletutil "k8s.io/kubernetes/pkg/kubelet/util" criconfig "github.com/containerd/cri/pkg/config" diff --git a/pkg/config/config_unix.go b/pkg/config/config_unix.go index ce441c612..77c9b2d93 100644 --- a/pkg/config/config_unix.go +++ b/pkg/config/config_unix.go @@ -20,7 +20,7 @@ package config import ( "github.com/containerd/containerd" - "k8s.io/kubernetes/pkg/kubelet/server/streaming" + "k8s.io/kubernetes/pkg/kubelet/cri/streaming" ) // DefaultConfig returns default configurations of cri plugin. diff --git a/pkg/config/config_windows.go b/pkg/config/config_windows.go index a5a44a084..737b66e7a 100644 --- a/pkg/config/config_windows.go +++ b/pkg/config/config_windows.go @@ -23,7 +23,7 @@ import ( "path/filepath" "github.com/containerd/containerd" - "k8s.io/kubernetes/pkg/kubelet/server/streaming" + "k8s.io/kubernetes/pkg/kubelet/cri/streaming" ) // DefaultConfig returns default configurations of cri plugin. diff --git a/pkg/server/service.go b/pkg/server/service.go index 43512ff97..bc22d3a5b 100644 --- a/pkg/server/service.go +++ b/pkg/server/service.go @@ -33,7 +33,7 @@ import ( "github.com/sirupsen/logrus" "google.golang.org/grpc" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "k8s.io/kubernetes/pkg/kubelet/server/streaming" + "k8s.io/kubernetes/pkg/kubelet/cri/streaming" "github.com/containerd/cri/pkg/store/label" diff --git a/pkg/server/streaming.go b/pkg/server/streaming.go index 120850564..7c5ecf04f 100644 --- a/pkg/server/streaming.go +++ b/pkg/server/streaming.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/tools/remotecommand" k8scert "k8s.io/client-go/util/cert" - "k8s.io/kubernetes/pkg/kubelet/server/streaming" + "k8s.io/kubernetes/pkg/kubelet/cri/streaming" "k8s.io/utils/exec" ctrdutil "github.com/containerd/cri/pkg/containerd/util" diff --git a/vendor.conf b/vendor.conf index 564e13e7c..f2a105500 100644 --- a/vendor.conf +++ b/vendor.conf @@ -39,10 +39,10 @@ github.com/opencontainers/image-spec v1.0.1 github.com/opencontainers/runc v1.0.0-rc10 github.com/opencontainers/runtime-spec v1.0.2 github.com/pkg/errors v0.9.1 -github.com/prometheus/client_golang v1.3.0 -github.com/prometheus/client_model v0.1.0 -github.com/prometheus/common v0.7.0 -github.com/prometheus/procfs v0.0.8 +github.com/prometheus/client_golang v1.6.0 +github.com/prometheus/client_model v0.2.0 +github.com/prometheus/common v0.9.1 +github.com/prometheus/procfs v0.0.11 github.com/russross/blackfriday v1.5.2 github.com/sirupsen/logrus v1.6.0 github.com/syndtr/gocapability d98352740cb2c55f81556b63d4a1ec64c5a319c2 @@ -63,26 +63,28 @@ github.com/cilium/ebpf 4032b1d8aae306b7bb94a2a11002 github.com/davecgh/go-spew v1.1.1 github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528 github.com/emicklei/go-restful v2.9.5 +github.com/go-logr/logr v0.2.0 github.com/google/gofuzz v1.1.0 -github.com/json-iterator/go v1.1.8 +github.com/json-iterator/go v1.1.9 github.com/modern-go/concurrent 1.0.3 github.com/modern-go/reflect2 v1.0.1 github.com/pmezard/go-difflib v1.0.0 github.com/seccomp/libseccomp-golang v0.9.1 github.com/stretchr/testify v1.4.0 golang.org/x/crypto bac4c82f69751a6dd76e702d54b3ceb88adab236 -golang.org/x/oauth2 0f29369cfe4552d0e4bcddc57cc75f4d7e672a33 -golang.org/x/time 9d24e82272b4f38b78bc8cff74fa936d31ccd8ef +golang.org/x/oauth2 858c2ad4c8b6c5d10852cb89079f6ca1c7309787 +golang.org/x/time 555d28b269f0569763d25dbe1a237ae74c6bcc82 gopkg.in/inf.v0 v0.9.1 gopkg.in/yaml.v2 v2.2.8 -k8s.io/api v0.18.2 -k8s.io/apimachinery v0.18.2 -k8s.io/apiserver v0.18.2 -k8s.io/client-go v0.18.2 -k8s.io/cri-api v0.18.2 -k8s.io/klog v1.0.0 -k8s.io/kubernetes v1.18.2 -k8s.io/utils a9aa75ae1b89e1b992c33383f48e942d97e52dae +k8s.io/api v0.19.0-beta.2 +k8s.io/apiserver v0.19.0-beta.2 +k8s.io/apimachinery v0.19.0-beta.2 +k8s.io/client-go v0.19.0-beta.2 +k8s.io/component-base v0.19.0-beta.2 +k8s.io/cri-api v0.19.0-beta.2 +k8s.io/klog/v2 v2.2.0 +k8s.io/kubernetes v1.19.0-beta.2 +k8s.io/utils 2df71ebbae66f39338aed4cd0bb82d2212ee33cc sigs.k8s.io/structured-merge-diff/v3 v3.0.0 sigs.k8s.io/yaml v1.2.0 @@ -90,7 +92,7 @@ sigs.k8s.io/yaml v1.2.0 github.com/containerd/go-cni v1.0.0 github.com/containernetworking/cni v0.7.1 github.com/containernetworking/plugins v0.7.6 -github.com/fsnotify/fsnotify v1.4.8 +github.com/fsnotify/fsnotify v1.4.9 # image decrypt depedencies github.com/containerd/imgcrypt v1.0.1