Merge pull request kubernetes#80033 from qingsenLi/k8s-190711

k8s-ci-robot · web-flow · commit eb4ff661a136 · 2019-07-12T06:31:43.000-07:00
use klog.Error instead of klog.Errorf when had no format
diff --git a/pkg/cloudprovider/providers/openstack/openstack.go b/pkg/cloudprovider/providers/openstack/openstack.go
@@ -297,13 +297,13 @@ func setConfigFromSecret(cfg *Config) error {
 	if content, ok := secret.Data["clouds.conf"]; ok {
 		err = gcfg.ReadStringInto(cfg, string(content))
 		if err != nil {
-			klog.Errorf("Cannot parse data from the secret.")
+			klog.Error("Cannot parse data from the secret.")
 			return fmt.Errorf("cannot parse data from the secret")
 		}
 		return nil
 	}
 
-	klog.Errorf("Cannot find \"clouds.conf\" key in the secret.")
+	klog.Error("Cannot find \"clouds.conf\" key in the secret.")
 	return fmt.Errorf("cannot find \"clouds.conf\" key in the secret")
 }
 
diff --git a/pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go b/pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go
@@ -698,7 +698,7 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(ctx context.Context, clusterName string
 	internal := getStringFromServiceAnnotation(apiService, ServiceAnnotationLoadBalancerInternal, "false")
 	switch internal {
 	case "true":
-		klog.V(4).Infof("Ensure an internal loadbalancer service.")
+		klog.V(4).Info("Ensure an internal loadbalancer service.")
 		internalAnnotation = true
 	case "false":
 		if len(floatingPool) != 0 {

Original file line number	Diff line number	Diff line change
`@@ -297,13 +297,13 @@ func setConfigFromSecret(cfg *Config) error {`
`297`	`297`	`if content, ok := secret.Data["clouds.conf"]; ok {`
`298`	`298`	`err = gcfg.ReadStringInto(cfg, string(content))`
`299`	`299`	`if err != nil {`
`300`		`- klog.Errorf("Cannot parse data from the secret.")`
	`300`	`+ klog.Error("Cannot parse data from the secret.")`
`301`	`301`	`return fmt.Errorf("cannot parse data from the secret")`
`302`	`302`	`}`
`303`	`303`	`return nil`
`304`	`304`	`}`
`305`	`305`
`306`		`- klog.Errorf("Cannot find \"clouds.conf\" key in the secret.")`
	`306`	`+ klog.Error("Cannot find \"clouds.conf\" key in the secret.")`
`307`	`307`	`return fmt.Errorf("cannot find \"clouds.conf\" key in the secret")`
`308`	`308`	`}`
`309`	`309`