fix vendor logr

Author: Mengqi Yu

Gopkg.lock

@@ -50,10 +50,5 @@ required = ["sigs.k8s.io/testing_frameworks/integration",
   name = "k8s.io/kube-aggregator"
   version = "kubernetes-1.10.1"
 
-[[constraint]]
-  name = "github.com/thockin/logr"
-  source = "https://github.com/directxman12/logr.git"
-  branch = "features/structed"
-
 [prune]
   go-tests = true

Gopkg.toml

@@ -1,7 +1,7 @@
 package log
 
 import (
-	"github.com/thockin/logr"
+	"github.com/go-logr/logr"
 )
 
 // loggerPromise knows how to populate a concrete logr.Logger
@@ -24,8 +24,8 @@ func (p *loggerPromise) WithName(l *DelegatingLogger, name string) *loggerPromis
 	return res
 }
 
-// WithTags provides a new Logger with the tags appended
-func (p *loggerPromise) WithTags(l *DelegatingLogger, tags ...interface{}) *loggerPromise {
+// WithValues provides a new Logger with the tags appended
+func (p *loggerPromise) WithValues(l *DelegatingLogger, tags ...interface{}) *loggerPromise {
 	res := &loggerPromise{
 		logger: l,
 		tags:   tags,
@@ -42,7 +42,7 @@ func (p *loggerPromise) Fulfill(parentLogger logr.Logger) {
 	}
 
 	if p.tags != nil {
-		logger = logger.WithTags(p.tags...)
+		logger = logger.WithValues(p.tags...)
 	}
 
 	p.logger.Logger = logger
@@ -76,14 +76,14 @@ func (l *DelegatingLogger) WithName(name string) logr.Logger {
 	return res
 }
 
-// WithTags provides a new Logger with the tags appended
-func (l *DelegatingLogger) WithTags(tags ...interface{}) logr.Logger {
+// WithValues provides a new Logger with the tags appended
+func (l *DelegatingLogger) WithValues(tags ...interface{}) logr.Logger {
 	if l.promise == nil {
-		return l.Logger.WithTags(tags)
+		return l.Logger.WithValues(tags)
 	}
 
 	res := &DelegatingLogger{Logger: l.Logger}
-	promise := l.promise.WithTags(res, tags)
+	promise := l.promise.WithValues(res, tags)
 	res.promise = promise
 
 	return res

pkg/runtime/log/deleg.go

@@ -5,9 +5,9 @@ package log
 import (
 	"log"
 
-	"github.com/thockin/logr"
-	"github.com/thockin/logr/impls/zaplogr"
-	tlogr "github.com/thockin/logr/testing"
+	"github.com/go-logr/logr"
+	tlogr "github.com/go-logr/logr/testing"
+	"github.com/go-logr/zapr"
 	"go.uber.org/zap"
 )
 

pkg/runtime/log/log.go

@@ -19,9 +19,9 @@ package log
 import (
 	"fmt"
 
+	tlogr "github.com/go-logr/logr/testing"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	tlogr "github.com/thockin/logr/testing"
 )
 
 var _ = Describe("runtime log", func() {
@@ -30,9 +30,9 @@ var _ = Describe("runtime log", func() {
 		It("shoud set and fulfill with logger", func() {
 			logger := ZapLogger(false)
 			Expect(logger).NotTo(BeNil())
-			Log.WithName("runtimeLog").WithTags("newtag", "newvalue")
+			Log.WithName("runtimeLog").WithValues("newtag", "newvalue")
 			SetLogger(logger)
-			logger.WithName("runtimeLog").WithTags("newtag", "newvalue")
+			logger.WithName("runtimeLog").WithValues("newtag", "newvalue")
 			Expect(Log.promise).To(BeNil())
 			Expect(Log.Logger).To(Equal(logger))
 			devLogger := ZapLogger(true)
@@ -53,11 +53,11 @@ var _ = Describe("runtime log", func() {
 		It("should delegate with tags", func() {
 			tags := []interface{}{"new", "tags"}
 			test := tlogr.NullLogger{}
-			test.WithTags(tags)
+			test.WithValues(tags)
 			Log = &DelegatingLogger{
 				Logger: tlogr.NullLogger{},
 			}
-			Log.WithTags(tags)
+			Log.WithValues(tags)
 			Expect(Log.Logger).To(Equal(test))
 		})
 	})