Fixing klog log lines

Signed-off-by: Alexander Constantinescu <aconstan@redhat.com>

go-controller/cmd/ovn-kube-util/app/ovn-db-exporter.go

@@ -298,7 +298,7 @@ func ovnDBMemoryMetricsUpdater(direction, database string) {
 		stdout, stderr, err = util.RunOVNNBAppCtl("--timeout=5", "memory/show")
 	}
 	if err != nil {
-		klog.Errorf("failed retrieving memory/show output for %q, stderr: %s, err: (%v)",
+		klog.Errorf("Failed retrieving memory/show output for %q, stderr: %s, err: (%v)",
 			strings.ToUpper(database), stderr, err)
 		return
 	}
@@ -309,7 +309,7 @@ func ovnDBMemoryMetricsUpdater(direction, database string) {
 			if value, err := strconv.ParseFloat(fields[1], 64); err == nil {
 				metricOVNDBMonitor.WithLabelValues(database).Set(value)
 			} else {
-				klog.Errorf("failed to parse the monitor's value %s to float64: err(%v)",
+				klog.Errorf("Failed to parse the monitor's value %s to float64: err(%v)",
 					fields[1], err)
 			}
 		} else if strings.HasPrefix(kvPair, "sessions:") {
@@ -318,7 +318,7 @@ func ovnDBMemoryMetricsUpdater(direction, database string) {
 			if value, err := strconv.ParseFloat(fields[1], 64); err == nil {
 				metricOVNDBSessions.WithLabelValues(database).Set(value)
 			} else {
-				klog.Errorf("failed to parse the sessions' value %s to float64: err(%v)",
+				klog.Errorf("Failed to parse the sessions' value %s to float64: err(%v)",
 					fields[1], err)
 			}
 		}
@@ -470,7 +470,7 @@ func getOVNDBClusterStatusInfo(timeout int, direction, database string) (cluster
 			"cluster/status", database)
 	}
 	if err != nil {
-		klog.Errorf("failed to retrieve cluster/status info for database %q, stderr: %s, err: (%v)",
+		klog.Errorf("Failed to retrieve cluster/status info for database %q, stderr: %s, err: (%v)",
 			database, stderr, err)
 		return nil, err
 	}

go-controller/cmd/ovnkube/ovnkube.go

@@ -147,7 +147,7 @@ func setupPIDFile(pidfile string) error {
 	// Create if it doesn't exist, else exit with error
 	if os.IsNotExist(err) {
 		if err := ioutil.WriteFile(pidfile, []byte(fmt.Sprintf("%d", os.Getpid())), 0644); err != nil {
-			klog.Errorf("failed to write pidfile %s (%v). Ignoring..", pidfile, err)
+			klog.Errorf("Failed to write pidfile %s (%v). Ignoring..", pidfile, err)
 		}
 	} else {
 		// get the pid and see if it exists
@@ -159,7 +159,7 @@ func setupPIDFile(pidfile string) error {
 		if os.IsNotExist(err1) {
 			// Left over pid from dead process
 			if err := ioutil.WriteFile(pidfile, []byte(fmt.Sprintf("%d", os.Getpid())), 0644); err != nil {
-				klog.Errorf("failed to write pidfile %s (%v). Ignoring..", pidfile, err)
+				klog.Errorf("Failed to write pidfile %s (%v). Ignoring..", pidfile, err)
 			}
 		} else {
 			return fmt.Errorf("pidfile %s exists and ovnkube is running", pidfile)
@@ -300,7 +300,7 @@ func watchForChanges(configPath string) error {
 				if !ok {
 					return
 				}
-				klog.Errorf("fsnotify error %v", err)
+				klog.Errorf("Fsnotify error %v", err)
 			}
 		}
 	}()

go-controller/hybrid-overlay/pkg/controller/master.go

@@ -111,7 +111,7 @@ func NewMaster(kube kube.Interface,
 		if err != nil {
 			klog.Warningf(err.Error())
 		} else if hostsubnet != nil {
-			klog.V(5).Infof("marking existing node %s hybrid overlay NodeSubnet %s as allocated", node.Name, hostsubnet)
+			klog.V(5).Infof("Marking existing node %s hybrid overlay NodeSubnet %s as allocated", node.Name, hostsubnet)
 			if err := m.allocator.MarkAllocatedNetwork(hostsubnet); err != nil {
 				utilruntime.HandleError(err)
 			}
@@ -187,7 +187,7 @@ func (m *MasterController) handleOverlayPort(node *kapi.Node, annotator kube.Ann
 	subnets, err := util.ParseNodeHostSubnetAnnotation(node)
 	if subnets == nil || err != nil {
 		// No subnet allocated yet; clean up
-		klog.V(5).Infof("no subnet allocation yet for %s", node.Name)
+		klog.V(5).Infof("No subnet allocation yet for %s", node.Name)
 		if haveDRMACAnnotation {
 			m.deleteOverlayPort(node)
 			annotator.Delete(types.HybridOverlayDRMAC)
@@ -197,7 +197,7 @@ func (m *MasterController) handleOverlayPort(node *kapi.Node, annotator kube.Ann
 
 	if haveDRMACAnnotation {
 		// already set up; do nothing
-		klog.V(5).Infof("annotation already exists on %s. doing nothing", node.Name)
+		klog.V(5).Infof("Annotation already exists on %s. doing nothing", node.Name)
 		return nil
 	}
 
@@ -219,7 +219,7 @@ func (m *MasterController) handleOverlayPort(node *kapi.Node, annotator kube.Ann
 			}
 		}
 
-		klog.Infof("creating node %s hybrid overlay port", node.Name)
+		klog.Infof("Creating node %s hybrid overlay port", node.Name)
 
 		var stderr string
 		_, stderr, err = util.RunOVNNbctl("--", "--may-exist", "lsp-add", node.Name, portName,
@@ -241,7 +241,7 @@ func (m *MasterController) handleOverlayPort(node *kapi.Node, annotator kube.Ann
 }
 
 func (m *MasterController) deleteOverlayPort(node *kapi.Node) {
-	klog.Infof("removing node %s hybrid overlay port", node.Name)
+	klog.Infof("Removing node %s hybrid overlay port", node.Name)
 	portName := util.GetHybridOverlayPortName(node.Name)
 	_, _, _ = util.RunOVNNbctl("--", "--if-exists", "lsp-del", portName)
 }
@@ -315,7 +315,7 @@ func (m *MasterController) waitForNamespace(name string) (*kapi.Namespace, error
 				// Namespace not found; retry
 				return false, nil
 			}
-			klog.Warningf("error getting namespace: %v", err)
+			klog.Warningf("Error getting namespace: %v", err)
 			return false, err
 		}
 		return true, nil

go-controller/hybrid-overlay/pkg/controller/node.go

@@ -171,20 +171,20 @@ func getNodeSubnetAndIP(node *kapi.Node) (*net.IPNet, net.IP) {
 		subnet, ok := node.Annotations[types.HybridOverlayNodeSubnet]
 		if !ok {
 
-			klog.V(5).Infof("missing node %q node subnet annotation", node.Name)
+			klog.V(5).Infof("Missing node %q node subnet annotation", node.Name)
 			return nil, nil
 		}
 		var err error
 		_, cidr, err = net.ParseCIDR(subnet)
 		if err != nil {
-			klog.Errorf("error parsing node %q subnet %q: %v", node.Name, subnet, err)
+			klog.Errorf("Error parsing node %q subnet %q: %v", node.Name, subnet, err)
 			return nil, nil
 		}
 	}
 
 	nodeIP, err := houtil.GetNodeInternalIP(node)
 	if err != nil {
-		klog.Errorf("error getting node %q internal IP: %v", node.Name, err)
+		klog.Errorf("Error getting node %q internal IP: %v", node.Name, err)
 		return nil, nil
 	}
 

go-controller/hybrid-overlay/pkg/controller/node_linux.go

@@ -94,22 +94,22 @@ func podIPToCookie(podIP net.IP) string {
 func (n *NodeController) AddPod(pod *kapi.Pod) error {
 	podIPs, podMAC, err := getPodDetails(pod)
 	if err != nil {
-		klog.V(5).Infof("cleaning up hybrid overlay pod %s/%s because %v", pod.Namespace, pod.Name, err)
+		klog.V(5).Infof("Cleaning up hybrid overlay pod %s/%s because %v", pod.Namespace, pod.Name, err)
 		return n.DeletePod(pod)
 	}
 
 	externalGw := pod.Annotations[hotypes.HybridOverlayExternalGw]
 	// validate the external gateway is a valid IP address
 	if ip := net.ParseIP(externalGw); ip == nil {
-		klog.Warningf("failed parse a valid external gateway ip address from %v: %v", externalGw, err)
+		klog.Warningf("Failed parse a valid external gateway ip address from %v: %v", externalGw, err)
 		return fmt.Errorf("failed to validate a valid external gateway ip address %s: %v", externalGw, err)
 	}
 
 	VTEP := pod.Annotations[hotypes.HybridOverlayVTEP]
 	// validate the VTEP is a valid IP address
 	VTEPIP := net.ParseIP(VTEP)
 	if VTEPIP == nil {
-		klog.Warningf("failed parse a valid vtep ip address from %v: %v", VTEP, err)
+		klog.Warningf("Failed parse a valid vtep ip address from %v: %v", VTEP, err)
 		return fmt.Errorf("failed to validate a valid vtep ip address %s: %v", VTEP, err)
 	}
 
@@ -280,11 +280,11 @@ func (n *NodeController) hybridOverlayNodeUpdate(node *kapi.Node) error {
 
 	cidr, nodeIP, drMAC, err := getNodeDetails(node)
 	if cidr == nil || nodeIP == nil || drMAC == nil {
-		klog.V(5).Infof("cleaning up hybrid overlay resources for node %q because: %v", node.Name, err)
+		klog.V(5).Infof("Cleaning up hybrid overlay resources for node %q because: %v", node.Name, err)
 		return n.DeleteNode(node)
 	}
 
-	klog.Infof("setting up hybrid overlay tunnel to node %s", node.Name)
+	klog.Infof("Setting up hybrid overlay tunnel to node %s", node.Name)
 
 	// (re)add flows for the node
 	cookie := nameToCookie(node.Name)
@@ -370,7 +370,7 @@ func getLocalNodeSubnet(nodeName string) (*net.IPNet, error) {
 		return nil, fmt.Errorf("invalid hostsubnet found for node %s - %v", nodeName, err)
 	}
 
-	klog.Infof("found node %s subnet %s", nodeName, subnet.String())
+	klog.Infof("Found node %s subnet %s", nodeName, subnet.String())
 	return subnet, nil
 }
 
@@ -399,7 +399,7 @@ func (n *NodeController) EnsureHybridOverlayBridge(node *kapi.Node) error {
 	portName := util.GetHybridOverlayPortName(n.nodeName)
 	portMACString, haveDRMACAnnotation := node.Annotations[hotypes.HybridOverlayDRMAC]
 	if !haveDRMACAnnotation {
-		klog.Infof("node %s does not have DRMAC annotation yet, failed to ensure hybrid overlay"+
+		klog.Infof("Node %s does not have DRMAC annotation yet, failed to ensure hybrid overlay"+
 			"and will retry later", n.nodeName)
 		// node must not be annotated yet, retry later
 		return nil
@@ -545,7 +545,7 @@ func (n *NodeController) EnsureHybridOverlayBridge(node *kapi.Node) error {
 	n.updateFlowCacheEntry("0x0", flows, false)
 	n.requestFlowSync()
 	n.initialized = true
-	klog.Infof("hybrid overlay setup complete for node %s", node.Name)
+	klog.Infof("Hybrid overlay setup complete for node %s", node.Name)
 	return nil
 }
 
@@ -578,7 +578,7 @@ func (n *NodeController) syncFlows() {
 	// current pod in the cache
 	stdout, stderr, err := util.RunOVSOfctl("dump-flows", "--no-stats", extBridgeName, "table=20")
 	if err != nil {
-		klog.Errorf("failed to dump flows for flow sync, stderr: %q, error: %v", stderr, err)
+		klog.Errorf("Failed to dump flows for flow sync, stderr: %q, error: %v", stderr, err)
 		return
 	}
 	lines := strings.Split(stdout, "\n")
@@ -626,16 +626,16 @@ func (n *NodeController) syncFlows() {
 	}
 	_, _, err = util.ReplaceOFFlows(extBridgeName, flows)
 	if err != nil {
-		klog.Errorf("failed to add flows, error: %v, flows: %s", err, flows)
+		klog.Errorf("Failed to add flows, error: %v, flows: %s", err, flows)
 	}
 }
 
 func (n *NodeController) requestFlowSync() {
 	select {
 	case n.flowChan <- struct{}{}:
-		klog.V(5).Infof("flow sync requested")
+		klog.V(5).Infof("Flow sync requested")
 	default:
-		klog.V(5).Infof("sync already requested for flows")
+		klog.V(5).Infof("Sync already requested for flows")
 	}
 }
 

go-controller/hybrid-overlay/pkg/controller/node_windows.go

@@ -171,7 +171,7 @@ func (n *NodeController) AddNode(node *kapi.Node) error {
 
 	cidr, nodeIP, drMAC, err := getNodeDetails(node)
 	if cidr == nil || nodeIP == nil || drMAC == nil {
-		klog.V(5).Infof("cleaning up hybrid overlay resources for node %q because: %v", node.Name, err)
+		klog.V(5).Infof("Cleaning up hybrid overlay resources for node %q because: %v", node.Name, err)
 		n.DeleteNode(node)
 		return err
 	}
@@ -322,7 +322,7 @@ func (n *NodeController) initSelf(node *kapi.Node, nodeSubnet *net.IPNet) error
 			if err := n.kube.SetAnnotationsOnNode(node, map[string]interface{}{
 				types.HybridOverlayDRMAC: policySettings.Address,
 			}); err != nil {
-				klog.Errorf("failed to set DRMAC annotation on node: %v", err)
+				klog.Errorf("Failed to set DRMAC annotation on node: %v", err)
 			}
 			break
 		}

go-controller/hybrid-overlay/pkg/controller/overlay_windows.go

@@ -224,7 +224,7 @@ func ClearRemoteSubnetPolicies(network *hcn.HostComputeNetwork) error {
 		if err := removeOneRemoteSubnetPolicy(network, policy.Settings); err != nil {
 			// We don't return the error in this case, we take a best effort
 			// approach to clear the remote subnets.
-			klog.Errorf("failed to remove remote subnet policy %v: %v",
+			klog.Errorf("Failed to remove remote subnet policy %v: %v",
 				existingPolicySettings.DestinationPrefix, err)
 		}
 	}

go-controller/pkg/cni/cni.go

@@ -86,7 +86,7 @@ func (pr *PodRequest) cmdAdd(kclient kubernetes.Interface) ([]byte, error) {
 				// Pod not found; don't bother waiting longer
 				return false, err
 			}
-			klog.Warningf("error getting pod annotations: %v", err)
+			klog.Warningf("Error getting pod annotations: %v", err)
 			return false, nil
 		}
 		if _, ok := annotations[util.OvnPodAnnotationName]; ok {

go-controller/pkg/cni/cnishim.go

@@ -104,7 +104,7 @@ func setupLogging(conf *ovntypes.NetConf) {
 
 	if conf.LogLevel != "" {
 		if err = level.Set(conf.LogLevel); err != nil {
-			klog.Warningf("failed to set klog log level to %s: %v", conf.LogLevel, err)
+			klog.Warningf("Failed to set klog log level to %s: %v", conf.LogLevel, err)
 		}
 	}
 	if conf.LogFile != "" {
@@ -113,13 +113,13 @@ func setupLogging(conf *ovntypes.NetConf) {
 		if _, err = os.Stat(filepath.Dir(conf.LogFile)); os.IsNotExist(err) {
 			dir := filepath.Dir(conf.LogFile)
 			if err = os.MkdirAll(dir, 0755); err != nil {
-				klog.Warningf("failed to create logfile directory %s (%v).", dir, err)
+				klog.Warningf("Failed to create logfile directory %s (%v).", dir, err)
 				return
 			}
 		}
 		file, err = os.OpenFile(conf.LogFile, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0660)
 		if err != nil {
-			klog.Warningf("failed to open logfile %s (%v).", conf.LogFile, err)
+			klog.Warningf("Failed to open logfile %s (%v).", conf.LogFile, err)
 			return
 		}
 		klogFlags := flag.NewFlagSet("klog", flag.ExitOnError)

go-controller/pkg/cni/helper_linux.go

@@ -251,7 +251,7 @@ func (pr *PodRequest) ConfigureInterface(namespace string, podName string, ifInf
 	uuids, _ := ovsFind("Interface", "_uuid", "external-ids:iface-id="+ifaceID)
 	for _, uuid := range uuids {
 		if out, err := ovsExec("remove", "Interface", uuid, "external-ids", "iface-id"); err != nil {
-			klog.Warningf("failed to clear stale OVS port %q iface-id %q: %v\n  %q", uuid, ifaceID, err, out)
+			klog.Warningf("Failed to clear stale OVS port %q iface-id %q: %v\n  %q", uuid, ifaceID, err, out)
 		}
 	}
 
@@ -297,13 +297,13 @@ func (pr *PodRequest) ConfigureInterface(namespace string, podName string, ifInf
 		if _, err := os.Stat("/proc/sys/net/ipv6/conf/all/dad_transmits"); !os.IsNotExist(err) {
 			err = setSysctl("/proc/sys/net/ipv6/conf/all/dad_transmits", 0)
 			if err != nil {
-				klog.Warningf("failed to disable IPv6 DAD: %q", err)
+				klog.Warningf("Failed to disable IPv6 DAD: %q", err)
 			}
 		}
 		return ip.SettleAddresses(contIface.Name, 10)
 	})
 	if err != nil {
-		klog.Warningf("failed to settle addresses: %q", err)
+		klog.Warningf("Failed to settle addresses: %q", err)
 	}
 
 	return []*current.Interface{hostIface, contIface}, nil
@@ -315,7 +315,7 @@ func (pr *PodRequest) deletePodConntrack() {
 	}
 	result, err := current.NewResultFromResult(pr.CNIConf.PrevResult)
 	if err != nil {
-		klog.Warningf("could not convert result to current version: %v", err)
+		klog.Warningf("Could not convert result to current version: %v", err)
 		return
 	}
 
@@ -341,7 +341,7 @@ func (pr *PodRequest) PlatformSpecificCleanup() error {
 	out, err := exec.Command("ovs-vsctl", ovsArgs...).CombinedOutput()
 	if err != nil && !strings.Contains(string(out), "no port named") {
 		// DEL should be idempotent; don't return an error just log it
-		klog.Warningf("failed to delete OVS port %s: %v\n  %q", ifaceName, err, string(out))
+		klog.Warningf("Failed to delete OVS port %s: %v\n  %q", ifaceName, err, string(out))
 	}
 
 	_ = clearPodBandwidth(pr.SandboxID)

go-controller/pkg/cni/helper_windows.go

@@ -238,7 +238,7 @@ func (pr *PodRequest) PlatformSpecificCleanup() error {
 	namespace := pr.PodNamespace
 	podName := pr.PodName
 	if namespace == "" || podName == "" {
-		klog.Warningf("cleanup failed, required CNI variable missing from args: %v", pr)
+		klog.Warningf("Cleanup failed, required CNI variable missing from args: %v", pr)
 		return nil
 	}
 
@@ -249,10 +249,10 @@ func (pr *PodRequest) PlatformSpecificCleanup() error {
 	out, err := exec.Command("ovs-vsctl", ovsArgs...).CombinedOutput()
 	if err != nil && !strings.Contains(string(out), "no port named") {
 		// DEL should be idempotent; don't return an error just log it
-		klog.Warningf("failed to delete OVS port %s: %v  %q", endpointName, err, string(out))
+		klog.Warningf("Failed to delete OVS port %s: %v  %q", endpointName, err, string(out))
 	}
 	if err = deleteHNSEndpoint(endpointName); err != nil {
-		klog.Warningf("failed to delete HNSEndpoint %v: %v", endpointName, err)
+		klog.Warningf("Failed to delete HNSEndpoint %v: %v", endpointName, err)
 	}
 	// TODO: uncomment when OVS QoS is supported on Windows
 	// _ = clearPodBandwidth(args.ContainerID)

go-controller/pkg/config/config.go

@@ -843,7 +843,7 @@ func getOVSExternalID(exec kexec.Interface, name string) string {
 		".",
 		"external_ids:"+name)
 	if err != nil {
-		klog.V(5).Infof("failed to get OVS external_id %s: %v\n\t%s", name, err, out)
+		klog.V(5).Infof("Failed to get OVS external_id %s: %v\n\t%s", name, err, out)
 		return ""
 	}
 	return out
@@ -1423,7 +1423,7 @@ func (a *OvnAuthConfig) ensureCACert() error {
 	args = append(args, "list", "nb_global")
 	_, _ = rawExec(a.exec, "ovn-nbctl", args...)
 	if _, err := os.Stat(a.CACert); os.IsNotExist(err) {
-		klog.Warningf("bootstrapping %s CA certificate failed", a.CACert)
+		klog.Warningf("Bootstrapping %s CA certificate failed", a.CACert)
 	}
 	return nil
 }