refactor(klog,docker) to adjust to newer version.

openshift · Aug 7, 2020 · e36cfae · e36cfae
1 parent 701ba6d
commit e36cfae
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/cmd/glogflags.go b/cmd/glogflags.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/spf13/pflag"
 
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // GLog binds the log flags from the default Google "flag" package into a pflag.FlagSet.

diff --git a/pkg/build/builder/cmd/dockercfg/cfg.go b/pkg/build/builder/cmd/dockercfg/cfg.go
@@ -10,7 +10,7 @@ import (
 	docker "github.com/fsouza/go-dockerclient"
 	"github.com/spf13/pflag"
 
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	"k8s.io/kubernetes/pkg/credentialprovider"
 
 	utillog "github.com/openshift/builder/pkg/build/builder/util/log"
@@ -128,7 +128,7 @@ func readSpecificDockerConfigJSONFile(filePath string) bool {
 }
 
 func readDockerConfigJSONFileFromBytes(contents []byte) bool {
-	var cfgJSON credentialprovider.DockerConfigJson
+	var cfgJSON credentialprovider.DockerConfigJSON
 	if err := json.Unmarshal(contents, &cfgJSON); err != nil {
 		log.V(4).Infof("while trying to parse blob %q: %v", contents, err)
 		return false
@@ -172,7 +172,7 @@ func GetDockerConfig(path []string) (cfg credentialprovider.DockerConfig, err er
 // generated by secret from given paths.
 func ReadDockerConfigJsonFileGeneratedFromSecret(path []string) (cfg credentialprovider.DockerConfig, err error) {
 	for _, filePath := range path {
-		cfg, err = credentialprovider.ReadSpecificDockerConfigJsonFile(filepath.Join(filePath, DockerConfigJsonKey))
+		cfg, err = credentialprovider.ReadSpecificDockerConfigJSONFile(filepath.Join(filePath, DockerConfigJsonKey))
 		if err == nil {
 			return cfg, nil
 		}

diff --git a/pkg/build/builder/daemonless.go b/pkg/build/builder/daemonless.go
@@ -67,7 +67,7 @@ func parsePullCredentials(credsPath string) (credentialprovider.DockerConfig, er
 			return nil, err
 		}
 	} else {
-		if creds, err = credentialprovider.ReadSpecificDockerConfigJsonFile(
+		if creds, err = credentialprovider.ReadSpecificDockerConfigJSONFile(
 			credsPath,
 		); err != nil {
 			return nil, err
@@ -82,7 +82,7 @@ func parsePullCredentials(credsPath string) (credentialprovider.DockerConfig, er
 }
 
 // mergeNodeCredentials merges node credentials with credentials file provided.
-func mergeNodeCredentials(credsPath string) (*credentialprovider.DockerConfigJson, error) {
+func mergeNodeCredentials(credsPath string) (*credentialprovider.DockerConfigJSON, error) {
 	nodeCreds, err := parsePullCredentials(nodeCredentialsFile)
 	if err != nil {
 		log.V(2).Infof("proceeding without node credentials: %v", err)
@@ -99,7 +99,7 @@ func mergeNodeCredentials(credsPath string) (*credentialprovider.DockerConfigJso
 		}
 	}
 
-	return &credentialprovider.DockerConfigJson{
+	return &credentialprovider.DockerConfigJSON{
 		Auths: namespaceCreds,
 	}, nil
 }

diff --git a/pkg/build/builder/source.go b/pkg/build/builder/source.go
@@ -21,7 +21,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	restclient "k8s.io/client-go/rest"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	buildapiv1 "github.com/openshift/api/build/v1"
 	buildclientv1 "github.com/openshift/client-go/build/clientset/versioned/typed/build/v1"

diff --git a/pkg/build/builder/util/log/log.go b/pkg/build/builder/util/log/log.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"strings"
 
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // Logger is a simple interface that is roughly equivalent to klog.
@@ -39,7 +39,7 @@ func (discard) Infof(_ string, _ ...interface{}) {}
 type klogger struct{}
 
 func (klogger) Is(level int) bool {
-	return bool(klog.V(klog.Level(level)))
+	return bool(klog.V(klog.Level(level)).Enabled())
 }
 
 func (klogger) V(level int) Logger {
@@ -56,18 +56,18 @@ type kverbose struct {
 }
 
 func (kverbose) Is(level int) bool {
-	return bool(klog.V(klog.Level(level)))
+	return bool(klog.V(klog.Level(level)).Enabled())
 }
 
 func (kverbose) V(level int) Logger {
-	if klog.V(klog.Level(level)) {
+	if klog.V(klog.Level(level)).Enabled() {
 		return Log
 	}
 	return None
 }
 
 func (g kverbose) Infof(format string, args ...interface{}) {
-	if g.Verbose {
+	if g.Verbose.Enabled() {
 		klog.InfoDepth(2, fmt.Sprintf(format, args...))
 	}
 }
@@ -80,12 +80,12 @@ type file struct {
 }
 
 func (f file) Is(level int) bool {
-	return level <= f.level || bool(klog.V(klog.Level(level)))
+	return level <= f.level || bool(klog.V(klog.Level(level)).Enabled())
 }
 
 func (f file) V(level int) Logger {
 	// only log things that klog allows
-	if !klog.V(klog.Level(level)) {
+	if !klog.V(klog.Level(level)).Enabled() {
 		return None
 	}
 	// send anything above our level to klog