github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Update cri-tools to v1.13.0.

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu 2018-12-17 11:54:32 -08:00
parent 2baa96e0e2
commit ac45393a47
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cri.go
View File

@ -36,6 +36,7 @@ import (
imagespec "github.com/opencontainers/image-spec/specs-go/v1" imagespec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"k8s.io/klog"
criconfig "github.com/containerd/cri/pkg/config" criconfig "github.com/containerd/cri/pkg/config"
"github.com/containerd/cri/pkg/constants" "github.com/containerd/cri/pkg/constants"
@ -175,16 +176,18 @@ func getServicesOpts(ic *plugin.InitContext) ([]containerd.ServicesOpt, error) {
// Set glog level. // Set glog level.
func setGLogLevel() error { func setGLogLevel() error {
l := logrus.GetLevel() l := logrus.GetLevel()
if err := flag.Set("logtostderr", "true"); err != nil { fs := flag.NewFlagSet("klog", flag.PanicOnError)
klog.InitFlags(fs)
if err := fs.Set("logtostderr", "true"); err != nil {
return err return err
} }
switch l { switch l {
case log.TraceLevel: case log.TraceLevel:
return flag.Set("v", "5") return fs.Set("v", "5")
case logrus.DebugLevel: case logrus.DebugLevel:
return flag.Set("v", "4") return fs.Set("v", "4")
case logrus.InfoLevel: case logrus.InfoLevel:
return flag.Set("v", "2") return fs.Set("v", "2")
// glog doesn't support following filters. Defaults to v=0. // glog doesn't support following filters. Defaults to v=0.
case logrus.WarnLevel: case logrus.WarnLevel:
case logrus.ErrorLevel: case logrus.ErrorLevel:

2
hack/utils.sh
View File

@ -17,7 +17,7 @@
ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/.. ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
# Not from vendor.conf. # Not from vendor.conf.
CRITOOL_VERSION=v1.12.0 CRITOOL_VERSION=v1.13.0
CRITOOL_PKG=github.com/kubernetes-sigs/cri-tools CRITOOL_PKG=github.com/kubernetes-sigs/cri-tools
CRITOOL_REPO=github.com/kubernetes-sigs/cri-tools CRITOOL_REPO=github.com/kubernetes-sigs/cri-tools