Merge pull request #5268 from thaJeztah/no_klog

estesp · web-flow · commit 219f1395b2a7 · 2021-03-25T11:51:29.000-04:00
integration/util: remove dependency on k8s.io/klog/v2
diff --git a/integration/remote/util/util_unix.go b/integration/remote/util/util_unix.go
@@ -44,7 +44,6 @@ import (
 	"path/filepath"
 
 	"golang.org/x/sys/unix"
-	"k8s.io/klog/v2"
 )
 
 const (
@@ -115,9 +114,6 @@ func parseEndpointWithFallbackProtocol(endpoint string, fallbackProtocol string)
 	if protocol, addr, err = parseEndpoint(endpoint); err != nil && protocol == "" {
 		fallbackEndpoint := fallbackProtocol + "://" + endpoint
 		protocol, addr, err = parseEndpoint(fallbackEndpoint)
-		if err == nil {
-			klog.Warningf("Using %q as endpoint is deprecated, please consider using full url format %q.", endpoint, fallbackEndpoint)
-		}
 	}
 	return
 }
diff --git a/integration/util/util_unix.go b/integration/util/util_unix.go
@@ -44,7 +44,6 @@ import (
 	"path/filepath"
 
 	"golang.org/x/sys/unix"
-	"k8s.io/klog/v2"
 )
 
 const (
@@ -115,9 +114,6 @@ func parseEndpointWithFallbackProtocol(endpoint string, fallbackProtocol string)
 	if protocol, addr, err = parseEndpoint(endpoint); err != nil && protocol == "" {
 		fallbackEndpoint := fallbackProtocol + "://" + endpoint
 		protocol, addr, err = parseEndpoint(fallbackEndpoint)
-		if err == nil {
-			klog.Warningf("Using %q as endpoint is deprecated, please consider using full url format %q.", endpoint, fallbackEndpoint)
-		}
 	}
 	return
 }

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,6 @@ import (`
`44`	`44`	`"path/filepath"`
`45`	`45`
`46`	`46`	`"golang.org/x/sys/unix"`
`47`		`- "k8s.io/klog/v2"`
`48`	`47`	`)`
`49`	`48`
`50`	`49`	`const (`
`@@ -115,9 +114,6 @@ func parseEndpointWithFallbackProtocol(endpoint string, fallbackProtocol string)`
`115`	`114`	`if protocol, addr, err = parseEndpoint(endpoint); err != nil && protocol == "" {`
`116`	`115`	`fallbackEndpoint := fallbackProtocol + "://" + endpoint`
`117`	`116`	`protocol, addr, err = parseEndpoint(fallbackEndpoint)`
`118`		`- if err == nil {`
`119`		`- klog.Warningf("Using %q as endpoint is deprecated, please consider using full url format %q.", endpoint, fallbackEndpoint)`
`120`		`- }`
`121`	`117`	`}`
`122`	`118`	`return`
`123`	`119`	`}`